X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a449993c2f97f5bfa7c66e8bc1e453946fe25bc7..5bb7bf7aa78aa8bc9876f3ec3502572f4b6809d3:/cookbooks/otrs/templates/default/apache.erb?ds=sidebyside diff --git a/cookbooks/otrs/templates/default/apache.erb b/cookbooks/otrs/templates/default/apache.erb index e392d8765..a3605a966 100644 --- 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 - 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/ +<% unless @aliases.empty? -%> - 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 - - - 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 - - - - PerlOptions -ParseHeaders - + 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 %>/ + +<% end -%> + + + 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 + + + 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 + + + + PerlOptions -ParseHeaders + - AllowOverride None - Options +ExecCGI -Includes - Require all granted + AllowOverride None + Options +ExecCGI -Includes + Require all granted - AllowOverride None - Require all granted + AllowOverride None + Require all granted - - Header set Cache-Control "max-age=2592000 must-revalidate" - + + Header set Cache-Control "max-age=2592000 must-revalidate" + - - Header set Cache-Control "max-age=2592000 must-revalidate" - + + Header set Cache-Control "max-age=2592000 must-revalidate" +