Remove old forum code. Add cert to discourse

[chef.git] / cookbooks / forum / templates / default / apache.erb

diff --git a/cookbooks/forum/templates/default/apache.erb b/cookbooks/forum/templates/default/apache.erb
deleted file mode 100644 (file)
index 5235ee1..0000000
--- a/cookbooks/forum/templates/default/apache.erb
+++ /dev/null
@@ -1,60 +0,0 @@
-# DO NOT EDIT - This file is being maintained by Chef
-
-<VirtualHost *:80>
-       ServerName forum.openstreetmap.org
-       ServerAlias forum.osm.org
-       ServerAdmin webmaster@openstreetmap.org
-
-       CustomLog /var/log/apache2/forum.openstreetmap.org-access.log combined
-       ErrorLog /var/log/apache2/forum.openstreetmap.org-error.log
-
-       RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
-       RedirectPermanent / https://forum.openstreetmap.org/
-</VirtualHost>
-
-<VirtualHost *:443>
-       ServerAlias forum.osm.org
-       ServerAdmin webmaster@openstreetmap.org
-
-       SSLEngine on
-       SSLCertificateFile /etc/ssl/certs/forum.openstreetmap.org.pem
-       SSLCertificateKeyFile /etc/ssl/private/forum.openstreetmap.org.key
-
-       CustomLog /var/log/apache2/forum.openstreetmap.org-access.log combined
-       ErrorLog /var/log/apache2/forum.openstreetmap.org-error.log
-
-       RedirectPermanent / https://forum.openstreetmap.org/
-</VirtualHost>
-
-<VirtualHost *:443>
-       ServerName forum.openstreetmap.org
-       ServerAdmin webmaster@openstreetmap.org
-
-       SSLEngine on
-       SSLCertificateFile /etc/ssl/certs/forum.openstreetmap.org.pem
-       SSLCertificateKeyFile /etc/ssl/private/forum.openstreetmap.org.key
-
-       CustomLog /var/log/apache2/forum.openstreetmap.org-access.log combined
-       ErrorLog /var/log/apache2/forum.openstreetmap.org-error.log
-
-       DocumentRoot /srv/forum.openstreetmap.org/html
-
-       <FilesMatch ".+\.ph(ar|p|tml)$">
-               SetHandler "proxy:unix:/run/php/php-forum.openstreetmap.org-fpm.sock|fcgi://127.0.0.1"
-       </FilesMatch>
-</VirtualHost>
-
-<Directory /srv/forum.openstreetmap.org/html>
-       RewriteEngine on
-       RewriteRule ^config\.php$ - [F,L]
-
-       Options -Indexes
-
-       Require all granted
-</Directory>
-
-<Directory /srv/forum.openstreetmap.org/html/img>
-       <FilesMatch ".+\.ph(ar|p|tml)$">
-               SetHandler None
-       </FilesMatch>
-</Directory>