Fixes for static web files (do not use template) + renew script.

Author: ksylvan

README.md

@@ -131,6 +131,17 @@ create an alterate setup:
 * / will refer to what you place in `www/yourdomain.tld/files/`
 * /~user will refer to what you place in `www/yourdomain.tld/people/user/`
 
+Any text files placed in the `files/` or `people` subdirectories of
+`www/yourdomain.tld` will be installed using the `jinja2` template
+copy, enabling you to use variables like `{{ domain_name }}` in
+your files.
+
+Occasionally, this template mechanism does not work well (javascript
+source code, for example). To work around this, if you place
+files in a `static/` subtree, they will be copied without
+templating. Place files in `static/files/` and `static/people/user` to
+have them installed in the correct places.
+
 Note that files placed in `www/` are ignored by git and will have
 to be backed up.
 

roles/certificates/files/renew

@@ -1,5 +1,6 @@
 #!/bin/sh
 c=/usr/local/bin/certbot
+d=/usr/local/bin/docker-compose
 
 LIMIT=5
 DAYS=$($c certificates 2>/dev/null |
@@ -14,9 +15,9 @@ then
 else
   if [ $DAYS -lt $LIMIT ]; then
     cd /home/{{ deploy_user_name }}
-    docker-compose stop nginx > $msg 2>&1
+    $d stop nginx > $msg 2>&1
     $c renew >> $msg 2>&1
-    docker-compose start nginx >> $msg 2>&1
+    $d start nginx >> $msg 2>&1
     SUBJECT="Cert Renewal Attempt (Valid for $DAYS days)"
   else
     SUBJECT="Cert is still valid (for $DAYS days)"

roles/mailserver/tasks/main.yml

@@ -230,35 +230,71 @@
 
 - name: Set up www site with files.
   block:
+  - local_action:
+      module: file
+      path: www/{{ domain_name }}/{{ item }}
+      args:
+        state: directory
+    with_items:
+    - static
+    - people
+    - files
+    become: false
   # now create dirs under /mnt/docker/www
+  - file:
+      path: /mnt/docker/www/files/{{ item.path }}
+      state: directory
+      recurse: yes
+      owner: 991
+      group: 991
+    with_filetree: www/{{ domain_name}}/files
+    when: item.state == 'directory'
+  - file:
+      path: /mnt/docker/www/people/{{ item.path }}
+      state: directory
+      recurse: yes
+      owner: 991
+      group: 991
+    with_filetree: www/{{ domain_name}}/people
+    when: item.state == 'directory'
   - file:
       path: /mnt/docker/www/{{ item.path }}
       state: directory
       recurse: yes
       owner: 991
       group: 991
-    with_filetree: www/{{ domain_name}}
+    with_filetree: www/{{ domain_name}}/static
     when: item.state == 'directory'
 
   # list of text files
   - local_action:
       module: |
-        shell find . -type f | xargs file -i |
+        shell find . -type f | egrep -v '^\./static/' | xargs file -i |
         egrep 'text/plain|text/html' | awk -F: '{print $1}'
       args:
         chdir: www/{{ domain_name }}
     register: web_text_files
     changed_when: false
+
   # list of binary files
   - local_action:
       module: |
-        shell find . -type f | xargs file -i |
+        shell find . -type f | egrep -v '^./static/' | xargs file -i |
         egrep -v 'text/plain|text/html' | awk -F: '{print $1}'
       args:
         chdir: www/{{ domain_name }}
     register: web_binary_files
     changed_when: false
 
+  # list of static files
+  - local_action:
+      module: |
+        shell find . -type f
+      args:
+        chdir: www/{{ domain_name }}/static
+    register: web_static_files
+    changed_when: false
+
   # now create files with template
   - name: Update web site text files
     template:
@@ -277,6 +313,15 @@
       group: 991
     with_items: "{{ web_binary_files.stdout_lines }}"
 
+  # Copy the static files
+  - name: Update web site static files
+    copy:
+      src: www/{{ domain_name }}/static/{{ item }}
+      dest: /mnt/docker/www/{{ item }}
+      owner: 991
+      group: 991
+    with_items: "{{ web_static_files.stdout_lines }}"
+
   # Now for the website nginx config
   - name: Set up the nginx config
     template: