From b77062f595ff3eacce02ed329794359f3284d3ed Mon Sep 17 00:00:00 2001
From: Gary Larizza <gary@puppetlabs.com>
Date: Fri, 15 Jul 2011 15:26:35 -0700
Subject: [PATCH] Commit Templates
---
templates/vhost-default.conf.erb | 13 +++++++------
templates/vhost-proxy.conf.erb | 28 ++++++++++++++++++++++++++++
templates/vhost-redirect.conf.erb | 11 +++++++++++
3 files changed, 46 insertions(+), 6 deletions(-)
create mode 100644 templates/vhost-proxy.conf.erb
create mode 100644 templates/vhost-redirect.conf.erb
diff --git a/templates/vhost-default.conf.erb b/templates/vhost-default.conf.erb
index 3c0f349..4820bd6 100644
--- a/templates/vhost-default.conf.erb
+++ b/templates/vhost-default.conf.erb
@@ -3,17 +3,17 @@
# Managed by Puppet
# ************************************
-NameVirtualHost *:<%= port %>
-<VirtualHost *:<%= port %>>
- ServerName <%= name %>
-<%if serveraliases.is_a? Array -%>
+NameVirtualHost <%= vhost_name %>:<%= port %>
+<VirtualHost <%= vhost_name %>:<%= port %>>
+ ServerName <%= srvname %>
+<% if serveraliases.is_a? Array -%>
<% serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%>
<% elsif serveraliases != '' -%>
<%= " ServerAlias #{serveraliases}" -%>
<% end -%>
DocumentRoot <%= docroot %>
<Directory <%= docroot %>>
- Options Indexes FollowSymLinks MultiViews
+ Options <%= options %>
AllowOverride None
Order allow,deny
allow from all
@@ -21,5 +21,6 @@ NameVirtualHost *:<%= port %>
ErrorLog /var/log/apache2/<%= name %>_error.log
LogLevel warn
CustomLog /var/log/apache2/<%= name %>_access.log combined
- ServerSignature On
+ ServerSignature Off
</VirtualHost>
+
diff --git a/templates/vhost-proxy.conf.erb b/templates/vhost-proxy.conf.erb
new file mode 100644
index 0000000..d8be904
--- /dev/null
+++ b/templates/vhost-proxy.conf.erb
@@ -0,0 +1,28 @@
+NameVirtualHost <%= vhost_name %>:<%= port %>
+<VirtualHost <%= vhost_name %>:<%= port %>>
+ <% if ssl == true %>
+ SSLEngine on
+ SSLCertificateFile <%= ssl_path %>/certs/pl.cert
+ SSLCertificateKeyFile <%= ssl_path %>/private/pl.key
+ <% end %>
+ ServerName <%= srvname %>
+<% if serveraliases.is_a? Array %>
+<% serveraliases.each do |name| %><%= " ServerAlias #{name}\n" %><% end %>
+<% elsif serveraliases != '' %>
+<%= " ServerAlias #{serveraliases}" %>
+<% end %>
+ ProxyRequests Off
+ <Proxy *>
+ Order deny,allow
+ Allow from all
+ </Proxy>
+ ProxyPass / <%= dest %>/
+ ProxyPassReverse / <%= dest %>/
+ ProxyPreserveHost On
+
+ ErrorLog /var/log/apache2/<%= name %>_error.log
+ LogLevel warn
+ CustomLog /var/log/apache2/<%= name %>_access.log combined
+
+</VirtualHost>
+
diff --git a/templates/vhost-redirect.conf.erb b/templates/vhost-redirect.conf.erb
new file mode 100644
index 0000000..240f924
--- /dev/null
+++ b/templates/vhost-redirect.conf.erb
@@ -0,0 +1,11 @@
+NameVirtualHost <%= vhost_name %>:<%= port %>
+<VirtualHost <%= vhost_name %>:<%= port %>>
+ ServerName <%= srvname %>
+<% if serveraliases.is_a? Array %>
+<% serveraliases.each do |name| %><%= " ServerAlias #{name}\n" %><% end %>
+<% elsif serveraliases != '' %>
+<%= " ServerAlias #{serveraliases}" %>
+<% end %>
+ Redirect / <%= dest %>/
+</VirtualHost>
+