Compare commits

...
2 Commits
Author SHA1 Message Date
p4u1 0623071756 feat: add enable_rauthy_sso command 2026-08-19 14:08:04 +02:00
Apfelwurm 1e16a607cc fix postgres healthcheck 2026-08-17 16:39:03 +02:00
2 changed files with 19 additions and 2 deletions
+18 -1
View File
@@ -11,7 +11,7 @@ console() {
} }
rails_run() { rails_run() {
COMMAND="rails r \"$@\"" COMMAND="bundle exec rails r \"$@\""
/custom-entrypoint.sh "$COMMAND" /custom-entrypoint.sh "$COMMAND"
} }
@@ -38,6 +38,23 @@ enable_authentik_sso() {
abra app cmd -T $DOMAIN zammad-railsserver rails_run "$(printf "%q " $COMMAND)" abra app cmd -T $DOMAIN zammad-railsserver rails_run "$(printf "%q " $COMMAND)"
} }
enable_rauthy_sso() {
COMMAND="
(u = User.find_by(id: 3)) && (u.login='$OID_ADMIN_UID') && u.save!;
Setting.set('auth_openid_connect', true);
Setting.set('auth_third_party_auto_link_at_inital_login', true);
Setting.set('auth_openid_connect_credentials', {
'display_name'=>'$ORGANIZATION',
'identifier'=>'$OID_SSO_IDENTIFIER',
'issuer'=>'$OID_SSO_ISSUER',
'uid_field'=>'$OID_SSO_UID_FIELD',
'scope'=>'$OID_SSO_SCOPES',
'pkce'=>'$OID_SSO_PKCE',
'callback_url'=>'$OID_SSO_CALLBACK_URL'})
"
abra app cmd -T $DOMAIN app rails_run "$(printf "%q " $COMMAND)"
}
set_logo() { set_logo() {
LOGO_PATH="$1" LOGO_PATH="$1"
abra app cp "$APP_NAME" "$LOGO_PATH" zammad-railsserver:/tmp/ abra app cp "$APP_NAME" "$LOGO_PATH" zammad-railsserver:/tmp/
+1 -1
View File
@@ -168,7 +168,7 @@ services:
secrets: secrets:
- db_password - db_password
healthcheck: healthcheck:
test: ["CMD", "pg_isready", "-U", "zammad"] test: ["CMD", "pg_isready", "-U", "zammad", "-d", "zammad_production"]
interval: 30s interval: 30s
timeout: 10s timeout: 10s
retries: 10 retries: 10