From 971fb3de0b16a3018365865202ca3610b572ebe4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 23 Aug 2021 10:29:08 +0200 Subject: [PATCH 1/7] Update upgrade --- scripts/upgrade | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index db9c103..218e143 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -67,7 +67,6 @@ ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_script_progression --message="Setting up source files..." --weight=6 if [ "$upgrade_type" == "UPGRADE_APP" ] then From 75ca9acee9252059420c051788974c14bd1890e5 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 23 Aug 2021 10:30:40 +0200 Subject: [PATCH 2/7] Fix --- scripts/install | 1 + scripts/upgrade | 1 + 2 files changed, 2 insertions(+) diff --git a/scripts/install b/scripts/install index f4a6ec8..bf4ac2c 100644 --- a/scripts/install +++ b/scripts/install @@ -88,6 +88,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # Set Jappix configuration #================================================= +ynh_script_progression --message="Configuring Jappix..." --weight=1 mkdir -p "$final_path/store/conf" diff --git a/scripts/upgrade b/scripts/upgrade index 218e143..86204a9 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -99,6 +99,7 @@ ynh_add_fpm_config #================================================= # Set Jappix configuration #================================================= +ynh_script_progression --message="Configuring Jappix..." --weight=1 mkdir -p "$final_path/store/conf" From f8f43c5113c6fd08a57a63b4b1df5b5cda11da32 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 10 Sep 2021 21:33:09 +0200 Subject: [PATCH 3/7] Update restore --- scripts/restore | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/restore b/scripts/restore index c8a93a0..910ced5 100644 --- a/scripts/restore +++ b/scripts/restore @@ -32,8 +32,6 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=2 -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path " From 28cd35a231e1010aea5908a5ed2507b55a0a7c05 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 12 Dec 2021 18:48:14 +0100 Subject: [PATCH 4/7] Fix --- conf/nginx.conf | 4 ---- manifest.json | 5 ++--- scripts/restore | 3 +-- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 3c42416..867a208 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,10 +4,6 @@ location __PATH__/ { # Path to source alias __FINALPATH__/ ; - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - index index.php; try_files $uri $uri/ index.php; diff --git a/manifest.json b/manifest.json index 13d02b9..d77206e 100644 --- a/manifest.json +++ b/manifest.json @@ -19,7 +19,7 @@ "email": "titoko@titoko.fr" }, "requirements": { - "yunohost": ">> 4.2.4" + "yunohost": ">> 4.3.0" }, "multi_instance": false, "services": [ @@ -30,8 +30,7 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "domain.org" + "type": "domain" }, { "name": "path", diff --git a/scripts/restore b/scripts/restore index 910ced5..de4221b 100644 --- a/scripts/restore +++ b/scripts/restore @@ -32,8 +32,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=2 -test ! -d $final_path \ - || ynh_die --message="There is already a directory: $final_path " +test ! -d $final_path || ynh_die --message="There is already a directory: $final_path " #================================================= # STANDARD RESTORATION STEPS From 31436848e4e392a9a3b1f98f9258d04b6ca724ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 17 Dec 2023 14:53:42 +0100 Subject: [PATCH 5/7] Update manifest.json --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index d77206e..42cfd12 100644 --- a/manifest.json +++ b/manifest.json @@ -19,7 +19,7 @@ "email": "titoko@titoko.fr" }, "requirements": { - "yunohost": ">> 4.3.0" + "yunohost": ">> 11.2" }, "multi_instance": false, "services": [ @@ -50,7 +50,7 @@ }, { "name": "language", - "type": "string", + "type": "select", "ask": { "en": "Choose the default language of Jappix", "fr": "Choissisez la langue par défaut de Jappix" From fc9de6aed423d9c0db646d3545bc4b4c19dffa7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 17 Dec 2023 16:08:40 +0100 Subject: [PATCH 6/7] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 42cfd12..82b236b 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A free social network", "fr": "Un réseau social libre" }, - "version": "1.2~ynh1", + "version": "1.2~ynh2", "url": "https://jappix.org/", "upstream": { "license": "AGPL-3.0-only", From 107be1aa596dfe2e3b250e5bef591c1fffe137e6 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 17 Dec 2023 15:08:45 +0000 Subject: [PATCH 7/7] 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 aad3efb..7fdab3e 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in A free social network -**Shipped version:** 1.2~ynh1 +**Shipped version:** 1.2~ynh2 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 10dff27..919091a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Un réseau social libre -**Version incluse :** 1.2~ynh1 +**Version incluse :** 1.2~ynh2 ## Captures d’écran