aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorKay0u <pierre@kayou.io>2020-12-11 14:40:24 +0100
committerKay0u <pierre@kayou.io>2020-12-11 14:40:24 +0100
commitb88b24c2d1b878fe04d6495052c5e0ef266f9061 (patch)
treec05ad7ec6344257370cd931c3886f893b0586e6c /scripts
parent061b4f9b9133d475728bf0485054cc64afd68757 (diff)
downloadmastodon_ynh-b88b24c2d1b878fe04d6495052c5e0ef266f9061.tar.gz
mastodon_ynh-b88b24c2d1b878fe04d6495052c5e0ef266f9061.tar.bz2
mastodon_ynh-b88b24c2d1b878fe04d6495052c5e0ef266f9061.zip
use ynh_string_random
Diffstat (limited to 'scripts')
-rw-r--r--scripts/install6
-rw-r--r--scripts/upgrade6
2 files changed, 6 insertions, 6 deletions
diff --git a/scripts/install b/scripts/install
index 6111ae9..d4d51d9 100644
--- a/scripts/install
+++ b/scripts/install
@@ -165,15 +165,15 @@ ynh_replace_string --match_string="__SMTP_FROM_ADDRESS__" --replace_string="$adm
language="$(echo $language | head -c 2)"
ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$config"
-paperclip_secret=$(head -n128 /dev/urandom | tail -n +1 | tr -dc -d 'a-z0-9' | head -c128)
+paperclip_secret=$(ynh_string_random --length=128)
ynh_replace_string --match_string="PAPERCLIP_SECRET=" --replace_string="PAPERCLIP_SECRET=$paperclip_secret" --target_file="$config"
ynh_app_setting_set --app="$app" --key=paperclip_secret --value="$paperclip_secret"
-secret_key_base=$(head -n128 /dev/urandom | tail -n +1 | tr -dc -d 'a-z0-9' | head -c128)
+secret_key_base=$(ynh_string_random --length=128)
ynh_replace_string --match_string="__SECRET_KEY_BASE__" --replace_string="$secret_key_base" --target_file="$config"
ynh_app_setting_set --app="$app" --key=secret_key_base --value="$secret_key_base"
-otp_secret=$(head -n128 /dev/urandom | tail -n +1 | tr -dc -d 'a-z0-9' | head -c128)
+otp_secret=$(ynh_string_random --length=128)
ynh_replace_string --match_string="__OTP_SECRET__" --replace_string="$otp_secret" --target_file="$config"
ynh_app_setting_set --app="$app" --key=otp_secret --value="$otp_secret"
diff --git a/scripts/upgrade b/scripts/upgrade
index 03408b1..a045f46 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -94,7 +94,7 @@ fi
if [[ -z "$paperclip_secret" ]]; then
paperclip_secret=$(grep -oP "PAPERCLIP_SECRET=\K\w+" $config)
if [[ -z "$paperclip_secret" ]]; then
- paperclip_secret=$(head -n128 /dev/urandom | tail -n +1 | tr -dc -d 'a-z0-9' | head -c128)
+ paperclip_secret=$(ynh_string_random --length=128)
fi
ynh_app_setting_set --app=$app --key=paperclip_secret --value="$paperclip_secret"
fi
@@ -103,7 +103,7 @@ fi
if [[ -z "$secret_key_base" ]]; then
secret_key_base=$(grep -oP "SECRET_KEY_BASE=\K\w+" $config)
if [[ -z "$secret_key_base" ]]; then
- secret_key_base=$(head -n128 /dev/urandom | tail -n +1 | tr -dc -d 'a-z0-9' | head -c128)
+ secret_key_base=$(ynh_string_random --length=128)
fi
ynh_app_setting_set --app=$app --key=secret_key_base --value="$secret_key_base"
fi
@@ -112,7 +112,7 @@ fi
if [[ -z "$otp_secret" ]]; then
otp_secret=$(grep -oP "OTP_SECRET=\K\w+" $config)
if [[ -z "$otp_secret" ]]; then
- otp_secret=$(head -n128 /dev/urandom | tail -n +1 | tr -dc -d 'a-z0-9' | head -c128)
+ otp_secret=$(ynh_string_random --length=128)
fi
ynh_app_setting_set --app=$app --key=otp_secret --value="$otp_secret"
fi