[Etherpad] Whoops, switched Compose files

pica-etherpad/standard/docker-compose.yml

@@ -2,27 +2,27 @@ version : "3.7"
 
 volumes:
   db:
-    name: weekpad-db
+    name: etherpad-db-pg
   deleted-pads:
-    name: deleted-pads-week
+    name: deleted-pads-standard
   api-key:
-    name: etherpad-api-week-key
+    name: etherpad-api-key
 
 networks:
   app-db:
-    name: etherpad_week-queries-database
+    name: etherpad-queries-database
   dpad-app:
-    name: etherpad_week-dpad-queries-app
+    name: etherpad-dpad-queries-app
   proxy:
     external: true
 
 services:
   db:
     image: postgres:12
-    container_name: etherpad_week_db
+    container_name: etherpad_db
     volumes:
       - db:/var/lib/postgresql/data
-    env_file: ./secrets/etherpad-week-db.secrets
+    env_file: ./secrets/etherpad-db.secrets
     networks:
       - app-db
     restart: unless-stopped
@@ -30,24 +30,24 @@ services:
   app:
     image: registry.picasoft.net/pica-etherpad:1.8.6
     build: ..
-    container_name: etherpad_week_app
-    env_file: ./secrets/etherpad-week-app.secrets
+    container_name: etherpad_app
+    env_file: ./secrets/etherpad-app.secrets
     volumes:
       - ./settings.json:/opt/etherpad-lite/settings.json:ro
       - api-key:/mountedAPIkey
     command: ["--apikey", "/mountedAPIkey/APIKEY.txt"]
     labels:
       traefik.http.routers.etherpad-app.entrypoints: websecure
-      traefik.http.routers.etherpad-app.rule: Host(`week.pad.picasoft.net`)
+      traefik.http.routers.etherpad-app.rule: Host(`pad.picasoft.net`)
       traefik.http.services.etherpad-app.loadbalancer.server.port: 8080
       traefik.enable: true
     environment:
-      DB_HOST: "etherpad_week_db"
+      DB_HOST: "etherpad_db"
       LOGLEVEL: "INFO"
       MINIFY: "true"
       PORT: 8080
       THEME: "colibris"
-      TITLE: "Picapad Hebdo"
+      TITLE: "Picapad"
       TRUST_PROXY: "true"
     networks:
       - proxy
@@ -69,9 +69,9 @@ services:
       - dpad-app
     environment:
       # Must match app container name and port
-      URL: "http://etherpad_week_app:8080"
-      # In seconds (14 days). MUST be COHERENT with settings.json
-      DEL: 1209600
+      URL: "http://etherpad_app:8080"
+      # In seconds (2 years). MUST be COHERENT with settings.json
+      DEL: 71712000
       # Same mount point than deleted-pads
       DIR: "/opt/etherpad-lite/deleted_pads"
       # Same mount point than api-key + APIKEY.txt

pica-etherpad/week/docker-compose.yml

+
 version : "3.7"
 
 volumes:
   db:
-    name: etherpad-db-pg
+    name: weekpad-db
   deleted-pads:
-    name: deleted-pads-standard
+    name: deleted-pads-week
   api-key:
-    name: etherpad-api-key
+    name: etherpad-api-week-key
 
 networks:
   app-db:
-    name: etherpad-queries-database
+    name: etherpad_week-queries-database
   dpad-app:
-    name: etherpad-dpad-queries-app
+    name: etherpad_week-dpad-queries-app
   proxy:
     external: true
 
 services:
   db:
     image: postgres:12
-    container_name: etherpad_db
+    container_name: etherpad_week_db
     volumes:
       - db:/var/lib/postgresql/data
-    env_file: ./secrets/etherpad-db.secrets
+    env_file: ./secrets/etherpad-week-db.secrets
     networks:
       - app-db
     restart: unless-stopped
@@ -30,24 +31,24 @@ services:
   app:
     image: registry.picasoft.net/pica-etherpad:1.8.6
     build: ..
-    container_name: etherpad_app
-    env_file: ./secrets/etherpad-app.secrets
+    container_name: etherpad_week_app
+    env_file: ./secrets/etherpad-week-app.secrets
     volumes:
       - ./settings.json:/opt/etherpad-lite/settings.json:ro
       - api-key:/mountedAPIkey
     command: ["--apikey", "/mountedAPIkey/APIKEY.txt"]
     labels:
       traefik.http.routers.etherpad-app.entrypoints: websecure
-      traefik.http.routers.etherpad-app.rule: Host(`pad.picasoft.net`)
+      traefik.http.routers.etherpad-app.rule: Host(`week.pad.picasoft.net`)
       traefik.http.services.etherpad-app.loadbalancer.server.port: 8080
       traefik.enable: true
     environment:
-      DB_HOST: "etherpad_db"
+      DB_HOST: "etherpad_week_db"
       LOGLEVEL: "INFO"
       MINIFY: "true"
       PORT: 8080
       THEME: "colibris"
-      TITLE: "Picapad"
+      TITLE: "Picapad Hebdo"
       TRUST_PROXY: "true"
     networks:
       - proxy
@@ -69,9 +70,9 @@ services:
       - dpad-app
     environment:
       # Must match app container name and port
-      URL: "http://etherpad_app:8080"
-      # In seconds (2 years). MUST be COHERENT with settings.json
-      DEL: 71712000
+      URL: "http://etherpad_week_app:8080"
+      # In seconds (14 days). MUST be COHERENT with settings.json
+      DEL: 1209600
       # Same mount point than deleted-pads
       DIR: "/opt/etherpad-lite/deleted_pads"
       # Same mount point than api-key + APIKEY.txt