Merge branch 'experimental'

.github/workflows/docker-publish.yml

@@ -4,7 +4,7 @@ env:
   VERSION: 2.19.1
   PGVERSION: 15
   DEBIANRELEASE: bookworm
-  DOCKERREVISION: 3
+  DOCKERREVISION: 4
 
 on:
   push:

.github/workflows/pr.yml

@@ -8,7 +8,7 @@ env:
 
 on:
   push:
-    branches-ignore: [master,stable]
+    branches-ignore: [master,stable,experimental]
 
 jobs:
   test:

Changes.md

@@ -1,5 +1,6 @@
 # Changes
 
+* 2024-08-14: add message-broker
 * 2024-08-16(v2.19.1-3):
   * add `TLS_CERT_FILE` and `TLS_KEY_FILE` variables (v2.19.1-3)
   * preserve requests in RELAY

base-no-s6/Dockerfile

@@ -79,7 +79,9 @@ RUN echo "# Install packages from ${DEBIAN_VERSION} (${LLNGDIST})" && \
     chown www-data:www-data /var/lib/lemonldap-ng/cache && \
     chmod 750 /var/lib/lemonldap-ng/cache && \
     perl -000 -MJSON -i -ne '$_=JSON::from_json($_);$_->{reloadUrls}={};print JSON->new->pretty->canonical->encode($_)' /var/lib/lemonldap-ng/conf/lmConf-1.json && \
+    perl -i -pe 's/\r//g' /usr/share/perl5/Lemonldap/NG/Common/Conf/DefaultValues.pm && \
     echo "patch session-cli.patch" && patch -p1 <session-cli.patch && \
+    echo "patch msg-broker.patch" && patch -p1 <msg-broker.patch && \
     rm -f *.patch
 
 #COPY syslogopt.patch .

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