Uodated configuration commands for centrifugo

COS301-SE-2024 · Sep 5, 2024 · 190eac4 · 190eac4
1 parent a2a345d
commit 190eac4
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 17 deletions.
diff --git a/occupi-backend/configs/centrifugo.config.json.gpg b/occupi-backend/configs/centrifugo.config.json.gpg
diff --git a/occupi-backend/configs/config.json.gpg b/occupi-backend/configs/config.json.gpg
diff --git a/occupi-backend/configs/config.yaml.gpg b/occupi-backend/configs/config.yaml.gpg
diff --git a/occupi-backend/configs/dev.deployed.yaml.gpg b/occupi-backend/configs/dev.deployed.yaml.gpg
diff --git a/occupi-backend/configs/dev.localhost.yaml.gpg b/occupi-backend/configs/dev.localhost.yaml.gpg
diff --git a/occupi-backend/configs/prod.yaml.gpg b/occupi-backend/configs/prod.yaml.gpg
diff --git a/occupi-backend/configs/test.yaml.gpg b/occupi-backend/configs/test.yaml.gpg
diff --git 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
diff --git 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
@@ -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:
diff --git 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
diff --git 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
diff --git 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