YunoHost-Apps/pixelfed_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/pixelfed_ynh.git synced 2024-09-03 20:06:04 +02:00
Code Issues Activity Actions

fix app_key

Browse source
This commit is contained in:
yalh76 2019-04-12 03:40:31 +02:00
parent 0511966540
commit 71beeacef0
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/install
View file

@ -23,7 +23,8 @@ ynh_abort_if_errors
domain=$YNH_APP_ARG_DOMAIN domain=$YNH_APP_ARG_DOMAIN
path_url="/" path_url="/"
is_public=$YNH_APP_ARG_IS_PUBLIC is_public=$YNH_APP_ARG_IS_PUBLIC
app_key=$(ynh_string_random 32) app_key=$(ynh_string_random 32 | base64)
app_key="base64:$app_key"
app=$YNH_APP_INSTANCE_NAME app=$YNH_APP_INSTANCE_NAME

10
scripts/upgrade
View file

@ -25,6 +25,7 @@ language=$(ynh_app_setting_get "$app" language)
db_name=$(ynh_app_setting_get "$app" db_name) db_name=$(ynh_app_setting_get "$app" db_name)
db_user=$db_name db_user=$db_name
db_pwd=$(ynh_app_setting_get "$app" db_pwd) db_pwd=$(ynh_app_setting_get "$app" db_pwd)
app_key=$(ynh_app_setting_get "$app" app_key)
#================================================= #=================================================
# ENSURE DOWNWARD COMPATIBILITY # ENSURE DOWNWARD COMPATIBILITY
@ -52,6 +53,12 @@ if [ -z "$final_path" ]; then
ynh_app_setting_set "$app" final_path "$final_path" ynh_app_setting_set "$app" final_path "$final_path"
fi fi
# If app_key doesn't exist, retrieve it
if [ -z "$app_key" ]; then
app_key=$(grep -oP "APP_KEY=\Kbase64.*" "$final_path/.env")
ynh_app_setting_set "$app" app_key "$app_key"
fi
#================================================= #=================================================
# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
#================================================= #=================================================
@ -141,9 +148,10 @@ ynh_install_composer --workdir="$final_path"
#================================================= #=================================================
config="$final_path/.env" config="$final_path/.env"
cp -f ../conf/.env "$config" cp ../conf/.env "$config"
ynh_replace_string "__APP__" "$app" "$config" ynh_replace_string "__APP__" "$app" "$config"
ynh_replace_string "__APP_KEY__" "$app_key" "$config"
ynh_replace_string "__DOMAIN__" "$domain" "$config" ynh_replace_string "__DOMAIN__" "$domain" "$config"
ynh_replace_string "__PATH__" "$path_url" "$config" ynh_replace_string "__PATH__" "$path_url" "$config"
ynh_replace_string "__DB_NAME__" "$db_name" "$config" ynh_replace_string "__DB_NAME__" "$db_name" "$config"