diff --git a/jira/templates/default/apache.conf.erb b/jira/templates/default/apache.conf.erb index f8f9d244b..1f472f482 100644 --- a/jira/templates/default/apache.conf.erb +++ b/jira/templates/default/apache.conf.erb @@ -10,24 +10,7 @@ ServerAlias <%= va %> <% end -%> <% end -%> - RewriteEngine On - RewriteCond %{HTTPS} !=on - RewriteRule ^/(.*) https://%{SERVER_NAME}/$1 [R,L] - - - DocumentRoot <%= @node[:jira][:install_path] %> - ServerAdmin ops@<%= @node[:domain] %> - <% if @node[:jira][:virtual_host_name] -%> - ServerName <%= @node[:jira][:virtual_host_name] %> - <% end -%> - <% if @node[:jira][:virtual_host_alias] -%> - <% va_list = @node[:jira][:virtual_host_alias].kind_of?(Array) ? @node[:jira][:virtual_host_alias] : [ @node[:jira][:virtual_host_alias] ] -%> - <% va_list.each do |va| -%> - ServerAlias <%= va %> - <% end -%> - <% end -%> - ErrorLog <%= @node[:apache][:log_dir] %>/jira-error.log TransferLog <%= @node[:apache][:log_dir] %>/jira-access.log RewriteEngine On @@ -41,10 +24,9 @@ ProxyRequests Off ProxyPreserveHost On - - RewriteRule ^/server-status$ /server-status$1 [L] + + RewriteEngine On RewriteRule ^/(.*)$ http://127.0.0.1:8080/$1 [P,QSA,L] ProxyPassReverse / http://127.0.0.1:8080 -