From 78b0b753d88991d6127adbf8d46d5549c070f02a Mon Sep 17 00:00:00 2001
From: Arky <hitmanarky@gmail.com>
Date: Sun, 26 Aug 2018 23:12:53 +0700
Subject: [PATCH] Refactor: Simpler Calibre-web service

Systemd does take multiple arguments! Removing extranous files and
envirnoment variables.
---
 roles/calibre-web/tasks/main.yml                   | 5 ++---
 roles/calibre-web/templates/calibre-web.service.j2 | 5 +----
 roles/calibre-web/templates/cps.conf.j2            | 2 --
 3 files changed, 3 insertions(+), 9 deletions(-)
 delete mode 100644 roles/calibre-web/templates/cps.conf.j2

diff --git a/roles/calibre-web/tasks/main.yml b/roles/calibre-web/tasks/main.yml
index 829444723..d2cdb45b0 100644
--- a/roles/calibre-web/tasks/main.yml
+++ b/roles/calibre-web/tasks/main.yml
@@ -24,7 +24,8 @@
   pip:
     requirements: requirements.txt
     chdir: "{{ calibreweb_path }}"
-    extra_args: --target vendor
+    extra_args: '--target vendor'
+    ignore_errors: True
 
 - name: Create calibre-web systemd service unit and httpd2 configuration.
   template:
@@ -36,8 +37,6 @@
   with_items:
     - { src: 'calibre-web.service.j2', dest: '/etc/systemd/system/calibre-web.service', mode: '0644' }
     - { src: 'calibre-web.conf.j2', dest: '/etc/apache2/sites-available/calibre-web.conf', mode: '0644' }
-    - { src: 'cps.conf.j2', dest: "{{ calibreweb_home }}/cps.conf" , mode: '0644' }
-
 
 - name: Provision calibre-web default metadata.
   copy:
diff --git a/roles/calibre-web/templates/calibre-web.service.j2 b/roles/calibre-web/templates/calibre-web.service.j2
index f4fa5bd80..8a8c140dc 100644
--- a/roles/calibre-web/templates/calibre-web.service.j2
+++ b/roles/calibre-web/templates/calibre-web.service.j2
@@ -3,10 +3,7 @@ Description=Calibre-Web
 [Service]
 Type=simple
 User={{ calibreweb_user }}
-#EnvironmentFile={{ calibreweb_home }}/cps.conf
-#WorkingDirectory={{ calibreweb_path }}
-ExecStart=/usr/bin/python {{ calibreweb_exec_path }} -p {{ calibreweb_home }}/{{ calibreweb_settings_database }}
-
+ExecStart=/usr/bin/python {{ calibreweb_exec_path }} -p {{ calibreweb_config }}/{{ calibreweb_settings_database }}
 
 [Install]
 WantedBy=multi-user.target
diff --git a/roles/calibre-web/templates/cps.conf.j2 b/roles/calibre-web/templates/cps.conf.j2
deleted file mode 100644
index 46ac3cc7b..000000000
--- a/roles/calibre-web/templates/cps.conf.j2
+++ /dev/null
@@ -1,2 +0,0 @@
-ARG1 = -p
-ARG2 = {{ calibreweb_home }}/{{ calibreweb_database }}