X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3922c25396b0aa995547e6caa3dc6f8b7e993f95..4848413b102b4643b0dbec409f0a45dd83cfc07f:/cookbooks/mailman/templates/default/apache.erb
diff --git a/cookbooks/mailman/templates/default/apache.erb b/cookbooks/mailman/templates/default/apache.erb
index 6b12ce994..d2c0aab91 100644
--- a/cookbooks/mailman/templates/default/apache.erb
+++ b/cookbooks/mailman/templates/default/apache.erb
@@ -1,59 +1,88 @@
# DO NOT EDIT - This file is being maintained by Chef
- ServerName <%= @name %>
- ServerAdmin postmaster@openstreetmap.org
+ ServerName <%= @name %>
+<% @aliases.each do |alias_name| -%>
+ ServerAlias <%= alias_name %>
+<% end -%>
+ ServerAdmin postmaster@openstreetmap.org
- CustomLog /var/log/apache2/<%= @name %>-access.log combined
- ErrorLog /var/log/apache2/<%= @name %>-error.log
+ CustomLog /var/log/apache2/<%= @name %>-access.log combined
+ ErrorLog /var/log/apache2/<%= @name %>-error.log
- RedirectPermanent / https://<%= @name %>/
+ RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
+ RedirectPermanent / https://<%= @name %>/
+<% unless @aliases.empty? -%>
- ServerName <%= @name %>
- ServerAdmin postmaster@openstreetmap.org
- ServerSignature On
-
- CustomLog /var/log/apache2/<%= @name %>-access.log combined
- ErrorLog /var/log/apache2/<%= @name %>-error.log
- LogLevel warn
-
- AddDefaultCharset off
-
- DocumentRoot <%= @directory %>
-
- RewriteEngine on
-
- RewriteCond %{HTTP_REFERER} www\.mailbait\.info
- RewriteRule . - [F,L]
-
- RedirectMatch ^/$ /listinfo
- RedirectMatch ^/cgi-bin/mailman/(.*)$ /$1
-
-
- Options Indexes FollowSymLinks
- AllowOverride None
-
-
- Alias /pipermail/ /var/lib/mailman/archives/public/
- Alias /images/ /usr/share/images/mailman/
-
- ScriptAlias /admin /usr/lib/cgi-bin/mailman/admin
- ScriptAlias /admindb /usr/lib/cgi-bin/mailman/admindb
- ScriptAlias /confirm /usr/lib/cgi-bin/mailman/confirm
- ScriptAlias /create /usr/lib/cgi-bin/mailman/create
- ScriptAlias /edithtml /usr/lib/cgi-bin/mailman/edithtml
- ScriptAlias /listinfo /usr/lib/cgi-bin/mailman/listinfo
- ScriptAlias /options /usr/lib/cgi-bin/mailman/options
- ScriptAlias /private /usr/lib/cgi-bin/mailman/private
- ScriptAlias /rmlist /usr/lib/cgi-bin/mailman/rmlist
- ScriptAlias /roster /usr/lib/cgi-bin/mailman/roster
- ScriptAlias /subscribe /usr/lib/cgi-bin/mailman/subscribe
- ScriptAlias /mailman/ /usr/lib/cgi-bin/mailman/
-
-
- ExpiresActive On
- ExpiresDefault "access plus 180 days"
-
+ ServerName <%= @aliases.first %>
+<% @aliases.drop(1).each do |alias_name| -%>
+ ServerAlias <%= alias_name %>
+<% end -%>
+ ServerAdmin webmaster@openstreetmap.org
+
+ SSLEngine on
+ SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
+ SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key
+
+ CustomLog /var/log/apache2/<%= @name %>-access.log combined
+ ErrorLog /var/log/apache2/<%= @name %>-error.log
+
+ RedirectPermanent / https://<%= @name %>/
+
+<% end -%>
+
+
+ ServerName <%= @name %>
+ ServerAdmin postmaster@openstreetmap.org
+ ServerSignature On
+
+ SSLEngine on
+ SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
+ SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key
+
+ CustomLog /var/log/apache2/<%= @name %>-access.log combined
+ ErrorLog /var/log/apache2/<%= @name %>-error.log
+ LogLevel warn
+
+ AddDefaultCharset off
+
+ DocumentRoot <%= @directory %>
+
+ RewriteEngine on
+
+ RewriteCond %{HTTP_REFERER} www\.mailbait\.info
+ RewriteRule . - [F,L]
+
+ RedirectMatch ^/$ /listinfo
+ RedirectMatch ^/cgi-bin/mailman/(.*)$ /$1
+
+
+ Options Indexes FollowSymLinks
+ AllowOverride None
+ Require all granted
+
+
+ Alias /pipermail/ /var/lib/mailman/archives/public/
+ Alias /images/mailman/ /usr/share/images/mailman/
+ Alias /images/ /usr/share/images/mailman/
+
+ ScriptAlias /admin /usr/lib/cgi-bin/mailman/admin
+ ScriptAlias /admindb /usr/lib/cgi-bin/mailman/admindb
+ ScriptAlias /confirm /usr/lib/cgi-bin/mailman/confirm
+ ScriptAlias /create /usr/lib/cgi-bin/mailman/create
+ ScriptAlias /edithtml /usr/lib/cgi-bin/mailman/edithtml
+ ScriptAlias /listinfo /usr/lib/cgi-bin/mailman/listinfo
+ ScriptAlias /options /usr/lib/cgi-bin/mailman/options
+ ScriptAlias /private /usr/lib/cgi-bin/mailman/private
+ ScriptAlias /rmlist /usr/lib/cgi-bin/mailman/rmlist
+ ScriptAlias /roster /usr/lib/cgi-bin/mailman/roster
+ ScriptAlias /subscribe /usr/lib/cgi-bin/mailman/subscribe
+ ScriptAlias /mailman/ /usr/lib/cgi-bin/mailman/
+
+
+ ExpiresActive On
+ ExpiresDefault "access plus 180 days"
+