1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/calibreweb_ynh.git synced 2024-09-03 18:16:20 +02:00

Merge pull request #89 from YunoHost-Apps/Fix-linter-warnings

Fix linter warnings
This commit is contained in:
Alexandre Aubin 2021-11-29 19:25:03 +01:00 committed by GitHub
commit ff5db835b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 23 deletions

View file

@ -1,12 +1,12 @@
;; Complete Test ;; Complete Test
# First Run of complete test # First Run of complete test
; Manifest ; Manifest
domain="domain.tld" (DOMAIN) domain="domain.tld"
path="/calibre" (PATH) path="/calibre"
calibre_path="/home/yunohost.app/calibreweb" calibre_path="/home/yunohost.app/calibreweb"
admin="john" (USER) admin="john"
language="en" language="en"
is_public=0 (PUBLIC|public=1|private=0) is_public=0
upload=1 upload=1
password="a very long password" password="a very long password"
; Checks ; Checks

View file

@ -1,8 +1,5 @@
location __PATH__ { 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. #Client max body size to allow upload of ebook.
#big number as audiobook may be quite big #big number as audiobook may be quite big
client_max_body_size 500M; client_max_body_size 500M;
@ -13,12 +10,12 @@ location __PATH__ {
proxy_buffer_size 256k; proxy_buffer_size 256k;
proxy_pass http://localhost:__PORT__; proxy_pass http://localhost:__PORT__;
proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Scheme $scheme; proxy_set_header X-Scheme $scheme;
proxy_set_header X-Script-Name __PATH__; proxy_set_header X-Script-Name __PATH__;
# proxy_set_header X-Remote-User $remote_user; # proxy_set_header X-Remote-User $remote_user;
# Include SSOWAT user panel. # Include SSOWAT user panel.
include conf.d/yunohost_panel.conf.inc; include conf.d/yunohost_panel.conf.inc;

View file

@ -20,7 +20,7 @@
"email": "misterl56@hotmail.com" "email": "misterl56@hotmail.com"
}, },
"requirements": { "requirements": {
"yunohost": ">= 4.2.0" "yunohost": ">= 4.3.0"
}, },
"multi_instance": true, "multi_instance": true,
"services": [ "services": [
@ -30,8 +30,7 @@
"install" : [ "install" : [
{ {
"name": "domain", "name": "domain",
"type": "domain", "type": "domain"
"example": "example.com"
}, },
{ {
"name": "path", "name": "path",
@ -41,8 +40,7 @@
}, },
{ {
"name": "admin", "name": "admin",
"type": "user", "type": "user"
"example": "johndoe"
}, },
{ {
"name": "is_public", "name": "is_public",

View file

@ -37,10 +37,8 @@ source ../settings/scripts/_common.sh
# CHECK IF THE APP CAN BE RESTORED # CHECK IF THE APP CAN BE RESTORED
#================================================= #=================================================
ynh_script_progression --message="Validating restoration parameters..." --weight=1 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 # STANDARD RESTORATION STEPS