From b3adffc9e2866a7df671ab615be50721773c566d Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 9 Apr 2019 00:34:35 +0200 Subject: [PATCH 1/4] cleanup --- scripts/backup | 7 ------- scripts/restore | 5 ++--- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/scripts/backup b/scripts/backup index e0519ff..4fd139c 100755 --- a/scripts/backup +++ b/scripts/backup @@ -53,13 +53,6 @@ then ynh_backup "/etc/nginx/conf.d/$app-cache.conf" fi -#================================================= -# BACKUP THE PHP-FPM CONFIGURATION -#================================================= -ynh_print_info "Backing up php-fpm configuration..." - -#ynh_backup "/etc/php/7.0/fpm/pool.d/$app.conf" - #================================================= # BACKUP THE POSTGRESQL DATABASE #================================================= diff --git a/scripts/restore b/scripts/restore index 2c8d5a7..93902d8 100755 --- a/scripts/restore +++ b/scripts/restore @@ -29,7 +29,7 @@ ynh_print_info "Loading settings..." app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get $app domain) -path_url="/" +path_url=$(ynh_app_setting_get $app path) final_path=$(ynh_app_setting_get $app final_path) port=$(ynh_app_setting_get $app port) db_name=$(ynh_app_setting_get $app db_name) @@ -97,8 +97,7 @@ ynh_install_app_dependencies $pkg_dependencies ynh_print_info "Reinstalling extra dependencies ..." lsb_name="$(lsb_release --codename --short)" -ynh_install_extra_app_dependencies --repo="deb http://packages.erlang-solutions.com/debian $lsb_name contrib" --package="$extra_pkg_dependencies" --key="https://packages.erlang-solutions.com/debian/erlang_solutions.asc" - +ynh_install_extra_app_dependencies --repo="deb http://packages.erlang-solutions.com/debian $lsb_name contrib" --package="$extra_pkg_dependencies" --key='https://packages.erlang-solutions.com/debian/erlang_solutions.asc' #================================================= # RESTORE THE POSTGRESQL DATABASE From e4a323b3d9fb14b16b33fe990671f118ae728dad Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 9 Apr 2019 00:47:08 +0200 Subject: [PATCH 2/4] fix change_url --- scripts/change_url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/change_url b/scripts/change_url index 5ff2bef..a39d31c 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -114,7 +114,7 @@ ynh_systemd_action --action=start --service_name=$app --log_path=systemd --line_ # STORE THE CONFIG FILE CHECKSUM #================================================= -ynh_backup_if_checksum_is_different "$final_path/config.ini" +ynh_backup_if_checksum_is_different "$final_path/$app/config/prod.secret.exs" # Recalculate and store the checksum of the file for the next upgrade. ynh_store_file_checksum "$final_path/$app/config/prod.secret.exs" From 696570b8a34599cdffd0b0d104fc4b74fe9698d1 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 9 Apr 2019 00:47:21 +0200 Subject: [PATCH 3/4] fix upgrade --- scripts/upgrade | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 6a82e73..06a165a 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -19,7 +19,7 @@ ynh_print_info "Loading installation settings..." app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get $app domain) -path_url="/" +path_url=$(ynh_app_setting_get $app path) admin=$(ynh_app_setting_get $app admin) is_public=$(ynh_app_setting_get $app is_public) final_path=$(ynh_app_setting_get $app final_path) @@ -149,7 +149,6 @@ fi #================================================= ynh_print_info "Upgrading dependencies..." -# install dependencies ynh_install_app_dependencies $pkg_dependencies #================================================= @@ -158,7 +157,7 @@ ynh_install_app_dependencies $pkg_dependencies ynh_print_info "Installing extra dependencies ..." lsb_name="$(lsb_release --codename --short)" -ynh_install_extra_app_dependencies --repo="deb http://packages.erlang-solutions.com/debian $lsb_name contrib" --package="$extra_pkg_dependencies" --key="https://packages.erlang-solutions.com/debian/erlang_solutions.asc" +ynh_install_extra_app_dependencies --repo="deb http://packages.erlang-solutions.com/debian $lsb_name contrib" --package="$extra_pkg_dependencies" --key='https://packages.erlang-solutions.com/debian/erlang_solutions.asc' #================================================= # CREATE DEDICATED USER From e2bf5e079b07d85657f45e1541882dc56c345310 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 11 Apr 2019 03:17:33 +0200 Subject: [PATCH 4/4] Update to v0.9.9999 --- README.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1f0e015..e8b054d 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:** 0.9.999 +**Shipped version:** 0.9.9999 ## Important points to read before installing diff --git a/conf/app.src b/conf/app.src index 07ccbf9..b5a6609 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/archive/v0.9.999/pleroma-v0.9.999.tar.gz -SOURCE_SUM=bab2cb3a13691a4291562d1691d55dc94226756f05a2a7c7053b234339ee00f8 +SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/archive/v0.9.9999/pleroma-v0.9.9999.tar.gz +SOURCE_SUM=148bf26c9c28beab7a05e451c93de149a0214470b56465df09bbaed66c1d45c4 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index b711b77..5aa84a5 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": "0.9.999~ynh5", + "version": "0.9.9999~ynh1", "url": "https://git.pleroma.social/pleroma/pleroma", "license": "AGPL-3.0-only", "maintainer": [