Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Msg broker #6

Merged
merged 8 commits into from
Aug 18, 2024
Merged

Msg broker #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
902836b
Merge branch 'master' into msg-broker
guimard Aug 13, 2024
320cecd
Add message broker
guimard Aug 13, 2024
c248f94
Setup broker on Pg when available
guimard Aug 14, 2024
f49a325
Fix test
guimard Aug 14, 2024
5052e86
Broker update
guimard Aug 14, 2024
cdda6d3
Fix test
guimard Aug 14, 2024
2dde717
Merge branch 'portal-relay-to-manager' into msg-broker
guimard Aug 14, 2024
929afd7
use RELAY into broker test
guimard Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# Changes

* 2024-08-14: add RELAY variable
* 2024-08-14: add message-broker
* 2024-08-13: add reCaptcha plugin
* 2024-07-24: update to 2.19.1
* 2024-07-24: update to 2.19.1 (v2.19.1-1)
* 2024-07-15: add sessions-backup task docker (v2.19.0-9)
* 2024-07-15: add "backup/restore" commands into session cli
* 2024-07-10: add "count" command into session cli
Expand Down
2 changes: 2 additions & 0 deletions base-no-s6/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Expand Down
2 changes: 2 additions & 0 deletions base-no-s6/install/etc/cont-init.d/update-llng-conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading