diff --git a/check_process b/check_process index 017dab1..3bfc8ff 100644 --- a/check_process +++ b/check_process @@ -1,12 +1,12 @@ ;; Complete Test # First Run of complete test ; Manifest - domain="domain.tld" (DOMAIN) - path="/calibre" (PATH) + domain="domain.tld" + path="/calibre" calibre_path="/home/yunohost.app/calibreweb" - admin="john" (USER) + admin="john" language="en" - is_public=0 (PUBLIC|public=1|private=0) + is_public=0 upload=1 password="a very long password" ; Checks diff --git a/conf/nginx.conf b/conf/nginx.conf index e0329b4..86caa24 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,8 +1,5 @@ location __PATH__ { - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } + #Client max body size to allow upload of ebook. #big number as audiobook may be quite big client_max_body_size 500M; @@ -13,12 +10,12 @@ location __PATH__ { proxy_buffer_size 256k; proxy_pass http://localhost:__PORT__; - proxy_set_header X-Forwarded-For $remote_addr; - proxy_set_header Host $http_host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Scheme $scheme; - proxy_set_header X-Script-Name __PATH__; -# proxy_set_header X-Remote-User $remote_user; + proxy_set_header X-Forwarded-For $remote_addr; + proxy_set_header Host $http_host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Scheme $scheme; + proxy_set_header X-Script-Name __PATH__; +# proxy_set_header X-Remote-User $remote_user; # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; diff --git a/manifest.json b/manifest.json index 42cab9d..6d6bdf6 100644 --- a/manifest.json +++ b/manifest.json @@ -20,7 +20,7 @@ "email": "misterl56@hotmail.com" }, "requirements": { - "yunohost": ">= 4.2.0" + "yunohost": ">= 4.3.0" }, "multi_instance": true, "services": [ @@ -30,8 +30,7 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "example.com" + "type": "domain" }, { "name": "path", @@ -41,8 +40,7 @@ }, { "name": "admin", - "type": "user", - "example": "johndoe" + "type": "user" }, { "name": "is_public", diff --git a/scripts/restore b/scripts/restore index 2e14305..0035190 100755 --- a/scripts/restore +++ b/scripts/restore @@ -37,10 +37,8 @@ source ../settings/scripts/_common.sh # CHECK IF THE APP CAN BE RESTORED #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=1 -ynh_webpath_available $domain $path_url \ - || ynh_die "Path not available: ${domain}${path_url}" -test ! -d $final_path \ - || ynh_die "There is already a directory: $final_path " + +test ! -d $final_path || ynh_die "There is already a directory: $final_path " #================================================= # STANDARD RESTORATION STEPS