X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/bfb306c6b8c5bb198a30635e6e26b3083bac7733..d4db5c7d063bb8bbb891f057d9a775ebf3390eaa:/cookbooks/cgiirc/templates/default/apache.erb
diff --git a/cookbooks/cgiirc/templates/default/apache.erb b/cookbooks/cgiirc/templates/default/apache.erb
index 21e673308..1afb107ba 100644
--- a/cookbooks/cgiirc/templates/default/apache.erb
+++ b/cookbooks/cgiirc/templates/default/apache.erb
@@ -1,56 +1,56 @@
# DO NOT EDIT - This file is being maintained by Chef
- ServerName <%= @name %>
- ServerAdmin webmaster@openstreetmap.org
+ ServerName <%= @name %>
+ ServerAdmin webmaster@openstreetmap.org
- SSLEngine on
- SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
- SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key
+ 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
+ CustomLog /var/log/apache2/<%= @name %>-access.log combined
+ ErrorLog /var/log/apache2/<%= @name %>-error.log
- DocumentRoot /usr/lib/cgi-bin/cgiirc
- DirectoryIndex irc.cgi
- Alias /images /usr/share/images/cgiirc
+ DocumentRoot /usr/lib/cgi-bin/cgiirc
+ DirectoryIndex irc.cgi
+ Alias /images /usr/share/images/cgiirc
-
- AddHandler cgi-script .cgi
- Require all granted
-
+
+ AddHandler cgi-script .cgi
+ Require all granted
+
-
- Require all granted
-
+
+ Require all granted
+
-
- RemoveOutputFilter DEFLATE
- SetEnv no-gzip
-
+
+ RemoveOutputFilter DEFLATE
+ SetEnv no-gzip
+
<% unless @aliases.empty? -%>
- ServerName <%= @aliases.first %>
+ ServerName <%= @aliases.first %>
<% @aliases.drop(1).each do |alias_name| -%>
- ServerAlias <%= alias_name %>
+ ServerAlias <%= alias_name %>
<% end -%>
- ServerAdmin webmaster@openstreetmap.org
+ ServerAdmin webmaster@openstreetmap.org
- SSLEngine on
- SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
- SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key
+ 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
+ CustomLog /var/log/apache2/<%= @name %>-access.log combined
+ ErrorLog /var/log/apache2/<%= @name %>-error.log
- RedirectPermanent / https://<%= @name %>/
+ RedirectPermanent / https://<%= @name %>/
<% end -%>
- ServerName <%= @name %>
+ ServerName <%= @name %>
<% @aliases.each do |alias_name| -%>
ServerAlias <%= alias_name %>
<% end -%>