From 2925473d6bebe531bcd68264662eac5bdcc826f8 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Fri, 22 May 2020 14:21:54 +0200 Subject: [PATCH 01/14] fix line_match with --extended-regexp --- scripts/change_url | 2 +- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index 9a46026..17b7a1e 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -45,6 +45,6 @@ ynh_add_uwsgi_service 'pgadmin_user python_version' ynh_script_progression --message="Reloading services..." sudo systemctl reload nginx.service ynh_systemd_action --service_name "uwsgi-app@$app.service" --action restart \ - --line_match "WSGI app 0 (mountpoint='$path_url') ready in [[:digit:]]* seconds on interpreter" --log_path "/var/log/uwsgi/$app/pgadmin.log" + --line_match "WSGI app 0 \(mountpoint='$path_url'\) ready in [[:digit:]]* seconds on interpreter" --log_path "/var/log/uwsgi/$app/pgadmin.log" ynh_script_progression --message="Change of URL completed for $app" --last diff --git a/scripts/install b/scripts/install index 5663fc3..253c825 100644 --- a/scripts/install +++ b/scripts/install @@ -117,6 +117,6 @@ ynh_use_logrotate --logfile /var/log/pgadmin # reload uwsgi ynh_script_progression --message="Starting pgadmin services..." --weight=3 ynh_systemd_action --service_name "uwsgi-app@$app.service" \ - --line_match "WSGI app 0 (mountpoint='$path_url') ready in [[:digit:]]* seconds on interpreter" --log_path "/var/log/uwsgi/$app/pgadmin.log" + --line_match "WSGI app 0 \(mountpoint='$path_url'\) ready in [[:digit:]]* seconds on interpreter" --log_path "/var/log/uwsgi/$app/pgadmin.log" ynh_script_progression --message="Installation of $app completed" --last diff --git a/scripts/restore b/scripts/restore index f9246f4..0f5d7ad 100644 --- a/scripts/restore +++ b/scripts/restore @@ -70,7 +70,7 @@ ynh_use_logrotate --logfile /var/log/pgadmin # reload uwsgi and nginx ynh_script_progression --message="Starting pgadmin services..." --weight=3 ynh_systemd_action --service_name "uwsgi-app@$app.service" \ - --line_match "WSGI app 0 (mountpoint='$path_url') ready in [[:digit:]]* seconds on interpreter" --log_path "/var/log/uwsgi/$app/pgadmin.log" + --line_match "WSGI app 0 \(mountpoint='$path_url'\) ready in [[:digit:]]* seconds on interpreter" --log_path "/var/log/uwsgi/$app/pgadmin.log" systemctl reload nginx ynh_script_progression --message="Restoration completed for $app" --last diff --git a/scripts/upgrade b/scripts/upgrade index 938eb3a..98e5613 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -70,6 +70,6 @@ ynh_use_logrotate --logfile /var/log/pgadmin --nonappend # reload uwsgi ynh_script_progression --message="Restarting pgadmin services..." --weight=3 ynh_systemd_action --service_name "uwsgi-app@$app.service" \ - --line_match "WSGI app 0 (mountpoint='$path_url') ready in [[:digit:]]* seconds on interpreter" --log_path "/var/log/uwsgi/$app/pgadmin.log" + --line_match "WSGI app 0 \(mountpoint='$path_url'\) ready in [[:digit:]]* seconds on interpreter" --log_path "/var/log/uwsgi/$app/pgadmin.log" ynh_script_progression --message="Upgrade of $app completed" --last From 178b96995215ec774df1474b4b0032251bd43f5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Fri, 22 May 2020 14:52:25 +0200 Subject: [PATCH 02/14] Fix requirement --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 687bdf6..a39396b 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "email": "josue@tille.ch" }, "requirements": { - "yunohost": ">= 3.7.0.6" + "yunohost": ">= 3.8.0.0" }, "multi_instance": false, "services": [ From 5edaadc37056e9470ea8afbffe2475e8ecce4c68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Sun, 24 May 2020 00:21:50 +0200 Subject: [PATCH 03/14] Update uwsgi helper --- scripts/experimental_helper.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/experimental_helper.sh b/scripts/experimental_helper.sh index ca73ea7..a5cc663 100644 --- a/scripts/experimental_helper.sh +++ b/scripts/experimental_helper.sh @@ -21,7 +21,8 @@ ExecStart=/usr/bin/uwsgi \ --logto /var/log/uwsgi/%i/%i.log User=%i Group=www-data -Restart=on-failure +Restart=always +RestartSec=10 KillSignal=SIGQUIT Type=notify StandardError=syslog From e06193de1364c0dd23711a291ea4089eba8506f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Mon, 1 Jun 2020 23:33:59 +0200 Subject: [PATCH 04/14] Fix build url for pip --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index ff1991e..517af47 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -44,7 +44,7 @@ install_source() { source $final_path/bin/activate pip3 install --upgrade pip pip3 install --upgrade 'Werkzeug<1.0' - pip3 install --upgrade https://ftp.postgresql.org/pub/pgadmin/pgadmin$app_main_version/v$app_sub_version/pip/pgadmin${APP_VERSION}-py2.py3-none-any.whl + pip3 install --upgrade https://ftp.postgresql.org/pub/pgadmin/pgadmin$app_main_version/v$app_sub_version/pip/pgadmin${APP_VERSION}-py3-none-any.whl deactivate fi } From e40433eb4aae6a9e04ab41699c6a42f399fa9b64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 3 Jun 2020 14:39:40 +0200 Subject: [PATCH 05/14] Use official pip source --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 517af47..72668dd 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -44,7 +44,7 @@ install_source() { source $final_path/bin/activate pip3 install --upgrade pip pip3 install --upgrade 'Werkzeug<1.0' - pip3 install --upgrade https://ftp.postgresql.org/pub/pgadmin/pgadmin$app_main_version/v$app_sub_version/pip/pgadmin${APP_VERSION}-py3-none-any.whl + pip3 install --upgrade pip3 install -I --upgrade pgadmin$app_main_version==$APP_VERSION deactivate fi } From f9720df2fe4ac1a825520dae868107a55af635fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 3 Jun 2020 10:33:53 +0000 Subject: [PATCH 06/14] Upgrade pgadmin to 4-4.22 --- 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 2768085..e9ecb2d 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.21 +**Shipped version:** 4-4.22 Screenshots ----------- diff --git a/conf/armv7_stretch.src b/conf/armv7_stretch.src index 29548f3..1f120b1 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.21/pgadmin_4-4.21-stretch-bin1_armv7l.tar.gz -SOURCE_SUM=1d77507fdb4ec18472d8691700a9fc5a88dadc327ca6ce232c42ac70a4e76694 +SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-4.22/pgadmin_4-4.22-stretch-bin1_armv7l.tar.gz +SOURCE_SUM=f996452df4925001a855270a125870f20afe4df68772936db8ea21604fc2c324 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/manifest.json b/manifest.json index a39396b..f55ad17 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.21~ynh1", + "version": "4-4.22~ynh1", "url": "https://www.pgadmin.org", "license": "PostgreSQL", "maintainer": { From 541971ace3dbfc613a20cb7e453954d7d036ac79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 3 Jun 2020 14:34:16 +0200 Subject: [PATCH 07/14] Add buster support for ARM --- conf/armv7_buster.src | 11 +++++++++++ scripts/_common.sh | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 conf/armv7_buster.src diff --git a/conf/armv7_buster.src b/conf/armv7_buster.src new file mode 100644 index 0000000..d41dcf9 --- /dev/null +++ b/conf/armv7_buster.src @@ -0,0 +1,11 @@ +SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-4.22/pgadmin_4-4.22-buster-bin1_armv7l.tar.gz +SOURCE_SUM=f996452df4925001a855270a125870f20afe4df68772936db8ea21604fc2c324 +# (Optional) Program to check the integrity (sha256sum, md5sum...) +# default: sha256 +SOURCE_SUM_PRG=sha256sum +# (Optional) Archive format +# default: tar.gz +SOURCE_FORMAT=tar.gz +# (Optional) Put false if sources are directly in the archive root +# default: true +SOURCE_IN_SUBDIR=true diff --git a/scripts/_common.sh b/scripts/_common.sh index 72668dd..1c90902 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -33,7 +33,7 @@ install_source() { ynh_secure_remove --file=$final_path/lib ynh_secure_remove --file=$final_path/include ynh_secure_remove --file=$final_path/share - ynh_setup_source --dest_dir $final_path/ --source_id "armv7_stretch" + ynh_setup_source --dest_dir $final_path/ --source_id "armv7_$(lsb_release --codename --short)" else # Install virtualenv if it don't exist test -e $final_path/bin/python3 || python3 -m venv $final_path From 7e700aaac0db64f1e3ead401cac932a8b9d64456 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Thu, 23 Jul 2020 23:49:59 +0200 Subject: [PATCH 08/14] Fix Integration level infos --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e9ecb2d..15cd8c9 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ pgAdmin for yunohost ==================== -[![Integration level](https://dash.yunohost.org/integration/pgadmin.svg)](https://ci-apps.yunohost.org/ci/apps/pgadmin%20%28Community%29/lastBuild/consoleFull) +[![Integration level](https://dash.yunohost.org/integration/pgadmin.svg)](https://dash.yunohost.org/appci/app/pgadmin) ![](https://ci-apps.yunohost.org/ci/badges/pgadmin.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/pgadmin.maintain.svg) [![Install pgadmin with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=pgadmin) > *This package allow you to install pgadmin quickly and simply on a YunoHost server. @@ -34,11 +34,9 @@ This app actually don't support the SSO and don't support LDAP. After the instal ### Supported architectures -* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/pgadmin%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/pgadmin/) - +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/pgadmin%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/pgadmin/) * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/pgadmin%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/pgadmin/) -