From 8f0501b445788dc81917a18301c9529c7a57956e Mon Sep 17 00:00:00 2001 From: William Petit Date: Sun, 28 May 2023 15:41:40 +0200 Subject: [PATCH] fix: packaging scripts and config --- misc/packaging/common/config.yml | 11 ++++++----- misc/packaging/common/postinstall-bouncer-admin.sh | 2 +- misc/packaging/common/postinstall-bouncer-proxy.sh | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/misc/packaging/common/config.yml b/misc/packaging/common/config.yml index 0f0a40d..810c204 100644 --- a/misc/packaging/common/config.yml +++ b/misc/packaging/common/config.yml @@ -20,14 +20,15 @@ admin: debug: false auth: issuer: http://127.0.0.1:8081 - privateKey: admin-key.json + privateKey: /etc/bouncer/admin-key.json proxy: http: host: 0.0.0.0 port: 8080 -database: - driver: sqlite - dsn: sqlite://bouncer.sqlite?_pragma=foreign_keys(1)&_pragma=busy_timeout=10000 +redis: + addresses: + - localhost:6379 + master: "" logger: level: 1 - format: human \ No newline at end of file + format: human diff --git a/misc/packaging/common/postinstall-bouncer-admin.sh b/misc/packaging/common/postinstall-bouncer-admin.sh index 2e04d97..6eb568e 100644 --- a/misc/packaging/common/postinstall-bouncer-admin.sh +++ b/misc/packaging/common/postinstall-bouncer-admin.sh @@ -28,7 +28,7 @@ cleanInstall() { service ${service_name} restart || : else - if [[ "${systemd_version}" -lt 231 ]]; then + if [ "${systemd_version}" -lt 231 ]; then printf "\033[31m systemd version %s is less then 231, fixing the service file \033[0m\n" "${systemd_version}" sed -i "s/=+/=/g" /usr/lib/systemd/system/${service_name}.service fi diff --git a/misc/packaging/common/postinstall-bouncer-proxy.sh b/misc/packaging/common/postinstall-bouncer-proxy.sh index de03a0a..7bf305c 100644 --- a/misc/packaging/common/postinstall-bouncer-proxy.sh +++ b/misc/packaging/common/postinstall-bouncer-proxy.sh @@ -28,7 +28,7 @@ cleanInstall() { service ${service_name} restart || : else - if [[ "${systemd_version}" -lt 231 ]]; then + if [ "${systemd_version}" -lt 231 ]; then printf "\033[31m systemd version %s is less then 231, fixing the service file \033[0m\n" "${systemd_version}" sed -i "s/=+/=/g" /usr/lib/systemd/system/${service_name}.service fi