Repo cleanup

docker/compose/bridge-whatsapp.yml

@@ -9,7 +9,7 @@ services:
     environment:
       PORT: 5000
       NODE_ENV: production
-      BRIDGE_FRONTEND_URL: http://link:3000/link
+      ZAMMAD_URL: http://zammad-nginx:8080
     volumes:
       - bridge-whatsapp-data:/home/node/baileys
     ports:

docker/compose/bridge.yml

@@ -1,40 +0,0 @@
-x-global-vars: &common-global-variables
-  TZ: Etc/UTC
-
-x-bridge-vars: &common-bridge-variables
-  DATABASE_HOST: "postgresql"
-  DATABASE_NAME: "cdr"
-  DATABASE_PORT: "5432"
-  DATABASE_USER: ${DATABASE_USER}
-  DATABASE_ROOT_OWNER: "root"
-  DATABASE_ROOT_PASSWORD: ${BRIDGE_DATABASE_ROOT_PASSWORD}
-  DATABASE_OWNER: ${DATABASE_USER}
-  DATABASE_PASSWORD: ${DATABASE_PASSWORD}
-  DATABASE_URL: "postgresql://${DATABASE_USER}:${DATABASE_PASSWORD}@postgresql/cdr"
-  WORKER_DATABASE_URL: "postgresql://${DATABASE_USER}:${DATABASE_PASSWORD}@postgresql/cdr"
-  SHADOW_DATABASE_URL: "postgresql://${DATABASE_USER}:${DATABASE_PASSWORD}@postgresql/cdr_shadow"
-  ROOT_DATABASE_URL: "postgresql://${DATABASE_USER}:${DATABASE_PASSWORD}@postgresql/template1"
-  APP_ROOT_DATABASE_URL: "postgresql://zammad:${ZAMMAD_DATABASE_PASSWORD}@postgresql/zammad_production"
-  DATABASE_AUTH_URL: "postgresql://${DATABASE_USER}:${DATABASE_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}
-  BRIDGE_SIGNAL_AUTO_GROUPS: ${BRIDGE_SIGNAL_AUTO_GROUPS}
-  BRIDGE_WHATSAPP_URL: "http://bridge-whatsapp:5000"
-  LOG_LEVEL: "debug"
-  ZAMMAD_API_TOKEN: ${ZAMMAD_API_TOKEN}
-  ZAMMAD_URL: ${ZAMMAD_URL}
-  FORMSTACK_SHARED_SECRET: ${FORMSTACK_SHARED_SECRET}
-  FORMSTACK_FIELD_MAPPING: ${FORMSTACK_FIELD_MAPPING}
-
-services:
-  bridge-worker:
-    build:
-      context: ../../
-      dockerfile: ./apps/bridge-worker/Dockerfile
-    container_name: bridge-worker
-    image: registry.gitlab.com/digiresilience/link/link-stack/bridge-worker:${LINK_STACK_VERSION}
-    restart: ${RESTART}
-    environment: *common-bridge-variables

docker/compose/link.yml

@@ -1,36 +0,0 @@
-services:
-  link:
-    container_name: link
-    restart: ${RESTART}
-    build:
-      context: ../../
-      dockerfile: ./apps/link/Dockerfile
-    image: registry.gitlab.com/digiresilience/link/link-stack/link:${LINK_STACK_VERSION}
-    expose:
-      - "3000"
-    ports:
-      - "8004:3000"
-    environment:
-      ZAMMAD_API_TOKEN: ${ZAMMAD_API_TOKEN}
-      ZAMMAD_VIRUAL_HOST: ${ZAMMAD_VIRTUAL_HOST}
-      LINK_URL: ${LINK_URL}
-      BRIDGE_URL: http://bridge-frontend:3000
-      BRIDGE_SIGNAL_URL: http://signal-cli-rest-api:8080
-      BRIDGE_WHATSAPP_URL: http://bridge-whatsapp:5000
-      ZAMMAD_URL: http://zammad-nginx:8080
-      REDIS_URL: "redis://zammad-redis:6379"
-      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}
-      FORMSTACK_SHARED_SECRET: ${FORMSTACK_SHARED_SECRET}
-      LOG_LEVEL: debug

docker/compose/zammad.yml

@@ -15,6 +15,9 @@ x-zammad-vars: &common-zammad-variables
   ELASTICSEARCH_SSL_VERIFY: "false" # this doesn't set es_ssl_verify as expected, but ideally it would
   ELASTICSEARCH_SCHEMA: "https"
   BRIDGE_SIGNAL_AUTO_GROUPS: ${BRIDGE_SIGNAL_AUTO_GROUPS}
+  SIGNAL_CLI_URL: "http://signal-cli-rest-api:8080"
+  BRIDGE_WHATSAPP_URL: "http://bridge-whatsapp:5000"
+  FORMSTACK_FIELD_MAPPING: ${FORMSTACK_FIELD_MAPPING}
 
 x-zammad-args: &common-zammad-args
   EMBEDDED: "true"

docker/scripts/docker.js

@@ -5,14 +5,11 @@ const app = process.argv[2];
 const command = process.argv[3];
 
 const files = {
-  all: ["zammad", "postgresql", "bridge", "opensearch", "link", "signal-cli-rest-api", "bridge-whatsapp"],
-  linkDev: ["zammad", "postgresql", "opensearch"],
-  link: ["zammad", "postgresql", "opensearch", "link"],
-  linkOnly: ["link"],
+  all: ["zammad", "postgresql", "opensearch", "signal-cli-rest-api", "bridge-whatsapp"],
+  dev: ["zammad", "postgresql", "opensearch", "signal-cli-rest-api"],
   opensearch: ["opensearch"],
-  bridgeDev: ["zammad", "postgresql", "signal-cli-rest-api", "bridge-whatsapp"],
-  bridge: ["zammad", "postgresql", "bridge", "signal-cli-rest-api", "bridge-whatsapp"],
-  zammad: ["zammad", "postgresql", "opensearch"],
+  zammad: ["zammad", "postgresql", "opensearch", "signal-cli-rest-api"],
+  whatsapp: ["bridge-whatsapp"],
 };
 
 
@@ -20,10 +17,9 @@ const envFile = path.resolve(process.cwd(), '.env');
 const finalFiles = files[app]
   .map((file) => ['-f', `docker/compose/${file}.yml`]).flat();
 
-// Add bridge-dev.yml for dev commands that include zammad
-const devAppsWithZammad = ['linkDev', 'bridgeDev'];
-if (devAppsWithZammad.includes(app) && files[app].includes('zammad')) {
-  finalFiles.push('-f', 'docker-compose.bridge-dev.yml');
+// Add dev overrides for development mode
+if (app === 'linkDev' && files[app].includes('zammad')) {
+  // Development mode configurations can be added here if needed
 }
 
 

docker/zammad/setup.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 # uninstall
-package_names = %w[Hardening Bridge]
+# Include both Bridge (legacy) and Link (new) for migration support
+package_names = %w[Hardening Bridge Link]
 
 package_names.each do |name|
   puts "Attempting to uninstall #{name} package..."