From 2c16dcb7ebba7f0a796154348bd9a10f23c1c59e Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 12 Jan 2020 22:07:42 +0100 Subject: [PATCH 1/3] Upgrade to 1.1.8 --- README.md | 2 +- conf/arm.src | 6 +++--- conf/arm64.src | 6 +++--- conf/x86-64.src | 6 +++--- manifest.json | 2 +- scripts/install | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 22bd18d..713be60 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ For user friendly details about Pleroma: [see here](https://blog.soykaf.com/post - Tootdon (Android + iOS) - Tootle (iOS) -**Shipped version:** 1.1.7 +**Shipped version:** 1.1.8 ## Important points to read before installing diff --git a/conf/arm.src b/conf/arm.src index fae8824..e9eb4d0 100644 --- a/conf/arm.src +++ b/conf/arm.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/84826/artifacts/download -SOURCE_SUM=aeb527340dbecc5056cd3aca459ed0a0f3b41808afc492e61f998032e5c3d874 +SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/87650/artifacts/download +SOURCE_SUM=2b1ccfcd23e096bd9be1333a5c048e3e2ae122a0f2ad7fd772d52ed2424c9f84 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=pleroma-v1.1.7-arm.zip +SOURCE_FILENAME=pleroma-v1.1.8-arm.zip diff --git a/conf/arm64.src b/conf/arm64.src index f827990..4bcfc9c 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/84828/artifacts/download -SOURCE_SUM=74032e08b6f89321eb5545ff77fb0b1f142cba49c691d69316963d296d16b727 +SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/87652/artifacts/download +SOURCE_SUM=16c6f229a42777c4bda3a81ef21b1a42bb3e935ff1bdf25020907ca3a6c27da3 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=pleroma-v1.1.7-arm64.zip +SOURCE_FILENAME=pleroma-v1.1.8-arm64.zip diff --git a/conf/x86-64.src b/conf/x86-64.src index 4cf360d..25d9d6b 100644 --- a/conf/x86-64.src +++ b/conf/x86-64.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/84824/artifacts/download -SOURCE_SUM=6cd69e80894af966bb88505dae572e197c96da02ba980357a606bcc948a78e36 +SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/jobs/87648/artifacts/download +SOURCE_SUM=cea7bfc9513b806e8cf9f1cd4ce2daf2216e1fa54b51b8984726c64279b6f0af SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=pleroma-v1.1.7-x86-64.zip +SOURCE_FILENAME=pleroma-v1.1.8-x86-64.zip diff --git a/manifest.json b/manifest.json index d247b31..c335ae7 100755 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Pleroma is an OStatus-compatible social networking server written in Elixir, compatible with GNU Social and Mastodon", "fr": "Pleroma est un réseau social écrit en Elixir, compatible avec OStatus, GNU Social et Mastodon" }, - "version": "1.1.7~ynh1", + "version": "1.1.8~ynh1", "url": "https://git.pleroma.social/pleroma/pleroma", "license": "AGPL-3.0-only", "maintainer": [ diff --git a/scripts/install b/scripts/install index e443567..8ea55c9 100755 --- a/scripts/install +++ b/scripts/install @@ -193,7 +193,7 @@ chown -R "$app":"$app" "$final_path" pushd $final_path/$app #Workaround for static-dir error - ynh_replace_string --match_string="_dir" --replace_string="" --target_file="/var/www/pleroma/pleroma/releases/1.1.7/releases.exs" + ynh_replace_string --match_string="_dir" --replace_string="" --target_file="/var/www/pleroma/pleroma/releases/1.1.8/releases.exs" #Generate instance su "$app" -s $SHELL -lc "$final_path/$app/bin/pleroma_ctl instance gen --force \ From f6922e83e58f96b6af5d37bb49c56624631a23be Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 12 Jan 2020 22:35:07 +0100 Subject: [PATCH 2/3] Update upgrade --- scripts/upgrade | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 1d22f2e..32b7bdd 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -110,7 +110,6 @@ ynh_print_info --message="Backing up the app before upgrading (may take a while) # Backup the current version of the app ynh_backup_before_upgrade ynh_clean_setup () { - read -p "key" # restore it if the upgrade fails ynh_restore_upgradebackup ynh_clean_check_starting From c8b8cd0ea3847be381e523542d165c1421572a17 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 13 Jan 2020 00:33:37 +0100 Subject: [PATCH 3/3] Applying example_ynh --- scripts/change_url | 9 ++++++--- scripts/install | 8 ++++++-- scripts/remove | 7 ++++--- scripts/restore | 4 +++- scripts/upgrade | 10 ++++++---- 5 files changed, 25 insertions(+), 13 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index 65d9cfb..cb7b73d 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -110,16 +110,19 @@ fi #================================================= # MODIFY A CONFIG FILE #================================================= +ynh_print_info --message="Modifying a config file..." -ynh_replace_string --match_string="$old_domain" --replace_string="$new_domain" --target_file="$final_path/$app/config/prod.secret.exs" +config="/etc/$app/config.exs" +ynh_backup_if_checksum_is_different --file="$config" +ynh_replace_string --match_string="$old_domain" --replace_string="$new_domain" --target_file="$config" #================================================= # STORE THE CONFIG FILE CHECKSUM #================================================= +ynh_print_info --message="Storing the config file checksum..." -ynh_backup_if_checksum_is_different --file="$final_path/$app/config/prod.secret.exs" # Recalculate and store the checksum of the file for the next upgrade. -ynh_store_file_checksum --file="$final_path/$app/config/prod.secret.exs" +ynh_store_file_checksum --file="$config" #================================================= # GENERIC FINALISATION diff --git a/scripts/install b/scripts/install index e443567..208d186 100755 --- a/scripts/install +++ b/scripts/install @@ -126,6 +126,7 @@ ynh_print_info --message="Configuring nginx web server..." # Create a dedicated nginx config ynh_add_nginx_config + if [ $cache -eq 1 ] then cp -rf "../conf/cache.conf" "/etc/nginx/conf.d/$app-cache.conf" @@ -151,7 +152,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # CREATE THE DATA DIRECTORY #================================================= -ynh_print_info --message="Create the data directory..." +ynh_print_info --message="Creating the data directory..." # Define app's data directory datadir="/home/yunohost.app/${app}" @@ -168,8 +169,9 @@ chown -R "$app":"$app" "$datadir" ynh_app_setting_set --app=$app --key=datadir --value="$datadir" #================================================= -# MODIFY A CONFIG FILE +# CREATE THE CONFIG DIRECTORY #================================================= +ynh_print_info --message="Creating the config directory..." mkdir -p /etc/$app chown -R $app /etc/$app @@ -187,6 +189,7 @@ ynh_add_systemd_config #================================================= # MAKE SETUP #================================================= +ynh_print_info --message="Making setup..." # Give permission to the final_path chown -R "$app":"$app" "$final_path" @@ -226,6 +229,7 @@ popd #================================================= # STORE THE CONFIG FILE CHECKSUM #================================================= +ynh_print_info --message="Storing the config file checksum..." # Calculate and store the config file checksum into the app settings ynh_store_file_checksum --file="$config" diff --git a/scripts/remove b/scripts/remove index 18ffb57..4a5eb45 100755 --- a/scripts/remove +++ b/scripts/remove @@ -88,7 +88,7 @@ ynh_secure_remove --file="/etc/nginx/conf.d/$app-cache.conf" #================================================= # CLOSE A PORT #================================================= -ynh_print_info --message="Closing a port" +ynh_print_info --message="Closing a port..." if yunohost firewall list | grep -q "\- $port$" then @@ -101,12 +101,13 @@ fi #================================================= # REMOVE DIRECTORIES #================================================= +ynh_print_info --message="Removing directories..." # Remove the config directory securely -ynh_secure_remove "/etc/$app/" +ynh_secure_remove --file="/etc/$app" # Remove the data directory securely -ynh_secure_remove "$datadir/" +ynh_secure_remove --file="$datadir" #================================================= # GENERIC FINALIZATION diff --git a/scripts/restore b/scripts/restore index f7149f3..d9babf8 100755 --- a/scripts/restore +++ b/scripts/restore @@ -53,8 +53,10 @@ test ! -d $final_path \ #================================================= # RESTORE THE NGINX CONFIGURATION #================================================= +ynh_print_info --message="Restoring the nginx configuration..." ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" + if [ $cache -eq 1 ] then ynh_restore_file --origin_path="/etc/nginx/conf.d/$app-cache.conf" @@ -88,7 +90,7 @@ chown -R "$app":"$app" "$final_path" #================================================= # RECREATE THE DATA DIRECTORY #================================================= -ynh_print_info --message="Recreate the data directory..." +ynh_print_info --message="Recreating the data directory..." # Create app folders mkdir -p "$datadir/" diff --git a/scripts/upgrade b/scripts/upgrade index 32b7bdd..c6563fb 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -37,6 +37,7 @@ registration=$(ynh_app_setting_get --app=$app --key=registration) #================================================= # CHECK VERSION #================================================= +ynh_print_info --message="Checking version..." upgrade_type=$(ynh_check_app_version_changed) @@ -94,6 +95,7 @@ apt-key del A14F4FCA #================================================= # CHECK VERSION NUMBER #================================================= +ynh_print_info --message="Checking version number..." if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then sleep 60 @@ -110,9 +112,9 @@ ynh_print_info --message="Backing up the app before upgrading (may take a while) # Backup the current version of the app ynh_backup_before_upgrade ynh_clean_setup () { + ynh_clean_check_starting # restore it if the upgrade fails ynh_restore_upgradebackup - ynh_clean_check_starting } # Exit if an error occurs during the execution of the script ynh_abort_if_errors @@ -129,9 +131,10 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line #================================================= # UPGRADE TO OTP RELEASE #================================================= -ynh_print_info --message="Upgrading to OTP release..." if ynh_version_gt "1.1.1~ynh1" "${previous_version}" ; then + ynh_print_info --message="Upgrading to OTP release..." + # Define app's data directory datadir="/home/yunohost.app/${app}" ynh_app_setting_set --app=$app --key=datadir --value="$datadir" @@ -161,13 +164,12 @@ if ynh_version_gt "1.1.1~ynh1" "${previous_version}" ; then ynh_backup_if_checksum_is_different --file="$config" - rm -r $final_path/$app/* + ynh_secure_remove --file="$final_path/$app" fi #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_print_info --message="Upgrading source files..." if [ "$upgrade_type" == "UPGRADE_APP" ] then