tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

apache: Combined proxy.http.conf.erb to site.http.conf.erb.

Browse source
This commit is contained in:
Timo Mkinen 2013-09-24 11:21:29 +03:00
parent 165ec9cbe4
commit 6cebef3715
4 changed files with 38 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

10
apache/templates/proxy.http.conf.erb
View file

@ -1,10 +0,0 @@
<VirtualHost *:80>
ServerName <%= @site_fqdn %>
<% if @aliases != "" -%>
ServerAlias <%= @aliases %>
<% end -%>
ErrorLog /srv/www/log/http/<%= @site_fqdn %>/error_log
CustomLog /srv/www/log/http/<%= @site_fqdn %>/access_log combined
ProxyPass / <%= @proxy %>/
ProxyPassReverse / <%= @proxy %>/
</VirtualHost>

5
apache/templates/site.http.conf.erb
View file

@ -5,6 +5,11 @@
<% end -%>
ErrorLog /srv/www/log/http/<%= @site_fqdn %>/error_log
CustomLog /srv/www/log/http/<%= @site_fqdn %>/access_log combined
<% if @proxy != "" -%>
ProxyPass / <%= @proxy %>/
ProxyPassReverse / <%= @proxy %>/
<% else -%>
DocumentRoot /srv/www/http/<%= @site_fqdn %>
Include <%= @site_confdir %>/*.conf
<% end -%>
</VirtualHost>