From 3b039e5f3c8d50884568b735b902dbf95a4428bf Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Mon, 27 Aug 2018 11:41:42 -0400
Subject: [PATCH] Update main.yml

---
 roles/calibre-web/tasks/main.yml | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/roles/calibre-web/tasks/main.yml b/roles/calibre-web/tasks/main.yml
index b937a8e9e..efc6f9232 100644
--- a/roles/calibre-web/tasks/main.yml
+++ b/roles/calibre-web/tasks/main.yml
@@ -29,14 +29,14 @@
 #  ignore_errors: True
 ##
 # Implmenting this with Ansible command module for now.
-- name: Download calibre-web dependencies into vendor subdirectory.
+- name: Download calibre-web dependencies into vendor subdirectory
   command: pip install --target vendor -r ./requirements.txt
   args:
-   chdir: "{{ calibreweb_path }}"
+    chdir: "{{ calibreweb_path }}"
   ignore_errors: True
   when: internet_available
 
-- name: Create calibre-web systemd service unit and httpd2 configuration.
+- name: Create calibre-web systemd service unit and httpd2 configuration
   template:
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
@@ -47,7 +47,7 @@
     - { 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' }
 
-- name: Provision calibre-web default metadata.
+- name: Provision calibre-web default metadata
   copy:
     src: "{{ item }}"
     dest: "{{ calibreweb_home }}"
@@ -60,7 +60,7 @@
     - roles/calibre-web/files/metadata_db_prefs_backup.json
   when: calibreweb_provision
 
-- name: Provision calibre-web with default administration settings.
+- name: Provision calibre-web with default administration settings
   copy:
     src: roles/calibre-web/files/app.db
     dest: "{{ calibreweb_config }}"
@@ -70,7 +70,7 @@
     backup: yes
   when: calibreweb_provision
 
-- name: Enable and reload calibre-web service.
+- name: Enable and reload calibre-web service
   systemd:
     name: calibre-web
     daemon_reload: yes
@@ -82,11 +82,11 @@
   command: a2ensite calibre-web.conf
   when: calibreweb_enabled
 
-- name: Restart Apache after enabling calibre-web httpd2 site.
-  command: apachectl -k graceful
-  when: calibreweb_enabled
+#- name: Restart Apache after enabling calibre-web httpd2 site
+#  command: apachectl -k graceful
+#  when: calibreweb_enabled
 
-- name: Disable calibre-web service.
+- name: Disable calibre-web service
   systemd:
     name: calibre-web
     daemon_reload: yes
@@ -98,9 +98,14 @@
   command: a2dissite calibre-web.conf
   when: not calibreweb_enabled
 
-- name: Restart Apache after disabling calibre-web httpd2 site.
-  command: apachectl -k graceful
-  when: not calibreweb_enabled
+#- name: Restart Apache after disabling calibre-web httpd2 site.
+#  command: apachectl -k graceful
+#  when: not calibreweb_enabled
+
+- name: Restart Apache
+  systemd:
+    name: apache2
+    state: restarted
 
 - name: Add 'calibre-web' to list of services at /etc/iiab/iiab.ini
   ini_file: