diff --git a/abra.sh b/abra.sh index b7a8ad2..d43571b 100644 --- a/abra.sh +++ b/abra.sh @@ -3,28 +3,27 @@ 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 "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 "rails c" } - rails_run() { - COMMAND="rails r \"$@\"" - /custom-entrypoint.sh "$COMMAND" + COMMAND="rails r \"$@\"" + /custom-entrypoint.sh "$COMMAND" } 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]" + cp -f /opt/zammad/contrib/auto_wizard.json /tmp/auto_wizard.json + /custom-entrypoint.sh "rails zammad:setup:auto_wizard[/tmp/auto_wizard.json]" } enable_authentik_sso() { - ADMIN_UID=$(abra app cmd -T $SSO_PROVIDER_DOMAIN worker get_user_uid akadmin) - CERT=$(abra app cmd -T $SSO_PROVIDER_DOMAIN worker get_certificate zammad) - COMMAND=" + ADMIN_UID=$(abra app cmd -T $SSO_PROVIDER_DOMAIN worker get_user_uid akadmin) + CERT=$(abra app cmd -T $SSO_PROVIDER_DOMAIN worker get_certificate zammad) + COMMAND=" (u = User.find_by(login: 'admin')) && (u.login='$ADMIN_UID') && u.save!; Setting.set('auth_saml', true); Setting.set('auth_third_party_auto_link_at_inital_login', true); @@ -36,18 +35,26 @@ enable_authentik_sso() { 'idp_cert_fingerprint'=>'', 'name_identifier_format'=>'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress'}) " - abra app cmd -T $DOMAIN zammad-railsserver rails_run "$(printf "%q " $COMMAND )" + abra app cmd -T $DOMAIN zammad-railsserver rails_run "$(printf "%q " $COMMAND)" } set_logo() { - LOGO_PATH="$1" - abra app cp "$APP_NAME" "$LOGO_PATH" zammad-railsserver:/tmp/ - filename="$(basename "$LOGO_PATH")" - COMMAND=" + LOGO_PATH="$1" + abra app cp "$APP_NAME" "$LOGO_PATH" zammad-railsserver:/tmp/ + filename="$(basename "$LOGO_PATH")" + COMMAND=" logo_path = '/tmp/$filename'; logo_content = File.open(logo_path, 'rb') { |file| file.read }; logo_timestamp = Service::SystemAssets::ProductLogo.store(logo_content); Setting.set('product_logo', logo_timestamp); " - abra app cmd -T $DOMAIN zammad-railsserver rails_run "$(printf "%q " $COMMAND )" + abra app cmd -T $DOMAIN zammad-railsserver rails_run "$(printf "%q " $COMMAND)" +} + +fix_permissions() { + i=0 + while ! abra app run -t -u 0 $DOMAIN zammad-elasticsearch -- chown elasticsearch -Rv /usr/share/elasticsearch/data && [[ $i -lt 30 ]]; do + ((i++)) + sleep 1 + done } diff --git a/release/3.0.0+6.5.0-34 b/release/3.0.0+6.5.0-34 index 77598bd..53fa3c8 100644 --- a/release/3.0.0+6.5.0-34 +++ b/release/3.0.0+6.5.0-34 @@ -1 +1,2 @@ -Breaking Change. You need to run the following command to change the elasticsearch volume permissions: abra app run -u 0 zammad-elasticsearch -- chown elasticsearch -Rv /usr/share/elasticsearch/data \ No newline at end of file +Breaking Change. You need to run the following command to change the elasticsearch volume permissions: +abra app cmd --local fix_permission