imagery: za fix NGI url

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

diff --git a/cookbooks/otrs/templates/default/apache.erb b/cookbooks/otrs/templates/default/apache.erb
index e392d87652d6346a23175dc26dbf0e732b2c7605..a3605a966d968e2509189b7d4222c995ecedd79b 100644 (file)
--- a/cookbooks/otrs/templates/default/apache.erb
+++ b/cookbooks/otrs/templates/default/apache.erb
@@ -1,72 +1,94 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 <VirtualHost *:80>
 # DO NOT EDIT - This file is being maintained by Chef
 
 <VirtualHost *:80>

-        ServerName <%= @name %>
-        ServerAdmin webmaster@openstreetmap.org
+  ServerName <%= @name %>
+<% @aliases.each do |alias_name| -%>
+  ServerAlias <%= alias_name %>
+<% end -%>
+  ServerAdmin webmaster@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_extended
+  ErrorLog /var/log/apache2/<%= @name %>-error.log

 
 

-        RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
-        RedirectPermanent / https://otrs.openstreetmap.org/
+  RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
+  RedirectPermanent / https://otrs.openstreetmap.org/

 </VirtualHost>
 </VirtualHost>

+<% unless @aliases.empty? -%>

 
 <VirtualHost *:443>
 
 <VirtualHost *:443>

-        ServerName <%= @name %>
-        ServerAdmin webmaster@openstreetmap.org
-
-        CustomLog /var/log/apache2/<%= @name %>-access.log combined
-        ErrorLog /var/log/apache2/<%= @name %>-error.log
-
-        SSLEngine on
-        SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
-        SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key
-
-        ScriptAlias /otrs/ /opt/otrs/bin/cgi-bin/
-        Alias /otrs-web/ /opt/otrs/var/httpd/htdocs/
-        RedirectMatch ^/$ /otrs/index.pl
-
-        PerlRequire /opt/otrs/scripts/apache2-perl-startup.pl
-
-        PerlModule Apache2::Reload
-        PerlInitHandler Apache2::Reload
-        PerlModule Apache2::RequestRec
-
-        <Location /otrs>
-                ErrorDocument 403 /otrs/index.pl
-                ErrorDocument 404 /otrs/index.pl
-                SetHandler  perl-script
-                PerlResponseHandler ModPerl::Registry
-                Options +ExecCGI
-                PerlOptions +ParseHeaders
-                PerlOptions +SetupEnv
-                Require all granted
-        </Location>
-
-        <Location /otrs/nph-genericinterface.pl>
-                PerlOptions -ParseHeaders
-        </Location>
+  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_extended
+  ErrorLog /var/log/apache2/<%= @name %>-error.log
+
+  RedirectPermanent / https://<%= @name %>/
+</VirtualHost>
+<% end -%>
+
+<VirtualHost *:443>
+  ServerName <%= @name %>
+  ServerAdmin webmaster@openstreetmap.org
+
+  CustomLog /var/log/apache2/<%= @name %>-access.log combined_extended
+  ErrorLog /var/log/apache2/<%= @name %>-error.log
+
+  SSLEngine on
+  SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
+  SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key
+
+  ScriptAlias /otrs/ /opt/otrs/bin/cgi-bin/
+  Alias /otrs-web/ /opt/otrs/var/httpd/htdocs/
+  RedirectMatch ^/$ /otrs/index.pl
+
+  PerlRequire /opt/otrs/scripts/apache2-perl-startup.pl
+
+  PerlModule Apache2::Reload
+  PerlInitHandler Apache2::Reload
+  PerlModule Apache2::RequestRec
+
+  <Location /otrs>
+    ErrorDocument 403 /otrs/index.pl
+    ErrorDocument 404 /otrs/index.pl
+    SetHandler  perl-script
+    PerlResponseHandler ModPerl::Registry
+    Options +ExecCGI
+    PerlOptions +ParseHeaders
+    PerlOptions +SetupEnv
+    Require all granted
+  </Location>
+
+  <Location /otrs/nph-genericinterface.pl>
+    PerlOptions -ParseHeaders
+  </Location>

 </VirtualHost>
 
 <Directory /opt/otrs/bin/cgi-bin>
 </VirtualHost>
 
 <Directory /opt/otrs/bin/cgi-bin>

-        AllowOverride None
-        Options +ExecCGI -Includes
-        Require all granted
+  AllowOverride None
+  Options +ExecCGI -Includes
+  Require all granted

 </Directory>
 
 <Directory /opt/otrs/var/httpd/htdocs>
 </Directory>
 
 <Directory /opt/otrs/var/httpd/htdocs>

-        AllowOverride None
-        Require all granted
+  AllowOverride None
+  Require all granted

 </Directory>
 
 <Directory /opt/otrs/var/httpd/htdocs/skins/*/*/css-cache>
 </Directory>
 
 <Directory /opt/otrs/var/httpd/htdocs/skins/*/*/css-cache>

-        <FilesMatch "\.(css|CSS)$">
-                Header set Cache-Control "max-age=2592000 must-revalidate"
-        </FilesMatch>
+  <FilesMatch "\.(css|CSS)$">
+    Header set Cache-Control "max-age=2592000 must-revalidate"
+  </FilesMatch>

 </Directory>
 
 <Directory /opt/otrs/var/httpd/htdocs/js/js-cache>
 </Directory>
 
 <Directory /opt/otrs/var/httpd/htdocs/js/js-cache>

-        <FilesMatch "\.(js|JS)$">
-                Header set Cache-Control "max-age=2592000 must-revalidate"
-        </FilesMatch>
+  <FilesMatch "\.(js|JS)$">
+    Header set Cache-Control "max-age=2592000 must-revalidate"
+  </FilesMatch>

 </Directory>
 </Directory>