Merge branch 'main' into reporting

docker/compose/bridge.yml

@@ -2,22 +2,24 @@ x-global-vars: &common-global-variables
   TZ: Etc/UTC
 
 x-bridge-vars: &common-bridge-variables
-  DATABASE_HOST: "bridge-postgresql"
-  DATABASE_NAME: "bridge"
+  DATABASE_HOST: "postgresql"
+  DATABASE_NAME: "cdr"
+  DATABASE_USER: ${DATABASE_USER}
   DATABASE_ROOT_OWNER: "root"
   DATABASE_ROOT_PASSWORD: ${BRIDGE_DATABASE_ROOT_PASSWORD}
-  DATABASE_OWNER: "bridge"
-  DATABASE_PASSWORD: ${BRIDGE_DATABASE_PASSWORD}
-  DATABASE_URL: "postgresql://bridge:${BRIDGE_DATABASE_PASSWORD}@bridge-postgresql/bridge"
-  WORKER_DATABASE_URL: "postgresql://bridge:${BRIDGE_DATABASE_PASSWORD}@bridge-postgresql/bridge"
-  SHADOW_DATABASE_URL: "postgresql://bridge:${BRIDGE_DATABASE_PASSWORD}@bridge-postgresql/bridge_shadow"
-  ROOT_DATABASE_URL: "postgresql://bridge:${BRIDGE_DATABASE_PASSWORD}@bridge-postgresql/template1"
-  APP_ROOT_DATABASE_URL: "postgresql://root:${BRIDGE_DATABASE_ROOT_PASSWORD}@bridge-postgresql/bridge"
-  DATABASE_AUTH_URL: "postgresql://app_graphile_auth:${BRIDGE_DATABASE_AUTHENTICATOR_PASSWORD}@bridge-postgresql/bridge"
+  DATABASE_OWNER: ${DATABASE_USER}
+  DATABASE_PASSWORD: ${DATABASE_PASSWORD}
+  DATABASE_URL: "postgresql://bridge:${DATABASE_PASSWORD}@postgresql/cdr"
+  WORKER_DATABASE_URL: "postgresql://bridge:${DATABASE_PASSWORD}@postgresql/cdr"
+  SHADOW_DATABASE_URL: "postgresql://bridge:${DATABASE_PASSWORD}@postgresql/cdr_shadow"
+  ROOT_DATABASE_URL: "postgresql://bridge:${DATABASE_PASSWORD}@postgresql/template1"
+  APP_ROOT_DATABASE_URL: "postgresql://root:${BRIDGE_DATABASE_ROOT_PASSWORD}@postgresql/bridge"
+  DATABASE_AUTH_URL: "postgresql://app_graphile_auth:${BRIDGE_DATABASE_AUTHENTICATOR_PASSWORD}@postgresql/cdr"
   FRONTEND_URL: ${BRIDGE_DOMAIN}
   API_URL: "http://bridge-api:3001"
   NEXTAUTH_URL: ${BRIDGE_DOMAIN}
   NEXTAUTH_SECRET: ${NEXTAUTH_SECRET}
+  BRIDGE_SIGNAL_URL: ${BRIDGE_SIGNAL_URL}
 
 services:
   bridge-frontend:

docker/compose/link.yml

@@ -13,15 +13,23 @@ services:
     environment:
       ZAMMAD_API_TOKEN: ${ZAMMAD_API_TOKEN}
       ZAMMAD_VIRUAL_HOST: ${ZAMMAD_VIRTUAL_HOST}
-      LINK_URL: http://localhost:3000
+      LINK_URL: ${LINK_URL}
       LEAFCUTTER_URL: https://lc.digiresilience.org
       BRIDGE_URL: http://bridge-frontend:3000
+      BRIDGE_SIGNAL_URL: http://signal-cli-rest-api:8080
+      BRIDGE_WHATSAPP_URL: http://bridge-whatsapp:3000
       ZAMMAD_URL: http://zammad-nginx:8080
       REDIS_URL: "redis://zammad-redis:6379"
