migrate bdd to bdd-ovh (10.128.0.96)

codimd/Dockerfile

@@ -1,14 +1,15 @@
 FROM quay.io/hedgedoc/hedgedoc:1.7.2-alpine
 
 ENV DEBUG=false
-ENV CMD_DB_URL=postgres://codimd:codimdpass@postgres:5432/codimd
 ENV CMD_EMAIL=true
 ENV CMD_ALLOW_EMAIL_REGISTER=true
 ENV CMD_PROTOCOL_USESSL=true
 ENV CMD_DOMAIN=codimd.auro.re
 ENV CMD_ALLOW_ORIGIN=['codimd.auro.re','hedgedoc.auro.re']
+ENV CMD_CSP_ENABLE=false
+ENV CMD_COOKIE_POLICY=none
 ENV CMD_ALLOW_FREEURL=true
-ENV CMD_LDAP_URL=ldap://10.128.0.21
+ENV CMD_LDAP_URL=ldap://10.128.0.149
 ENV CMD_LDAP_BINDDN=cn=codimd,ou=service-users,dc=auro,dc=re
 ENV CMD_LDAP_SEARCHBASE=cn=Utilisateurs,dc=auro,dc=re
 ENV CMD_LDAP_SEARCHFILTER=(uid={{username}})

docker-compose.yml

@@ -39,8 +39,6 @@ services:
       - "POSTGRES_PASSWORD=${ETHERPAD_POSTGRES_PASSWD}"
     ports:
       - 8084:9001
-    depends_on:
-      - postgres
 
   grafana:
     build: grafana
@@ -90,13 +88,12 @@ services:
     build: codimd
     restart: always
     environment:
+      - "CMD_DB_URL=${CODIMD_DB_URL}"
       - "CMD_LDAP_BINDCREDENTIALS=${CODIMD_LDAP_BINDCREDENTIALS}"
     ports:
       - "8081:3000"
     volumes:
       - ./codimd_uploads_data:/hedgedoc/public/uploads
-    depends_on:
-      - postgres
 
   docker_exporter:
     image: prometheusnet/docker_exporter
@@ -139,3 +136,15 @@ services:
 #    depends_on:
 #      - mongo
 #      - redis
+
+#  framaforms:
+#    build:
+#      context: framaforms
+#      args:
+#        - "FRAMAFORMS_DB_USER=framaforms"
+#        - "FRAMAFORMS_DB_PASSWORD=${FRAMAFORMS_POSTGRES_PASSWD}"
+#        - "FRAMAFORMS_DB=framaforms"
+#        - "FRAMAFORMS_DB_HOSTNAME=10.128.0.31"
+#    restart: unless-stopped
+#    ports:
+#      - "8088:80"

etherpad/settings.json

@@ -121,7 +121,7 @@
 
   "dbType": "postgres",
   "dbSettings": {
-    "host":     "10.128.0.31",
+    "host":     "10.128.0.96",
     "port":     5432,
     "database": "etherpad",
     "user":     "etherpad",