diff options
| author | Tagadda <36127788+Tagadda@users.noreply.github.com> | 2025-08-23 22:44:57 +0200 |
|---|---|---|
| committer | Tagadda <36127788+Tagadda@users.noreply.github.com> | 2025-08-23 22:44:57 +0200 |
| commit | 0e8f26cae17062e81422d8acfc601ac43f175f63 (patch) | |
| tree | 069c726cf52699888f171c38e3cc2d89b6e45f15 /scripts | |
| parent | 57e912f5c19a9354d1ddefb7a636898b569b2817 (diff) | |
| download | mastodon_ynh-0e8f26cae17062e81422d8acfc601ac43f175f63.tar.gz mastodon_ynh-0e8f26cae17062e81422d8acfc601ac43f175f63.tar.bz2 mastodon_ynh-0e8f26cae17062e81422d8acfc601ac43f175f63.zip | |
Apply AlisonSelby's patch
See https://github.com/YunoHost-Apps/glitchsoc_ynh/pull/374/commits/3a6deeb1fbb52c4ae6fa74c62b87a88fb718a635
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/install | 5 | ||||
| -rw-r--r-- | scripts/upgrade | 13 |
2 files changed, 15 insertions, 3 deletions
diff --git a/scripts/install b/scripts/install index dfcbb27..21361f2 100644 --- a/scripts/install +++ b/scripts/install @@ -23,6 +23,8 @@ ynh_script_progression --message="Setting up source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir/live" +# Download redis migration script +ynh_setup_source --source_id=redis_migration --dest_dir="$install_dir/live" chown -R $app:www-data "$install_dir" @@ -60,9 +62,6 @@ config="$install_dir/live/.env.production" language="$(echo $language | head -c 2)" -redis_namespace=${app}_production -ynh_app_setting_set --app="$app" --key=redis_namespace --value="$redis_namespace" - secret_key_base=$(ynh_string_random --length=128) ynh_app_setting_set --app="$app" --key=secret_key_base --value="$secret_key_base" diff --git a/scripts/upgrade b/scripts/upgrade index f7a3573..ab1d807 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -104,6 +104,8 @@ then # Download, check integrity, uncompress and patch the source from manifest.toml ynh_setup_source --dest_dir="$install_dir/live" --full_replace=1 --keep="public/system .env.production" + # Download redis migration script + ynh_setup_source --source_id=redis_migration --dest_dir="$install_dir/live" chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" @@ -194,6 +196,17 @@ pushd "$install_dir/live" ynh_use_ruby ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails db:migrate --quiet ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails assets:precompile --quiet + + # Apply redis namespace migration (https://github.com/mastodon/redis_namespace_migration) + ynh_exec_warn_less ynh_exec_as "$app" RAILS_ENV=production COREPACK_ENABLE_DOWNLOAD_PROMPT=0 "$ynh_ruby_load_path" $ld_preload bin/rails runner rename.rb + redis_namespace="$(ynh_app_setting_get --app=$app --key=redis_namespace)" + if [ $redis_namespace ]; then + if [ ynh_app_setting_get --app=$app --key=es_enabled == "true" ] && [ ynh_app_setting_get --app=$app --key=es_prefix == "" ]; then + ynh_app_setting_set --app=$app --key=es_prefix --value=$redis_namespace + else + ynh_app_setting_delete --app=$app --key=redis_namespace + fi + fi popd #================================================= |