Add podman_site resource

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

diff --git a/cookbooks/trac/templates/default/apache.erb b/cookbooks/trac/templates/default/apache.erb
index d462cdd3639b146cbd0fefbc35ce3f8480fcc767..55dc39c18b1f37a6cb9448932af0b2bf18bc13ec 100644 (file)
--- a/cookbooks/trac/templates/default/apache.erb
+++ b/cookbooks/trac/templates/default/apache.erb
@@ -1,7 +1,5 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
-WSGIDaemonProcess <%= @name %> user=<%= @user %> group=<%= @group %> processes=4 threads=8 restart-interval=3600 inactivity-timeout=180 graceful-timeout=60 maximum-requests=2000
-
 <VirtualHost *:80>
   ServerName <%= @name %>
 <% @aliases.each do |alias_name| -%>
@@ -24,13 +22,13 @@ WSGIDaemonProcess <%= @name %> user=<%= @user %> group=<%= @group %> processes=4
 <% end -%>
   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
 
-  CustomLog /var/log/apache2/<%= @name %>-access.log combined
-  ErrorLog /var/log/apache2/<%= @name %>-error.log
-
   RedirectPermanent / https://<%= @name %>/
 </VirtualHost>
 <% end -%>
@@ -39,37 +37,16 @@ WSGIDaemonProcess <%= @name %> user=<%= @user %> group=<%= @group %> processes=4
   ServerName <%= @name %>
   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
 
-  DocumentRoot <%= @directory %>/htdocs
-  Alias /robots.txt <%= @directory %>/htdocs/site/robots.txt
-  WSGIScriptAlias / <%= @directory %>/cgi-bin/trac.wsgi
-
-  WSGIProcessGroup <%= @name %>
-
-  DefineExternalAuth osm pipe /usr/local/bin/trac-authenticate
+  SSLEngine on
+  SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
+  SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key
 
-  # Disable /timeline for now
-  RedirectMatch 410 ^/timeline(.*)$
+  RequestHeader set X-Forwarded-Proto "https"
+  RequestHeader set X-Forwarded-Port "443"
 
-  <Location /login>
-    AuthType Basic
-    AuthName "OpenStreetMap Trac"
-    AuthBasicProvider external
-    AuthExternal osm
-    Require valid-user
-  </Location>
+  ProxyPass / http://localhost:<%= @docker_external_port %>/
+  ProxyPreserveHost on
 </VirtualHost>
-
-<Directory <%= @directory %>/htdocs>
-  Require all granted
-</Directory>
-
-<Directory <%= @directory %>/cgi-bin>
-  Require all granted
-</Directory>