Fix abra.sh to use the correct set -a and update .env.sample with env variables
This commit is contained in:
parent
4eedc672a1
commit
828d4f982a
44
.env.sample
44
.env.sample
|
|
@ -82,7 +82,7 @@ SECRET_SMTP_PASSWORD_VERSION=v1
|
|||
# ========
|
||||
# VAPID_PUBLIC_KEY=
|
||||
|
||||
# Limits
|
||||
# Limits and custom settings
|
||||
# ======
|
||||
SINGLE_USER_MODE=false
|
||||
# EMAIL_DOMAIN_ALLOWLIST=
|
||||
|
|
@ -90,7 +90,47 @@ SINGLE_USER_MODE=false
|
|||
DEFAULT_LOCALE=en
|
||||
# MAX_SESSION_ACTIVATIONS=
|
||||
# USER_ACTIVE_DAYS=
|
||||
# MAX_TOOT_CHARS=500
|
||||
# Maximum allowed character count
|
||||
MAX_TOOT_CHARS=500
|
||||
|
||||
# Maximum number of pinned posts
|
||||
MAX_PINNED_TOOTS=5
|
||||
|
||||
# Maximum allowed bio characters
|
||||
MAX_BIO_CHARS=500
|
||||
|
||||
# Maximim number of profile fields allowed
|
||||
MAX_PROFILE_FIELDS=4
|
||||
|
||||
# Maximum allowed display name characters
|
||||
MAX_DISPLAY_NAME_CHARS=30
|
||||
|
||||
# Maximum allowed poll options
|
||||
MAX_POLL_OPTIONS=5
|
||||
|
||||
# Maximum allowed poll option characters
|
||||
MAX_POLL_OPTION_CHARS=100
|
||||
|
||||
# Maximum image and video/audio upload sizes
|
||||
# Units are in bytes
|
||||
# 1048576 bytes equals 1 megabyte
|
||||
# MAX_IMAGE_SIZE=8388608
|
||||
# MAX_VIDEO_SIZE=41943040
|
||||
|
||||
# Maximum search results to display
|
||||
# Only relevant when elasticsearch is installed
|
||||
# MAX_SEARCH_RESULTS=20
|
||||
|
||||
# Maximum hashtags to display
|
||||
# Customize the number of hashtags shown in 'Explore'
|
||||
# MAX_TRENDING_TAGS=10
|
||||
|
||||
# Maximum custom emoji file sizes
|
||||
# If undefined or smaller than MAX_EMOJI_SIZE, the value
|
||||
# of MAX_EMOJI_SIZE will be used for MAX_REMOTE_EMOJI_SIZE
|
||||
# Units are in bytes
|
||||
# MAX_EMOJI_SIZE=262144
|
||||
# MAX_REMOTE_EMOJI_SIZE=262144
|
||||
|
||||
# Sending mail
|
||||
# ============
|
||||
|
|
|
|||
102
abra.sh
102
abra.sh
|
|
@ -2,69 +2,69 @@
|
|||
|
||||
export ENTRYPOINT_CONF_VERSION=v12
|
||||
|
||||
# assets() {
|
||||
# set -x OTP_SECRET $(cat /run/secrets/otp_secret)
|
||||
# set -x SECRET_KEY_BASE $(cat /run/secrets/secret_key_base)
|
||||
# set -x DB_PASS $(cat /run/secrets/db_password)
|
||||
assets() {
|
||||
set -a OTP_SECRET $(cat /run/secrets/otp_secret)
|
||||
set -a SECRET_KEY_BASE $(cat /run/secrets/secret_key_base)
|
||||
set -a DB_PASS $(cat /run/secrets/db_password)
|
||||
|
||||
# RAILS_ENV=production bundle exec rails assets:precompile
|
||||
# }
|
||||
RAILS_ENV=production bundle exec rails assets:precompile
|
||||
}
|
||||
|
||||
# setup() {
|
||||
# set -x OTP_SECRET $(cat /run/secrets/otp_secret)
|
||||
# set -x SECRET_KEY_BASE $(cat /run/secrets/secret_key_base)
|
||||
# set -x DB_PASS $(cat /run/secrets/db_password)
|
||||
setup() {
|
||||
set -a OTP_SECRET $(cat /run/secrets/otp_secret)
|
||||
set -a SECRET_KEY_BASE $(cat /run/secrets/secret_key_base)
|
||||
set -a DB_PASS $(cat /run/secrets/db_password)
|
||||
|
||||
# RAILS_ENV=production bundle exec rake db:setup
|
||||
# }
|
||||
RAILS_ENV=production bundle exec rake db:setup
|
||||
}
|
||||
|
||||
# admin() {
|
||||
# set -x OTP_SECRET $(cat /run/secrets/otp_secret)
|
||||
# set -x SECRET_KEY_BASE $(cat /run/secrets/secret_key_base)
|
||||
# set -x DB_PASS $(cat /run/secrets/db_password)
|
||||
admin() {
|
||||
set -a OTP_SECRET $(cat /run/secrets/otp_secret)
|
||||
set -a SECRET_KEY_BASE $(cat /run/secrets/secret_key_base)
|
||||
set -a DB_PASS $(cat /run/secrets/db_password)
|
||||
|
||||
# accounts create "$1" --email "$2" --confirmed --role admin
|
||||
# }
|
||||
accounts create "$1" --email "$2" --confirmed --role admin
|
||||
}
|
||||
|
||||
# secrets() {
|
||||
# docker context use default > /dev/null 2>&1
|
||||
secrets() {
|
||||
docker context use default > /dev/null 2>&1
|
||||
|
||||
# echo "Generating secrets for new Hometown deployment..."
|
||||
# echo ""
|
||||
echo "Generating secrets for new Hometown deployment..."
|
||||
echo ""
|
||||
|
||||
# SECRET_KEY_BASE=$(docker run --rm tootsuite/mastodon:v3.4.0 bundle exec rake secret)
|
||||
# abra app secret insert "$APP_NAME" secret_key_base v1 "$SECRET_KEY_BASE"
|
||||
# echo "SECRET_KEY_BASE = $SECRET_KEY_BASE"
|
||||
# echo ""
|
||||
SECRET_KEY_BASE=$(docker run --rm tootsuite/mastodon:v3.4.0 bundle exec rake secret)
|
||||
abra app secret insert "$APP_NAME" secret_key_base v1 "$SECRET_KEY_BASE"
|
||||
echo "SECRET_KEY_BASE = $SECRET_KEY_BASE"
|
||||
echo ""
|
||||
|
||||
# OTP_SECRET=$(docker run --rm tootsuite/mastodon:v3.4.0 bundle exec rake secret)
|
||||
# abra app secret insert "$APP_NAME" otp_secret v1 "$OTP_SECRET"
|
||||
# echo "OTP_SECRET = $OTP_SECRET"
|
||||
# echo ""
|
||||
OTP_SECRET=$(docker run --rm tootsuite/mastodon:v3.4.0 bundle exec rake secret)
|
||||
abra app secret insert "$APP_NAME" otp_secret v1 "$OTP_SECRET"
|
||||
echo "OTP_SECRET = $OTP_SECRET"
|
||||
echo ""
|
||||
|
||||
# docker run \
|
||||
# -e SECRET_KEY_BASE="$SECRET_KEY_BASE" \
|
||||
# -e OTP_SECRET="$OTP_SECRET" \
|
||||
# --rm tootsuite/mastodon:v3.4.0 \
|
||||
# bundle exec rake mastodon:webpush:generate_vapid_key \
|
||||
# > /tmp/key.txt
|
||||
docker run \
|
||||
-e SECRET_KEY_BASE="$SECRET_KEY_BASE" \
|
||||
-e OTP_SECRET="$OTP_SECRET" \
|
||||
--rm tootsuite/mastodon:v3.4.0 \
|
||||
bundle exec rake mastodon:webpush:generate_vapid_key \
|
||||
> /tmp/key.txt
|
||||
|
||||
# VAPID_PRIVATE_KEY=$(grep -oP "VAPID_PRIVATE_KEY=\K.+" "/tmp/key.txt")
|
||||
# VAPID_PUBLIC_KEY=$(grep -oP "VAPID_PUBLIC_KEY=\K.+" "/tmp/key.txt")
|
||||
# rm -rf /tmp/key.txt
|
||||
VAPID_PRIVATE_KEY=$(grep -oP "VAPID_PRIVATE_KEY=\K.+" "/tmp/key.txt")
|
||||
VAPID_PUBLIC_KEY=$(grep -oP "VAPID_PUBLIC_KEY=\K.+" "/tmp/key.txt")
|
||||
rm -rf /tmp/key.txt
|
||||
|
||||
# echo "VAPID_PUBLIC_KEY = $VAPID_PUBLIC_KEY"
|
||||
# echo "!IMPORTANT! you MUST insert this VAPID_PUBLIC_KEY into your app .env config !IMPORTANT!"
|
||||
# echo ""
|
||||
echo "VAPID_PUBLIC_KEY = $VAPID_PUBLIC_KEY"
|
||||
echo "!IMPORTANT! you MUST insert this VAPID_PUBLIC_KEY into your app .env config !IMPORTANT!"
|
||||
echo ""
|
||||
|
||||
# abra app secret insert "$APP_NAME" vapid_private_key v1 "$VAPID_PRIVATE_KEY"
|
||||
# echo "VAPID_PRIVATE_KEY = $VAPID_PRIVATE_KEY"
|
||||
# echo ""
|
||||
abra app secret insert "$APP_NAME" vapid_private_key v1 "$VAPID_PRIVATE_KEY"
|
||||
echo "VAPID_PRIVATE_KEY = $VAPID_PRIVATE_KEY"
|
||||
echo ""
|
||||
|
||||
# abra app secret generate "$APP_NAME" db_password v1
|
||||
# echo ""
|
||||
abra app secret generate "$APP_NAME" db_password v1
|
||||
echo ""
|
||||
|
||||
# echo "don't forget to insert your smtp_password! your deployment won't work without it"
|
||||
# echo "run \"abra app secret insert $APP_NAME smtp_password v1 YOURSMTPPASSWORD\""
|
||||
# echo ""
|
||||
# }
|
||||
echo "don't forget to insert your smtp_password! your deployment won't work without it"
|
||||
echo "run \"abra app secret insert $APP_NAME smtp_password v1 YOURSMTPPASSWORD\""
|
||||
echo ""
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue