From a1132e5b26e3c88d046cf61431e58a43d6e4bc4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Thu, 26 Mar 2020 22:31:17 +0100 Subject: [PATCH 1/4] Add group-permission support --- manifest.json | 2 +- scripts/install | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index ab69b37..1231c67 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "email": "josue@tille.ch" }, "requirements": { - "yunohost": ">= 3.5.2.2" + "yunohost": ">= 3.7.0.6" }, "multi_instance": false, "services": [ diff --git a/scripts/install b/scripts/install index 055fc0a..5663fc3 100644 --- a/scripts/install +++ b/scripts/install @@ -108,7 +108,7 @@ set_permission # Restrict access to admin only ynh_script_progression --message="Configuring permissions" -yunohost app addaccess --users=$admin $app +ynh_permission_update --permission="main" --remove="all_users" --add=$admin # Configuration de logrotate ynh_script_progression --message="Configuring log rotation..." From b84fab959a2c5e800b709ec970e0471ed01711c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Sat, 11 Apr 2020 11:20:44 +0200 Subject: [PATCH 2/4] Use helper to restore systemd unit --- scripts/backup | 1 - scripts/restore | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/backup b/scripts/backup index 726e237..9825ae9 100644 --- a/scripts/backup +++ b/scripts/backup @@ -32,7 +32,6 @@ ynh_backup --src_path "$final_path" ynh_script_progression --message="Backing configuration..." ynh_backup --src_path "/etc/nginx/conf.d/$domain.d/$app.conf" ynh_backup --src_path "/etc/uwsgi/apps-available/$app.ini" -ynh_backup --src_path "/etc/systemd/system/uwsgi-app@.service" # Backup Data and LOG ynh_script_progression --message="Backing up data..." diff --git a/scripts/restore b/scripts/restore index 85fcee9..f9246f4 100644 --- a/scripts/restore +++ b/scripts/restore @@ -48,7 +48,7 @@ ynh_psql_execute_as_root \ # Restore systemd configuration ynh_script_progression --message="Reconfiguring application..." -systemctl daemon-reload +ynh_check_global_uwsgi_config systemctl enable "uwsgi-app@$app.service" #================================================= From cd2656345c2a2a5c6fd5aa9d1641933eceadd029 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Fri, 3 Apr 2020 10:45:15 +0000 Subject: [PATCH 3/4] Upgrade pgadmin to 4-4.20 --- README.md | 2 +- conf/armv7_stretch.src | 4 ++-- manifest.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index bab61da..3cc403c 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Overview pgAdmin is a feature rich Open Source administration and development platform for PostgreSQL. -**Shipped version:** 4-4.19 +**Shipped version:** 4-4.20 Screenshots ----------- diff --git a/conf/armv7_stretch.src b/conf/armv7_stretch.src index 946f019..69fc4d6 100644 --- a/conf/armv7_stretch.src +++ b/conf/armv7_stretch.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-4.19/pgadmin_4-4.19-stretch-bin1_armv7l.tar.gz -SOURCE_SUM=e3c0e71f03a6b9ed25120d4201e711398831e29500c8a645ac29ff0400815422 +SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-4.20/pgadmin_4-4.20-stretch-bin1_armv7l.tar.gz +SOURCE_SUM=adc4ea760464c500c1f858296280e5455a71145f7aa5171cff445385aadcdd45 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/manifest.json b/manifest.json index 1231c67..6936361 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Manage PostgreSQL databases over the web", "fr": "Application web de gestion des bases de données PostgreSQL" }, - "version": "4-4.19~ynh1", + "version": "4-4.20~ynh1", "url": "https://www.pgadmin.org", "license": "PostgreSQL", "maintainer": { From f1b621251bee095891bc3e628ccb23a4715b77ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Mon, 20 Apr 2020 15:32:01 +0200 Subject: [PATCH 4/4] Fix python version for buster --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 1a7af73..ff1991e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ app=$YNH_APP_INSTANCE_NAME final_path=/opt/yunohost/$app pgadmin_user="pgadmin" -python_version="3.5" +python_version="$(python3 -V | cut -d' ' -f2 | cut -d. -f1-2)" dependances="python3-pip build-essential python3-dev python3-venv postgresql uwsgi uwsgi-plugin-python3 expect libpq-dev" if [[ -e "../settings/manifest.json" ]] || [[ -e "../manifest.json" ]]; then