Finish moving the village hall website over.

states/certificates/dehydrated/dnsapi.config.txt

@@ -4,3 +4,4 @@ bear-cave.org.uk {{ keyid }} {{ secret }}
 lunch.org.uk {{ keyid }} {{ secret }}
 cryhavoc.org.uk {{ keyid }} {{ secret }}
 ginalangford.com {{ keyid }} {{ secret }}
+cassingtonvillagehall.org.uk {{ keyid }} {{ secret }}

states/certificates/dehydrated/domains.txt

@@ -14,3 +14,4 @@ social.lunch.org.uk
 cloud.lunch.org.uk
 calendar.lunch.org.uk contacts.lunch.org.uk
 test.lunch.org.uk
+cassingtonvillagehall.org.uk www.cassingtonvillagehall.org.uk

states/villagehall_website/cassingtonvillagehall.org.uk.conf

@@ -2,7 +2,6 @@
 
 <VirtualHost *:443>
         ServerName cassingtonvillagehall.org.uk
-        ServerAlias test.lunch.org.uk
 
         ErrorLog /var/log/apache2/villagehall-error.log
         CustomLog /var/log/apache2/villagehall-access.log combined
@@ -36,8 +35,8 @@
         </Directory>
 
 	SSLEngine on
-	SSLCertificateFile /var/local/certificates/test.lunch.org.uk/fullchain.pem
-	SSLCertificateKeyFile /var/local/certificates/test.lunch.org.uk/privkey.pem
+	SSLCertificateFile /var/local/certificates/cassingtonvillagehall.org.uk/fullchain.pem
+	SSLCertificateKeyFile /var/local/certificates/cassingtonvillagehall.org.uk/privkey.pem
 </VirtualHost>
 
 <VirtualHost *:443>
@@ -57,8 +56,8 @@
         </IfModule>
 
         SSLEngine on
-        SSLCertificateFile /var/local/certificates/test.lunch.org.uk/fullchain.pem
-        SSLCertificateKeyFile /var/local/certificates/test.lunch.org.uk/privkey.pem
+        SSLCertificateFile /var/local/certificates/cassingtonvillagehall.org.uk/fullchain.pem
+        SSLCertificateKeyFile /var/local/certificates/cassingtonvillagehall.org.uk/privkey.pem
 </VirtualHost>
 
 </IfModule>
@@ -66,7 +65,6 @@
 <VirtualHost *:80>
         ServerName cassingtonvillagehall.org.uk
         ServerAlias www.cassingtonvillagehall.org.uk
-        ServerAlias test.lunch.org.uk
 
         ErrorLog /var/log/apache2/villagehall-error.log
         CustomLog /var/log/apache2/villagehall-access.log combined
@@ -78,6 +76,6 @@
                 # This redirects all accesses to the HTTPS version of the site.
                 #
                 RewriteEngine On
-                RewriteRule ^/?(.*) https://test.lunch.org.uk/$1 [R=301,L]
+                RewriteRule ^/?(.*) https://cassingtonvillagehall.org.uk/$1 [R=301,L]
         </IfModule>
 </VirtualHost>

states/villagehall_website/init.sls

@@ -11,7 +11,7 @@ villagehall_wordpress:
     - database: villagehall.*
     - user: villagehall 
   file.managed:
-    - name: /etc/wordpress/config-test.lunch.org.uk.php
+    - name: /etc/wordpress/config-cassingtonvillagehall.org.uk.php
     - source: salt://villagehall_website/config-cassingtonvillagehall.org.uk.php
     - template: jinja