From 71f24848b53fca2267f4d3b47ce03ce7f9632a34 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Thu, 7 Dec 2017 11:06:37 -0500
Subject: [PATCH 1/4] Update main.yml

---
 roles/calibre/tasks/main.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/roles/calibre/tasks/main.yml b/roles/calibre/tasks/main.yml
index 685885b29..1105bcb72 100644
--- a/roles/calibre/tasks/main.yml
+++ b/roles/calibre/tasks/main.yml
@@ -11,6 +11,18 @@
   when: is_rpi or (is_debian and calibre_debs_on_debian)
   #when: is_rpi or is_debian     # (is_debian also covers & includes is_rpi)
 
+- name: Create calibre-serve.service and calibre.conf
+  template:
+    backup: no
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
+    owner: root
+    group: root
+    mode: "{{ item.mode }}"
+  with_items:
+    - { src: 'calibre-serve.service.j2', dest: '/etc/systemd/system/calibre-serve.service', mode: '0644'}
+    - { src: 'calibre.conf', dest: '/etc/{{ apache_config_dir }}', mode: '0644'}
+
 # 2. STOP CALIBRE SERVICE IF IT EXISTS (REQUIRED FOR DB ACTIVITY...AND IF not calibre_enabled)
 
 #- name: Check if Calibre systemd service exists
@@ -41,18 +53,6 @@
 
 # 4. WRAP UP: CALIBRE SERVICE, http://box/books ETC
 
-- name: Create calibre-serve.service and calibre.conf
-  template:
-    backup: no
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
-    owner: root
-    group: root
-    mode: "{{ item.mode }}"
-  with_items:
-    - { src: 'calibre-serve.service.j2', dest: '/etc/systemd/system/calibre-serve.service', mode: '0644'}
-    - { src: 'calibre.conf', dest: '/etc/{{ apache_config_dir }}', mode: '0644'}
-
 # http://box:8080 & http://box:8080/mobile WORK BUT OTHER URL'S LIKE http://box/books ARE A MESS (BOOKS RARELY DISPLAY)
 - name: Create calibre.conf link for UNTESTED http://box/books etc (debuntu)
   file:

From 3f0ebccdbe974e01949ee71b8300da5876638165 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Thu, 7 Dec 2017 11:10:04 -0500
Subject: [PATCH 2/4] Update main.yml

---
 roles/calibre/tasks/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/calibre/tasks/main.yml b/roles/calibre/tasks/main.yml
index 1105bcb72..4c1be9584 100644
--- a/roles/calibre/tasks/main.yml
+++ b/roles/calibre/tasks/main.yml
@@ -37,7 +37,7 @@
     state: stopped
     #enabled: no
 # register: command_result    # gist.github.com/tyrells/0a79681de339237cb04c
-  failed_when: false          # Never Fail during "systemctl stop calibre-serve" (even if service doesn't exist!)
+#  failed_when: false          # Never Fail during "systemctl stop calibre-serve" (even if service doesn't exist!)
 # when: calibre_svc.stat.exists
 
 # 3. CREATE DATABASE WITH A SAMPLE BOOK (REQUIRED AS OF CALIBRE 3.x)

From 9d83d83d690f47be2280a2cc974c30f0bb205b92 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Thu, 7 Dec 2017 11:26:04 -0500
Subject: [PATCH 3/4] Update main.yml

---
 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 73eba3a38..35aea6dcd 100644
--- a/roles/calibre/tasks/main.yml
+++ b/roles/calibre/tasks/main.yml
@@ -19,10 +19,10 @@
     owner: root
     group: root
     mode: "{{ item.mode }}"
+  register: calibre_config
   with_items:
     - { src: 'calibre-serve.service.j2', dest: '/etc/systemd/system/calibre-serve.service', mode: '0644'}
     - { src: 'calibre.conf', dest: '/etc/{{ apache_config_dir }}', mode: '0644'}
-  register: calibre_config
 
 - name: Forcing systemd to reread configs
   systemd:
@@ -105,4 +105,4 @@
   - option: port
     value: "{{ calibre_port }}"
   - option: enabled
-    value: "{{ calibre_enabled }}"
\ No newline at end of file
+    value: "{{ calibre_enabled }}"

From b4d6f442d9d91518f46f80bd8a22a9af31261c5d Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Thu, 7 Dec 2017 11:27:19 -0500
Subject: [PATCH 4/4] Update main.yml

---
 roles/calibre/tasks/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/calibre/tasks/main.yml b/roles/calibre/tasks/main.yml
index 35aea6dcd..556ead031 100644
--- a/roles/calibre/tasks/main.yml
+++ b/roles/calibre/tasks/main.yml
@@ -13,12 +13,12 @@
 
 - name: Create calibre-serve.service and calibre.conf
   template:
-    backup: no
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
     owner: root
     group: root
     mode: "{{ item.mode }}"
+    backup: no
   register: calibre_config
   with_items:
     - { src: 'calibre-serve.service.j2', dest: '/etc/systemd/system/calibre-serve.service', mode: '0644'}