Add www, redirects to librivox.org

roles/blog+catalog/tasks/main.yaml

@@ -144,3 +144,20 @@
     src: /etc/apache2/sites-available/librivox.org.conf
   become: true
   notify: Restart Apache
+
+# Redirect 'www' to librivox.org
+
+- name: librivox.org config file
+  template:
+    src: www.librivox.org.conf
+    dest: /etc/apache2/sites-available/www.librivox.org.conf
+  become: true
+  notify: Restart Apache
+
+- name: Enable site
+  file:
+    path: /etc/apache2/sites-enabled/www.librivox.org.conf
+    state: link
+    src: /etc/apache2/sites-available/www.librivox.org.conf
+  become: true
+  notify: Restart Apache

roles/blog+catalog/templates/www.librivox.org.conf

@@ -0,0 +1,17 @@
+<VirtualHost *:443>
+
+    ServerName www.librivox.org
+    Redirect permanent / https://librivox.org/
+
+    SSLEngine On
+    SSLCertificateFile /etc/letsencrypt/live/librivox.org/fullchain.pem
+    SSLCertificateKeyFile /etc/letsencrypt/live/librivox.org/privkey.pem
+
+</VirtualHost>
+
+<VirtualHost *:80>
+
+    ServerName www.librivox.org
+    Redirect permanent / https://librivox.org/
+
+</VirtualHost>

roles/hosts_entry/tasks/main.yaml

@@ -1,5 +1,5 @@
 - name: hosts entry
   lineinfile:
     dest: /etc/hosts
-    line: "{{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }} librivox.org forum.librivox.org wiki.librivox.org"
+    line: "{{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }} librivox.org forum.librivox.org wiki.librivox.org www.librivox.org"
   become: true