diff --git a/occupi-backend/configs/centrifugo.config.json.gpg b/occupi-backend/configs/centrifugo.config.json.gpg new file mode 100644 index 00000000..341aa6a1 Binary files /dev/null and b/occupi-backend/configs/centrifugo.config.json.gpg differ diff --git a/occupi-backend/configs/config.json.gpg b/occupi-backend/configs/config.json.gpg deleted file mode 100644 index 94c6d33a..00000000 --- a/occupi-backend/configs/config.json.gpg +++ /dev/null @@ -1,2 +0,0 @@ -  J$vRmy3'bOz: kƊ3Zq_RR3mgG -T_6*P4.p"c?WJ<*LAIPQI.kxpB`f+vbooʉ\ Ԧh*eD3“fFo_  nۍ?T@QiEgKZ$8䐒gfFk9j>%úOLdQ5sBv?H7b)VwB@/cyKC3M]yz¹^5\@@J(=8 aUF! \ No newline at end of file diff --git a/occupi-backend/configs/config.yaml.gpg b/occupi-backend/configs/config.yaml.gpg index 9042ec2c..e0ae93e5 100644 Binary files a/occupi-backend/configs/config.yaml.gpg and b/occupi-backend/configs/config.yaml.gpg differ diff --git a/occupi-backend/configs/dev.deployed.yaml.gpg b/occupi-backend/configs/dev.deployed.yaml.gpg index e669e91f..c76c2f9e 100644 Binary files a/occupi-backend/configs/dev.deployed.yaml.gpg and b/occupi-backend/configs/dev.deployed.yaml.gpg differ diff --git a/occupi-backend/configs/dev.localhost.yaml.gpg b/occupi-backend/configs/dev.localhost.yaml.gpg index 08a36b7c..e338196c 100644 Binary files a/occupi-backend/configs/dev.localhost.yaml.gpg and b/occupi-backend/configs/dev.localhost.yaml.gpg differ diff --git a/occupi-backend/configs/prod.yaml.gpg b/occupi-backend/configs/prod.yaml.gpg index 5a8c2516..1ea7bf7d 100644 Binary files a/occupi-backend/configs/prod.yaml.gpg and b/occupi-backend/configs/prod.yaml.gpg differ diff --git a/occupi-backend/configs/test.yaml.gpg b/occupi-backend/configs/test.yaml.gpg index 5419053d..dacfc7b7 100644 Binary files a/occupi-backend/configs/test.yaml.gpg and b/occupi-backend/configs/test.yaml.gpg differ diff --git a/occupi-backend/docker-compose.dev.yml b/occupi-backend/docker-compose.dev.yml index 2c896e8b..c6be8026 100644 --- a/occupi-backend/docker-compose.dev.yml +++ b/occupi-backend/docker-compose.dev.yml @@ -48,9 +48,9 @@ services: image: centrifugo/centrifugo:v5 container_name: centrifugo-dev volumes: - - ./configs/config.json:/centrifugo/config.json + - ./configs/centrifugo.config.json:/centrifugo/centrifugo.config.json - centrifugo-dev:/centrifugo/data - command: centrifugo -c config.json + command: centrifugo -c centrifugo.config.json ports: - 8001:8000 ulimits: @@ -84,5 +84,4 @@ volumes: networks: webnet: - external: true - + external: true \ No newline at end of file diff --git a/occupi-backend/docker-compose.local.yml b/occupi-backend/docker-compose.local.yml index 67bca418..2a888571 100644 --- a/occupi-backend/docker-compose.local.yml +++ b/occupi-backend/docker-compose.local.yml @@ -12,9 +12,9 @@ services: image: centrifugo/centrifugo:v5 container_name: centrifugo-dev-local-local volumes: - - ./configs/config.json:/centrifugo/config.json + - ./configs/centrifugo.config.json:/centrifugo/centrifugo.config.json - centrifugo-dev-local-local:/centrifugo/data - command: centrifugo -c config.json + command: centrifugo -c centrifugo.config.json ports: - 8001:8000 ulimits: diff --git a/occupi-backend/docker-compose.localdev.yml b/occupi-backend/docker-compose.localdev.yml index 210cd73a..7ffbb5f1 100644 --- a/occupi-backend/docker-compose.localdev.yml +++ b/occupi-backend/docker-compose.localdev.yml @@ -36,9 +36,9 @@ services: image: centrifugo/centrifugo:v5 container_name: centrifugo-dev-local volumes: - - ./configs/config.json:/centrifugo/config.json + - ./configs/centrifugo.config.json:/centrifugo/centrifugo.config.json - centrifugo-dev-local:/centrifugo/data - command: centrifugo -c config.json + command: centrifugo -c centrifugo.config.json ports: - 8000:8000 ulimits: @@ -66,4 +66,4 @@ services: volumes: rabbitmq-dev-local: centrifugo-dev-local: - redis-dev-local: + redis-dev-local: \ No newline at end of file diff --git a/occupi-backend/docker-compose.prod.yml b/occupi-backend/docker-compose.prod.yml index 439f55a7..b7831886 100644 --- a/occupi-backend/docker-compose.prod.yml +++ b/occupi-backend/docker-compose.prod.yml @@ -48,9 +48,9 @@ services: image: centrifugo/centrifugo:v5 container_name: centrifugo-prod volumes: - - ./configs/config.json:/centrifugo/config.json + - ./centrifugo.config.json:/centrifugo/centrifugo.config.json - centrifugo-prod:/centrifugo/data - command: centrifugo -c config.json --health + command: centrifugo -c centrifugo.config.json --health ports: - 8000:8000 ulimits: @@ -84,4 +84,4 @@ volumes: networks: webnet: - external: true + external: true \ No newline at end of file diff --git a/occupi-backend/scripts/decrypt_env_variables.sh b/occupi-backend/scripts/decrypt_env_variables.sh index 00253e80..86d907f1 100644 --- a/occupi-backend/scripts/decrypt_env_variables.sh +++ b/occupi-backend/scripts/decrypt_env_variables.sh @@ -1,7 +1,7 @@ #!/bin/bash # Define the files to be decrypted -files=("config.yaml.gpg" "dev.deployed.yaml.gpg" "dev.localhost.yaml.gpg" "prod.yaml.gpg" "test.yaml.gpg" "config.json.gpg") +files=("config.yaml.gpg" "dev.deployed.yaml.gpg" "dev.localhost.yaml.gpg" "prod.yaml.gpg" "test.yaml.gpg" "centrifugo.config.json.gpg") # cd to configs directory cd ../configs @@ -24,4 +24,4 @@ for file in "${files[@]}"; do echo "File $file does not exist." exit 1 fi -done +done \ No newline at end of file diff --git a/occupi-backend/scripts/encrypt_env_variables.sh b/occupi-backend/scripts/encrypt_env_variables.sh index 7ae1f151..524c2355 100644 --- a/occupi-backend/scripts/encrypt_env_variables.sh +++ b/occupi-backend/scripts/encrypt_env_variables.sh @@ -1,7 +1,7 @@ #!/bin/bash # Define the files to be encrypted -files=("config.yaml" "dev.deployed.yaml" "dev.localhost.yaml" "dev.localhost.yaml" "prod.yaml" "test.yaml" "config.json") +files=("config.yaml" "dev.deployed.yaml" "dev.localhost.yaml" "dev.localhost.yaml" "prod.yaml" "test.yaml" "centrifugo.config.json") # cd to configs directory cd ../configs