diff --git a/README.md b/README.md index 80f67f9..c19b30a 100644 --- a/README.md +++ b/README.md @@ -12,12 +12,12 @@ Overview pgAdmin is a feature rich Open Source administration and development platform for PostgreSQL. -**Shipped version:** 4-4.25 +**Shipped version:** 4-4.28 Screenshots ----------- -![](https://www.pgadmin.org/static/img/screenshots/pgadmin4-welcome.png) +![](https://www.pgadmin.org/static/COMPILED/assets/img/screenshots/pgadmin4-welcome-light.png) Documentation ------------- diff --git a/conf/armv7_buster.src b/conf/armv7_buster.src index fdee009..b58682b 100644 --- a/conf/armv7_buster.src +++ b/conf/armv7_buster.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-4.25/pgadmin_4-4.25-buster-bin1_armv7l.tar.gz -SOURCE_SUM=1ae1e3d6ec1343c86808cfc578066d56b22a72d7967ca8dbf0fb85ddfd495142 +SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-4.28/pgadmin_4-4.28-buster-bin1_armv7l.tar.gz +SOURCE_SUM=631919aadf076649365df7040c0b51fb5c8aaf45c9770613a38ccb392caea39a # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/armv7_stretch.src b/conf/armv7_stretch.src index db6283e..5fc1e3d 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.25/pgadmin_4-4.25-stretch-bin1_armv7l.tar.gz -SOURCE_SUM=283bf536c761644e330f4885d7c19be8eb665d6fc01503486690f1f3c97f2841 +SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-4.28/pgadmin_4-4.28-stretch-bin1_armv7l.tar.gz +SOURCE_SUM=f9c786137c9f401e20f738737c12c02ae4f8d645b80544c78752ecba1a5f280d # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/nginx.conf b/conf/nginx.conf index bcd94f2..e184597 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,6 +1,6 @@ location __PATH__ { include uwsgi_params; - uwsgi_pass unix:///var/run/__NAME__/app.socket; + uwsgi_pass unix:///run/__NAME__/app.socket; uwsgi_read_timeout 180; uwsgi_send_timeout 180; diff --git a/manifest.json b/manifest.json index bf850e1..0efa007 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.25~ynh1", + "version": "4-4.28~ynh1", "url": "https://www.pgadmin.org", "license": "PostgreSQL", "maintainer": { diff --git a/scripts/_common.sh b/scripts/_common.sh index 7457f45..59afd95 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,16 +4,10 @@ app=$YNH_APP_INSTANCE_NAME final_path=/opt/yunohost/$app -pgadmin_user="pgadmin" +pgadmin_user="$app" 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 - APP_VERSION=$(ynh_app_upstream_version) - app_main_version=$(echo $APP_VERSION | cut -d'-' -f1) - app_sub_version=$(echo $APP_VERSION | cut -d'-' -f2) -fi - #================================================= # DEFINE ALL COMMON FONCTIONS #================================================= diff --git a/scripts/backup b/scripts/backup index 9825ae9..52ff421 100644 --- a/scripts/backup +++ b/scripts/backup @@ -4,21 +4,24 @@ # GENERIC START #================================================= +# Import common cmd +source ../settings/scripts/experimental_helper.sh +source ../settings/scripts/_common.sh + # IMPORT GENERIC HELPERS source /usr/share/yunohost/helpers # Exit if an error occurs during the execution of the script ynh_abort_if_errors -# Import common cmd -source ../settings/scripts/experimental_helper.sh -source ../settings/scripts/_common.sh - # LOAD SETTINGS ynh_script_progression --message="Loading installation settings..." final_path=$(ynh_app_setting_get --app $app --key final_path) domain=$(ynh_app_setting_get --app $app --key domain) db_name=$(ynh_app_setting_get --app $app --key db_name) +app_version=$(ynh_app_upstream_version) +app_main_version=$(echo $app_version | cut -d'-' -f1) +app_sub_version=$(echo $app_version | cut -d'-' -f2) #================================================= # STANDARD BACKUP STEPS diff --git a/scripts/change_url b/scripts/change_url index ce0313d..828f568 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -4,16 +4,16 @@ # GENERIC START #================================================= +# Import common cmd +source ./experimental_helper.sh +source ./_common.sh + # Source YunoHost helpers source /usr/share/yunohost/helpers # Stop script if errors ynh_abort_if_errors -# Import common cmd -source ./experimental_helper.sh -source ./_common.sh - # Retrive arguments ynh_script_progression --message="Loading installation settings..." old_domain=$YNH_APP_OLD_DOMAIN @@ -42,10 +42,9 @@ ynh_add_nginx_config ynh_add_uwsgi_service 'pgadmin_user python_version' # Reload services -ynh_script_progression --message="Reloading services..." -sudo systemctl reload nginx.service +ynh_script_progression --message="Restarting $app services..." --weight=3 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='[/[:alnum:]_-]*'\) ready in [[:digit:]]* seconds on interpreter" --log_path "/var/log/uwsgi/$app/$app.log" sleep 10 ynh_script_progression --message="Change of URL completed for $app" --last diff --git a/scripts/experimental_helper.sh b/scripts/experimental_helper.sh index a5cc663..3b75020 100644 --- a/scripts/experimental_helper.sh +++ b/scripts/experimental_helper.sh @@ -6,10 +6,9 @@ # # usage: ynh_check_global_uwsgi_config ynh_check_global_uwsgi_config () { - uwsgi --version || ynh_die --message "You need to add uwsgi (and appropriate plugin) as a dependency" + uwsgi --version || ynh_die --message="You need to add uwsgi (and appropriate plugin) as a dependency" cat > /etc/systemd/system/uwsgi-app@.service <