diff --git a/check_process b/check_process index ad1506e..4cb7767 100755 --- a/check_process +++ b/check_process @@ -1,11 +1,11 @@ ;; Test complet auto_remove=1 ; Manifest - domain="domain.tld" (DOMAIN) - path="/path" (PATH) - admin="john" (USER) + domain="domain.tld" + path="/path" + admin="john" language="en" - is_public=1 (PUBLIC|public=1|private=0) + is_public=1 password="azerty1234" wiki="My Wiki" color="328cc1" diff --git a/conf/app.src b/conf/app.src index d689894..e93f13f 100755 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,5 @@ -SOURCE_URL=https://sourceforge.net/projects/lionwiki-t2t/files/lionwiki-t2t.zip -SOURCE_SUM=3b893ed663da7fb4db381e88d5044281452c68fe3ad920b5a23b326ce5a2e4f6 +SOURCE_URL=http://lionwiki.0o.cz/download/3.2.12/lionwiki-3.2.12.zip +SOURCE_SUM=dfa7ebd8bca1e85fc8d2cc9554ca2a713a30e24f54acad80664c147acd4d1f16 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= diff --git a/conf/nginx.conf b/conf/nginx.conf index 556b622..549b52a 100755 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,11 +4,6 @@ location __PATH__/ { # Path to source alias __FINALPATH__/ ; - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - index index.php; # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file diff --git a/manifest.json b/manifest.json index 4b7e237..9ec33eb 100755 --- a/manifest.json +++ b/manifest.json @@ -6,14 +6,14 @@ "en": "Lightweight wiki-style CMS using the txt2tags syntax", "fr": "CMS léger, géré sous forme de wiki utilisant la syntaxe txt2tags" }, - "version": "3.2.11~ynh6", + "version": "3.2.12~ynh1", "url": "https://lionwiki-t2t.sourceforge.io/", "license": "MIT", "maintainer": { "name": "Eric Forgeot" }, "requirements": { - "yunohost": ">= 4.1.7" + "yunohost": ">= 4.3.0" }, "multi_instance": true, "services": [ diff --git a/scripts/restore b/scripts/restore index 7640926..a05d5b0 100755 --- a/scripts/restore +++ b/scripts/restore @@ -38,10 +38,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=1 -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