Correct Variables and add tasks for future

roles/calibre-web/README.rst

@@ -14,7 +14,7 @@ This is front-end application running under Apache2 httpd.
 
 To login to Calibre-web enter
 
-  Username: admin
+  Username: Admin
 
   Password: changme
 

roles/calibre-web/defaults/main.yml

@@ -22,5 +22,5 @@ calibreweb_database: metadata.db
 calibreweb_user: root
 
 # calibreweb admin account
-# calibreweb_admin_user: admin
+# calibreweb_admin_user: Admin
 # calibreweb_admin_password: changeme

roles/calibre-web/tasks/main.yml

@@ -9,14 +9,17 @@
     - "{{ calibreweb_home }}"
     - "{{ calibreweb_path }}"
 
+## TODO: Calibre-web future release might get into pypi https://github.com/janeczku/calibre-web/issues/456
 - name: Download calibre-web github repository.
   git:
     repo: https://github.com/janeczku/calibre-web.git
     dest: "{{ calibreweb_path }}"
     update: yes
+    depth: 1
     version: master
   when: internet_available
 
+## TODO: Use Ansible native pip module for this. How do you use --target vendor ?
 - name: Download calibre-web dependencies into vendor subdirectory.
   command: pip install --target vendor -r ./requirements.txt
   args:
@@ -52,14 +55,14 @@
 - name: Enable calibre-web service.
   service:
     name: calibre-web
-    enabled: yes
-    state: restarted
+    daemon_reload: yes
   when: calibreweb_enabled
 
 - name: Enable calibre-web httpd2 site
   command: a2ensite calibre-web.conf
   when: calibreweb_enabled
 
+# TODO: Use Systemd service daemon_reload instead?
 - name: Restart Apache after enabling calibre-web httpd2 site.
   command: apachectl -k graceful
   when: calibreweb_enabled
@@ -75,6 +78,7 @@
   command: a2dissite calibre-web.conf
   when: not calibreweb_enabled
 
+# TODO: Use Systemd service daemon_reload instead?
 - name: Restart Apache after disabling calibre-web httpd2 site.
   command: apachectl -k graceful
   when: not calibreweb_enabled
@@ -94,9 +98,13 @@
       value: "{{ calibreweb_url }}"
     - option: calibreweb_path
       value: "{{ calibreweb_path }}"
+    - option: calibreweb_home
+      value: "{{ calibreweb_home }}"
     - option: calibreweb_port
       value: "{{ calibreweb_port }}"
-    - option: enabled
+    - option: calibreweb_database
+      value: "{{ calibreweb_database }}"
+    - option: calibreweb_enabled
       value: "{{ calibreweb_enabled }}"
-    - option: True
+    - option: calibreweb_provision
       value: "{{ calibreweb_provision }}"