From 1117ef8d6e0dc08180b146db607ad5eb3aa6de47 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 25 Feb 2019 14:55:09 +0100 Subject: [PATCH 1/5] Add notifications --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index 920aecd..285320a 100755 --- a/check_process +++ b/check_process @@ -41,5 +41,5 @@ Level 9=0 Level 10=0 ;;; Options -Email=anmol@datamol.org +Email=anmol@datamol.org;yalh@yahoo.com Notification=yes From 600ae3affade5fae7ccacb12cb459d4e77a6bee2 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 1 Mar 2019 15:26:39 +0100 Subject: [PATCH 2/5] Fix db removal --- scripts/remove | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/remove b/scripts/remove index c4f0ffb..50479bb 100755 --- a/scripts/remove +++ b/scripts/remove @@ -59,7 +59,7 @@ ynh_psql_execute_as_root "\connect $db_name SELECT pg_terminate_backend (pg_stat_activity.pid) FROM pg_stat_activity WHERE pg_stat_activity.datname = '$db_name';" # Remove a database if it exists, along with the associated user -ynh_psql_remove_db "$db_name" "$app" +ynh_psql_remove_db "$db_name" "$db_name" #================================================= # REMOVE DEPENDENCIES From bc04b14da2bb74d147a329a9867785e4e766bb49 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 3 Mar 2019 13:56:44 +0100 Subject: [PATCH 3/5] Switch to master source to fix https://git.pleroma.social/pleroma/pleroma/commit/a0f1c0246b0621ed6d7f6923cd1e687dc9f1308d --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 6e673f7..9cfa69e 100755 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/archive/v0.9.9/pleroma-v0.9.9.tar.gz -SOURCE_SUM=21a25c34cfd9399e6b2feed570ea67f1f61a14304fadabb0283a03724b076a5f +SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/archive/master/pleroma-master.tar.gz +SOURCE_SUM=6fb0cd549c8d31a3cddc2244f05b6e01d1927b27e101f7a09b031370d84433a1 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index c29709e..e3081ae 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.9~ynh1", + "version": "0.9.9~ynh2", "url": "https://git.pleroma.social/pleroma/pleroma", "license": "AGPL-3.0-only", "maintainer": { From 9fbdc4ceac7e6936d3022428096b2ea1d3f0ea45 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 3 Mar 2019 14:15:18 +0100 Subject: [PATCH 4/5] switch source from release file to repository master --- conf/app.src | 6 ------ scripts/install | 5 ++++- scripts/upgrade | 7 ++++++- 3 files changed, 10 insertions(+), 8 deletions(-) delete mode 100755 conf/app.src diff --git a/conf/app.src b/conf/app.src deleted file mode 100755 index 9cfa69e..0000000 --- a/conf/app.src +++ /dev/null @@ -1,6 +0,0 @@ -SOURCE_URL=https://git.pleroma.social/pleroma/pleroma/-/archive/master/pleroma-master.tar.gz -SOURCE_SUM=6fb0cd549c8d31a3cddc2244f05b6e01d1927b27e101f7a09b031370d84433a1 -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= diff --git a/scripts/install b/scripts/install index 1dfa170..253589d 100755 --- a/scripts/install +++ b/scripts/install @@ -174,7 +174,10 @@ ynh_print_info "Setting up source files ..." ynh_app_setting_set $app final_path $final_path # Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source "$final_path/$app" +git clone https://git.pleroma.social/pleroma/pleroma "$final_path/$app" +pushd $final_path/$app + git checkout -b master +popd #================================================= # NGINX CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index a5f14e1..a6c60ac 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -109,7 +109,12 @@ path_url=$(ynh_normalize_url_path $path_url) ynh_print_info "Upgrading source files..." # Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source "$final_path/$app" +git clone --quiet $git_repository "$final_path/upgrade" +pushd "$final_path/upgrade" + git checkout -b master +popd +cp -a "$final_path/upgrade/." "$final_path/$app/." +rm -r "$final_path/upgrade" #================================================= # NGINX CONFIGURATION From 773b0084fbd00d40b906e092215b3c49d438c6e8 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 3 Mar 2019 15:19:21 +0100 Subject: [PATCH 5/5] fix upgrade repository --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index a6c60ac..fcdc0c6 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -109,7 +109,7 @@ path_url=$(ynh_normalize_url_path $path_url) ynh_print_info "Upgrading source files..." # Download, check integrity, uncompress and patch the source from app.src -git clone --quiet $git_repository "$final_path/upgrade" +git clone --quiet https://git.pleroma.social/pleroma/pleroma "$final_path/upgrade" pushd "$final_path/upgrade" git checkout -b master popd