diff --git a/states/dmarc_reports/dmarc.lunch.org.uk.conf b/states/dmarc_reports/dmarc.lunch.org.uk.conf
new file mode 100644
index 0000000..63a5f8b
--- /dev/null
+++ b/states/dmarc_reports/dmarc.lunch.org.uk.conf
@@ -0,0 +1,45 @@
+
+
+
+ ServerName dmarc.lunch.org.uk
+
+ ErrorLog /var/log/apache2/dmarc-error.log
+ CustomLog /var/log/apache2/dmarc-access.log combined
+
+ RemoteIPProxyProtocol On
+
+ DocumentRoot /srv/dmarcts-report-viewer
+
+
+ Options FollowSymLinks
+ AllowOverride All
+ Order allow,deny
+ Allow from all
+ Require all granted
+ DirectoryIndex dmarcts-report-viewer.php
+
+
+ SSLEngine on
+ SSLCertificateFile /var/local/certificates/dmarc.lunch.org.uk/fullchain.pem
+ SSLCertificateKeyFile /var/local/certificates/dmarc.lunch.org.uk/privkey.pem
+
+
+
+
+
+ ServerName dmarc.lunch.org.uk
+
+ ErrorLog /var/log/apache2/dmarc-error.log
+ CustomLog /var/log/apache2/dmarc-access.log combined
+
+ RemoteIPProxyProtocol On
+
+
+ #
+ # This redirects all accesses to the HTTPS version of the site.
+ #
+ RewriteEngine On
+
+ RewriteRule ^/?(.*) https://dmarc.lunch.org.uk/$1 [R=301,L]
+
+
diff --git a/states/dmarc_reports/init.sls b/states/dmarc_reports/init.sls
index 8ab2654..86bcec3 100644
--- a/states/dmarc_reports/init.sls
+++ b/states/dmarc_reports/init.sls
@@ -56,3 +56,22 @@ dmarcts-report-viewer-config:
- name: /srv/dmarcts-report-viewer/dmarcts-report-viewer-config.php
- source: salt://dmarc_reports/dmarcts-report-viewer-config.php
- template: jinja
+
+dmarc-report-viewer-web:
+ file.managed:
+ - require:
+ - sls: apache
+ - sls: certificates
+ - sls: php_fpm
+ - names:
+ - /etc/apache2/sites-available/dmarc.lunch.org.uk.conf:
+ - source: salt://dmarc_reports/dmarc.lunch.org.uk.conf
+ apache_site.enabled:
+ - require:
+ - file: /etc/apache2/sites-available/dmarc.lunch.org.uk.conf
+ - name: dmarc.lunch.org.uk
+ service.running:
+ - name: apache2
+ - reload: true
+ - watch:
+ - file: /etc/apache2/sites-available/dmarc.lunch.org.uk.conf
diff --git a/states/gpodder/init.sls b/states/gpodder/init.sls
index f7d13d3..4f56737 100644
--- a/states/gpodder/init.sls
+++ b/states/gpodder/init.sls
@@ -16,6 +16,7 @@ gpodder_web:
- require:
- sls: apache
- sls: certificates/client
+ - sls: php_fpm
- names:
- /etc/apache2/sites-available/gpodder.lunch.org.uk.conf:
- source: salt://gpodder/gpodder.lunch.org.uk.conf
diff --git a/states/top.sls b/states/top.sls
index d1e8b88..c68598c 100644
--- a/states/top.sls
+++ b/states/top.sls
@@ -23,6 +23,7 @@ base:
- swapfile
- certificates
- apache
+ - php_fpm
- backup
- backup/scabbers
- dottes_website