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 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..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", @@ -19,7 +19,7 @@ "email": "titoko@titoko.fr" }, "requirements": { - "yunohost": ">> 4.2.4" + "yunohost": ">> 11.2" }, "multi_instance": false, "services": [ @@ -30,8 +30,7 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "domain.org" + "type": "domain" }, { "name": "path", @@ -51,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" 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/restore b/scripts/restore index c8a93a0..de4221b 100644 --- a/scripts/restore +++ b/scripts/restore @@ -32,10 +32,7 @@ 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 " +test ! -d $final_path || ynh_die --message="There is already a directory: $final_path " #================================================= # STANDARD RESTORATION STEPS diff --git a/scripts/upgrade b/scripts/upgrade index db9c103..86204a9 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 @@ -100,6 +99,7 @@ ynh_add_fpm_config #================================================= # Set Jappix configuration #================================================= +ynh_script_progression --message="Configuring Jappix..." --weight=1 mkdir -p "$final_path/store/conf"