-      NEXTAUTH_URL: ${LINK_URL}
+      NEXTAUTH_URL: ${LINK_URL}/api/auth
       NEXTAUTH_SECRET: ${NEXTAUTH_SECRET}
       NEXTAUTH_AUDIENCE: ${NEXTAUTH_AUDIENCE}
       NEXTAUTH_SIGNING_KEY_B64: ${NEXTAUTH_SIGNING_KEY_B64}
       NEXTAUTH_ENCRYPTION_KEY_B64: ${NEXTAUTH_ENCRYPTION_KEY_B64}
       GOOGLE_CLIENT_ID: ${GOOGLE_CLIENT_ID}
       GOOGLE_CLIENT_SECRET: ${GOOGLE_CLIENT_SECRET}
+      DATABASE_HOST: ${DATABASE_HOST}
+      DATABASE_NAME: ${DATABASE_NAME}
+      DATABASE_PORT: ${DATABASE_PORT}
+      DATABASE_USER: ${DATABASE_USER}
+      DATABASE_PASSWORD: ${DATABASE_PASSWORD}
+      DATABASE_URL: ${DATABASE_URL}

docker/compose/signal-cli-rest-api.yml

@@ -4,7 +4,7 @@ services:
     build: ../signal-cli-rest-api
     image: registry.gitlab.com/digiresilience/link/link-stack/signal-cli-rest-api:develop
     environment:
-      - MODE=json-rpc
+      - MODE=normal
     volumes:
       - signal-cli-rest-api-data:/home/.local/share/signal-cli
     ports:

docker/compose/zammad.yml

@@ -78,7 +78,6 @@ services:
       - postgresql
     environment:
       <<: [*common-global-variables, *common-zammad-variables]
-      RAILS_RELATIVE_URL_ROOT: /zammad
     build:
       context: ../zammad
       args:

docker/scripts/docker.js

@@ -7,6 +7,7 @@ const files = {
   all: ["zammad", "postgresql", "bridge", "opensearch", "leafcutter", "link", "signal-cli-rest-api"],
   linkDev: ["zammad", "postgresql", "opensearch"],
   link: ["zammad", "postgresql", "opensearch", "link"],
+  linkOnly: ["link"],
   leafcutterDev: ["opensearch"],
   leafcutter: ["opensearch", "leafcutter"],
   opensearch: ["opensearch"],

docker/signal-cli-rest-api/Dockerfile

@@ -1 +1 @@
-FROM bbernhard/signal-cli-rest-api:0.90
+FROM bbernhard/signal-cli-rest-api:0.176-dev

docker/zammad/Dockerfile

@@ -22,7 +22,15 @@ RUN sed -i '/touch db\/schema.rb/a ZAMMAD_SAFE_MODE=1 DATABASE_URL=postgresql:\/
 RUN cat contrib/docker/setup.sh
 RUN contrib/docker/setup.sh builder
 ARG EMBEDDED=false
-RUN if [ "$EMBEDDED" = "true" ] ; then sed -i '/proxy_set_header X-Forwarded-User "";/d' ${ZAMMAD_DIR}/contrib/nginx/zammad.conf; fi
+RUN if [ "$EMBEDDED" = "true" ] ; then sed -i '/location \/ {/i \
+\    \n\
+\    location /link {\n\
+\        proxy_pass http://link:3000;\n\
+\        proxy_set_header Host $host;\n\
+\        proxy_set_header X-Real-IP $remote_addr;\n\
+\        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;\n\
+\        proxy_set_header X-Forwarded-Proto https;\n\
+\    }\n' ${ZAMMAD_DIR}/contrib/nginx/zammad.conf; fi
 RUN sed -i '/^[[:space:]]*# es config/a\
   echo "about to reinstall..."\n\
   bundle exec rails runner /opt/zammad/contrib/link/setup.rb\n\