diff --git a/roles/calibre/defaults/main.yml b/roles/calibre/defaults/main.yml index 957c06557..847c5b31a 100644 --- a/roles/calibre/defaults/main.yml +++ b/roles/calibre/defaults/main.yml @@ -1,3 +1,4 @@ calibre_port: 8080 +calibre_web_path: /calibre calibre_dbpath: "/library/calibre" calibre_src_url: "https://raw.githubusercontent.com/kovidgoyal/calibre/master/setup/linux-installer.py" diff --git a/roles/calibre/templates/calibre.conf b/roles/calibre/templates/calibre.conf index 05197a852..6508f9105 100644 --- a/roles/calibre/templates/calibre.conf +++ b/roles/calibre/templates/calibre.conf @@ -1,2 +1,2 @@ -ProxyPass /calibre http://localhost:8080 -ProxyPassReverse /calibre http://localhost:8080 +ProxyPass /{{ calibre_web_path }} http://localhost:{{ calibre_port }} +ProxyPassReverse /{{ calibre_web_path }} http://localhost:{{ calibre_port }} diff --git a/vars/default_vars.yml b/vars/default_vars.yml index fdc12a050..b250c8e14 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -225,6 +225,7 @@ idmgr_enables: False calibre_install: True calibre_enabled: False calibre_port: 8080 +calibre_web_path: /calibre # DokuWiki dokuwiki_install: False diff --git a/vars/medium.localvars b/vars/medium.localvars index 678c94992..21c5362ec 100644 --- a/vars/medium.localvars +++ b/vars/medium.localvars @@ -117,6 +117,7 @@ calibre_install: True calibre_enabled: True # Change calibre_port to 8010 if you're using XO laptops needing above idmgr calibre_port: 8080 +calibre_web_path: /calibre dokuwiki_install: False dokuwiki_enabled: False