Broker update

guimard · Aug 14, 2024 · 5052e86 · 5052e86
1 parent f49a325
commit 5052e86
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/base-no-s6/install/etc/cont-init.d/update-llng-conf b/base-no-s6/install/etc/cont-init.d/update-llng-conf
@@ -82,6 +82,8 @@ if test "$DBI_CHAIN" != ""; then
        /usr/share/docker-llng/updateConf set casStorage "Apache::Session::Browseable::PgJSON"
        /usr/share/docker-llng/updateConf set casStorageOptions '{"TableName":"'"$PG_CAS_TABLE"'","DataSource":"'"$DBI_CHAIN"'","UserName":"'"$DBI_USER"'","Password":"'"$DBI_PASSWORD"'","Commit":1}'
      fi
+     /usr/share/docker-llng/updateConf set messageBroker ::Pg
+     /usr/share/docker-llng/updateConf set messageBrokerOptions '{"dbiChain":"'"$DBI_CHAIN"'","dbiUser":"'"$DBI_USER"'","dbiPassword":"'"$DBI_PASSWORD"'"}'
    else
      echo "Previous configuration found, skipping configuration conversion"
    fi

diff --git a/portal/__testbroker__/docker-compose.yml b/portal/__testbroker__/docker-compose.yml
@@ -13,8 +13,8 @@ services:
       retries: 5
     networks:
       - db
-    ports:
-      - 5432:5432
+    #ports:
+    #  - 5432:5432
 
   auth:
     container_name: test-broker-auth
@@ -28,12 +28,14 @@ services:
       - LOGGER=stderr
       - USERLOGGER=stderr
       - PORTAL=http://auth.example.com:19876/
+    volumes:
+      - ./manager-nginx.conf:/etc/nginx/sites-enabled/zzz-manager-nginx.conf
     networks:
       - db
-    ports:
-      - 19876:80
+    #ports:
+    #  - 19876:80
 
-  manager:
+  manager.example.com:
     container_name: test-broker-manager
     depends_on:
       db:

diff --git a/portal/__testbroker__/manager-nginx.conf b/portal/__testbroker__/manager-nginx.conf
@@ -0,0 +1,9 @@
+server {
+  listen 80;
+  listen [::]:80;
+  server_name manager.example.com;
+  root /usr/share/lemonldap-ng/manager/htdocs/;
+  location / {
+    proxy_pass http://manager.example.com/;
+  }
+}