Compare commits

..
2 Commits
Author SHA1 Message Date
moritz b84af1e8d4 chore: publish 4.1.2+7.1.2 release
continuous-integration/drone/tag Build is passing
2026-08-18 17:22:57 +02:00
moritz 64032582b2 fix abra.sh commands 2026-08-18 17:22:40 +02:00
2 changed files with 5 additions and 22 deletions
+3 -20
View File
@@ -3,11 +3,11 @@ export AUTO_WIZARD_VERSION=v2
export PG_BACKUP_VERSION=v2
get_setting_changes() {
/custom-entrypoint.sh "rails r 'puts JSON.pretty_generate(JSON.parse(Setting.all.select{ |setting| setting.state_current != setting.state_initial }.map { |setting| {name: setting.name, value: setting.state_current[\""value\""]} } .to_json))'"
/custom-entrypoint.sh "bundle exec rails r 'puts JSON.pretty_generate(JSON.parse(Setting.all.select{ |setting| setting.state_current != setting.state_initial }.map { |setting| {name: setting.name, value: setting.state_current[\""value\""]} } .to_json))'"
}
console() {
/custom-entrypoint.sh "rails c"
/custom-entrypoint.sh "bundle exec rails c"
}
rails_run() {
@@ -17,7 +17,7 @@ rails_run() {
init() {
cp -f /opt/zammad/contrib/auto_wizard.json /tmp/auto_wizard.json
/custom-entrypoint.sh "rails zammad:setup:auto_wizard[/tmp/auto_wizard.json]"
/custom-entrypoint.sh "bundle exec rake zammad:setup:auto_wizard[/tmp/auto_wizard.json]"
}
enable_authentik_sso() {
@@ -38,23 +38,6 @@ enable_authentik_sso() {
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() {
LOGO_PATH="$1"
abra app cp "$APP_NAME" "$LOGO_PATH" zammad-railsserver:/tmp/
+2 -2
View File
@@ -134,7 +134,7 @@ services:
- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
- "coop-cloud.${STACK_NAME}.version=4.1.1+7.1.2"
- "coop-cloud.${STACK_NAME}.version=4.1.2+7.1.2"
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:8080"]
@@ -168,7 +168,7 @@ services:
secrets:
- db_password
healthcheck:
test: ["CMD", "pg_isready", "-U", "zammad", "-d", "zammad_production"]
test: ["CMD", "pg_isready", "-U", "zammad"]
interval: 30s
timeout: 10s
retries: 10