From 3bcd3d391026634d4b4d4c1809727ba984cff45b Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 14 Nov 2017 01:57:55 -0500 Subject: [PATCH 1/3] Ansible output for Calibre clarified --- roles/calibre/tasks/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/calibre/tasks/main.yml b/roles/calibre/tasks/main.yml index 980d65581..a1a515bc4 100644 --- a/roles/calibre/tasks/main.yml +++ b/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=latest 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 -- which runs calibre-server 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 -- which stops calibre-server service: name=calibre-serve enabled=no state=stopped From 905ab1e71b04d54a4e3d9ccb1cc63c245a31991e Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 14 Nov 2017 10:51:08 -0500 Subject: [PATCH 2/3] distinguishing calibre-server from calibre-serve.service ! --- roles/calibre/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/calibre/tasks/main.yml b/roles/calibre/tasks/main.yml index a1a515bc4..c5adabde2 100644 --- a/roles/calibre/tasks/main.yml +++ b/roles/calibre/tasks/main.yml @@ -38,7 +38,7 @@ state=link when: is_debuntu and calibre_enabled -- name: Enable Calibre service -- which runs 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 service -- which stops calibre-server +- name: Disable Calibre service -- stops calibre-server by Kovid Goyal service: name=calibre-serve enabled=no state=stopped From da1856c75a7502a5d823e3057594ba698bdc5a0d Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 14 Nov 2017 12:54:31 -0500 Subject: [PATCH 3/3] http://box/books etc implemented by calibre.conf ? --- roles/calibre/templates/calibre.conf | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/roles/calibre/templates/calibre.conf b/roles/calibre/templates/calibre.conf index 05197a852..1a2c31f28 100644 --- a/roles/calibre/templates/calibre.conf +++ b/roles/calibre/templates/calibre.conf @@ -1,2 +1,15 @@ -ProxyPass /calibre http://localhost:8080 -ProxyPassReverse /calibre http://localhost:8080 +# 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 }}