Fix multiple issues and work around abra bug.
This commit is contained in:
parent
84e3c0ceff
commit
dfa48a0a47
20
abra.sh
20
abra.sh
|
@ -1,27 +1,27 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
export ENTRYPOINT_CONF_VERSION=v6
|
export ENTRYPOINT_CONF_VERSION=v7
|
||||||
|
|
||||||
assets() {
|
assets() {
|
||||||
export OTP_SECRET=$(cat /run/secrets/otp_secret)
|
set -x OTP_SECRET $(cat /run/secrets/otp_secret)
|
||||||
export SECRET_KEY_BASE=$(cat /run/secrets/secret_key_base)
|
set -x SECRET_KEY_BASE $(cat /run/secrets/secret_key_base)
|
||||||
export DB_PASS=$(cat /run/secrets/db_password)
|
set -x DB_PASS $(cat /run/secrets/db_password)
|
||||||
|
|
||||||
RAILS_ENV=production bundle exec rails assets:precompile
|
RAILS_ENV=production bundle exec rails assets:precompile
|
||||||
}
|
}
|
||||||
|
|
||||||
setup() {
|
setup() {
|
||||||
export OTP_SECRET=$(cat /run/secrets/otp_secret)
|
set -x OTP_SECRET $(cat /run/secrets/otp_secret)
|
||||||
export SECRET_KEY_BASE=$(cat /run/secrets/secret_key_base)
|
set -x SECRET_KEY_BASE $(cat /run/secrets/secret_key_base)
|
||||||
export DB_PASS=$(cat /run/secrets/db_password)
|
set -x DB_PASS $(cat /run/secrets/db_password)
|
||||||
|
|
||||||
RAILS_ENV=production bundle exec rake db:setup
|
RAILS_ENV=production bundle exec rake db:setup
|
||||||
}
|
}
|
||||||
|
|
||||||
admin() {
|
admin() {
|
||||||
export OTP_SECRET=$(cat /run/secrets/otp_secret)
|
set -x OTP_SECRET $(cat /run/secrets/otp_secret)
|
||||||
export SECRET_KEY_BASE=$(cat /run/secrets/secret_key_base)
|
set -x SECRET_KEY_BASE $(cat /run/secrets/secret_key_base)
|
||||||
export DB_PASS=$(cat /run/secrets/db_password)
|
set -x DB_PASS $(cat /run/secrets/db_password)
|
||||||
|
|
||||||
RAILS_ENV=production bin/tootctl accounts create "$1" --email "$2" --confirmed --role admin
|
RAILS_ENV=production bin/tootctl accounts create "$1" --email "$2" --confirmed --role admin
|
||||||
}
|
}
|
||||||
|
|
|
@ -45,6 +45,7 @@ services:
|
||||||
- DB_NAME
|
- DB_NAME
|
||||||
- DB_PORT
|
- DB_PORT
|
||||||
- DB_USER
|
- DB_USER
|
||||||
|
- DB_PASS_FILE=/run/secrets/db_password
|
||||||
- DEFAULT_LOCALE
|
- DEFAULT_LOCALE
|
||||||
- EMAIL_DOMAIN_ALLOWLIST
|
- EMAIL_DOMAIN_ALLOWLIST
|
||||||
- EMAIL_DOMAIN_DENYLIST
|
- EMAIL_DOMAIN_DENYLIST
|
||||||
|
@ -67,6 +68,7 @@ services:
|
||||||
- MAX_SESSION_ACTIVATIONS
|
- MAX_SESSION_ACTIVATIONS
|
||||||
- MAX_TOOT_CHARS
|
- MAX_TOOT_CHARS
|
||||||
- OAUTH_REDIRECT_AT_SIGN_IN
|
- OAUTH_REDIRECT_AT_SIGN_IN
|
||||||
|
- OTP_SECRET_FILE=/run/secrets/otp_secret
|
||||||
- OIDC_AUTH_ENDPOINT
|
- OIDC_AUTH_ENDPOINT
|
||||||
- OIDC_CLIENT_AUTH_METHOD
|
- OIDC_CLIENT_AUTH_METHOD
|
||||||
- OIDC_CLIENT_ID
|
- OIDC_CLIENT_ID
|
||||||
|
|
|
@ -23,11 +23,12 @@ file_env() {
|
||||||
unset "$fileVar"
|
unset "$fileVar"
|
||||||
}
|
}
|
||||||
|
|
||||||
export DB_PASS=$(cat /run/secrets/db_password)
|
|
||||||
|
|
||||||
# for sidekiq service bundle exec env var threading
|
# for sidekiq service bundle exec env var threading
|
||||||
file_env "OTP_SECRET"
|
file_env "OTP_SECRET"
|
||||||
file_env "SECRET_KEY_BASE"
|
file_env "SECRET_KEY_BASE"
|
||||||
|
file_env "DB_PASS"
|
||||||
|
file_env "SMTP_PASSWORD"
|
||||||
|
file_env "VAPID_PRIVATE_KEY"
|
||||||
|
|
||||||
{{ if eq (env "OIDC_ENABLED") "true" }}
|
{{ if eq (env "OIDC_ENABLED") "true" }}
|
||||||
file_env "OIDC_CLIENT_SECRET"
|
file_env "OIDC_CLIENT_SECRET"
|
||||||
|
|
Loading…
Reference in New Issue