From 97750c134511b0c61bc0fdf1df3d8eea40750a25 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 27 Mar 2022 07:59:37 +0200 Subject: [PATCH 1/4] 1.4.6 --- 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 063cbed..7b01140 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/phpipam/phpipam/releases/download/v1.4.4/phpipam-v1.4.4.zip -SOURCE_SUM=0baa77f135bbf72b138c58e50d58046eaaad722a96f09d3e148b61c5cd5f071f +SOURCE_URL=https://github.com/phpipam/phpipam/releases/download/v1.4.6/phpipam-v1.4.6.zip +SOURCE_SUM=65ad33c124fc83ca1a3ba386bbc1e6d8fb611b2ccaa4c6e8a1d864bcde4122de SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 93a5534..10d3b0a 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Web IP address management application", "fr": "Application web de gestion d'adresses IP" }, - "version": "1.4.5~ynh1", + "version": "1.4.6~ynh1", "url": "https://phpipam.net/", "upstream": { "license": "GPL-3.0-only", From ba3646c0a1eb2589f66b47d9cafa4f74318daa15 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 27 Mar 2022 08:00:48 +0200 Subject: [PATCH 2/4] Update config.dist.php --- conf/config.dist.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.dist.php b/conf/config.dist.php index 2657b5c..05e3088 100755 --- a/conf/config.dist.php +++ b/conf/config.dist.php @@ -4,7 +4,7 @@ * database connection details ******************************/ $db['host'] = 'localhost'; -$db['user'] = '__DB_NAME__'; +$db['user'] = '__DB_USER__'; $db['pass'] = '__DB_PWD__'; $db['name'] = '__DB_NAME__'; $db['port'] = 3306; From 45742fa797e39bfe76af8b1e717d2ca70b46c260 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 27 Mar 2022 06:00:52 +0000 Subject: [PATCH 3/4] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 285a8cd..5b213d3 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Web IP address management application -**Shipped version:** 1.4.5~ynh1 +**Shipped version:** 1.4.6~ynh1 **Demo:** http://demo.phpipam.net diff --git a/README_fr.md b/README_fr.md index 4fba2cb..d2c0f01 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Application web de gestion d'adresses IP -**Version incluse :** 1.4.5~ynh1 +**Version incluse :** 1.4.6~ynh1 **Démo :** http://demo.phpipam.net From cebc3ed8d6b088d167120ef40d2cd55a639d20d2 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 3 Apr 2022 23:09:09 +0200 Subject: [PATCH 4/4] Fix --- scripts/change_url | 1 + scripts/install | 2 +- scripts/upgrade | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/change_url b/scripts/change_url index 15ade1a..08e9824 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -28,6 +28,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=1 final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) +db_user=$db_name db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) #================================================= diff --git a/scripts/install b/scripts/install index 6ba4dff..4d8a5b8 100644 --- a/scripts/install +++ b/scripts/install @@ -45,7 +45,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=1 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url -ynh_app_setting_set --app=$app --key=phpversion --value=$phpversion #================================================= # INSTALL DEPENDENCIES @@ -100,6 +99,7 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 # Create a dedicated PHP-FPM config ynh_add_fpm_config +ynh_app_setting_set --app=$app --key=phpversion --value=$phpversion #================================================= # ADD A CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index 3772034..00c0e2f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -20,6 +20,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) +db_user=$db_name db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)