Merge pull request #526 from jvonau/calibre

Calibre

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"

roles/calibre/tasks/main.yml

@@ -14,8 +14,8 @@
 
 - name: Install Calibre (OS's other than CentOS)
 # the fedora rpm arm version, though older, takes care of dependencies, and exists
-  package:  name={{ item }}
-            state=present
+  package: name={{ item }}
+           state=present
   with_items:
     - calibre
   when: calibre_install and ansible_distribution != 'CentOS'
@@ -32,13 +32,13 @@
     - { src: 'calibre.conf', dest: '/etc/{{ apache_config_dir }}', mode: '0644'}
   when: calibre_install
 
-- name: Create the link for sites-enabled (debuntu)
+- name: Create the link for sites-enabled, containing ProxyPass[Reverse]...localhost:8080 (debuntu)
   file: src=/etc/apache2/sites-available/calibre.conf
         dest=/etc/apache2/sites-enabled/calibre.conf
         state=link
   when: is_debuntu and calibre_enabled
 
-- name: Enable Calibre server
+- name: Enable Calibre service -- runs calibre-server by Kovid Goyal
   service: name=calibre-serve
            enabled=yes
            state=started
@@ -46,7 +46,7 @@
   #poll: 5
   when: calibre_enabled
 
-- name: Disable Calibre server
+- name: Disable Calibre service -- stops calibre-server by Kovid Goyal
   service: name=calibre-serve
            enabled=no
            state=stopped

roles/calibre/templates/calibre.conf

@@ -1,2 +1,18 @@
-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 }}
+
+# http://box/books mnemonic for English speakers
+ProxyPass /books http://localhost:{{ calibre_port }}
+ProxyPassReverse /books http://localhost:{{ calibre_port }}
+
+# http://box/liv mnemonic for Haitian Creole speakers
+ProxyPass /liv http://localhost:{{ calibre_port }}
+ProxyPassReverse /liv http://localhost:{{ calibre_port }}
+
+# http://box/libros mnemonic for Spanish speakers
+ProxyPass /libros http://localhost:{{ calibre_port }}
+ProxyPassReverse /libros http://localhost:{{ calibre_port }}
+
+# http://box/livres mnemonic for French speakers
+ProxyPass /livres http://localhost:{{ calibre_port }}
+ProxyPassReverse /livres http://localhost:{{ calibre_port }}

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

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