migrating a first part over to the new partial style

19 files changed, 39 insertions, 244 deletions

diff --git a/manifests/vhost/gitweb.pp b/manifests/vhost/gitweb.pp
index 2bc15d0..3ac8243 100644
--- a/manifests/vhost/gitweb.pp
+++ b/manifests/vhost/gitweb.pp
@@ -37,7 +37,7 @@ define apache::vhost::gitweb(
             default => '/var/log/apache2'
         },
         logmode => $logmode,
-        template_mode => 'gitweb',
+        template_partial => 'apache/vhosts/gitweb/partial.erb',
         domain => $domain,
         domainalias => $domainalias,
         server_admin => $server_admin,
diff --git a/manifests/vhost/passenger.pp b/manifests/vhost/passenger.pp
index de3b162..5526125 100644
--- a/manifests/vhost/passenger.pp
+++ b/manifests/vhost/passenger.pp
@@ -21,7 +21,6 @@ define apache::vhost::passenger(
     $path = 'absent',
     $manage_webdir = true,
     $manage_docroot = true,
-    $template_mode = 'passenger',
     $owner = root,
     $group = apache,
     $documentroot_owner = apache,
@@ -107,7 +106,6 @@ define apache::vhost::passenger(
         ensure => $ensure,
         path => "${real_path}/www/public",
         path_is_webdir => true,
-        template_mode => $template_mode,
         template_partial => 'apache/vhosts/passenger/partial.erb',
         logmode => $logmode,
         logpath => "${real_path}/logs",
diff --git a/manifests/vhost/proxy.pp b/manifests/vhost/proxy.pp
index 5783b1f..113f4ef 100644
--- a/manifests/vhost/proxy.pp
+++ b/manifests/vhost/proxy.pp
@@ -38,7 +38,7 @@ define apache::vhost::proxy(
     # we use the options field as the target_url
     ::apache::vhost::template{$name:
         ensure => $ensure,
-        template_mode => 'proxy',
+        template_partial => 'apache/vhosts/proxy/partial.erb',
         domain => $domain,
         path => 'really_absent',
         path_is_webdir => true,
diff --git a/manifests/vhost/redirect.pp b/manifests/vhost/redirect.pp
index 9384fc0..3297279 100644
--- a/manifests/vhost/redirect.pp
+++ b/manifests/vhost/redirect.pp
@@ -32,7 +32,7 @@ define apache::vhost::redirect(
     # we use the options field as the target_url
     ::apache::vhost::template{$name:
         ensure => $ensure,
-        template_mode => 'redirect',
+        template_partial => 'apache/vhost/redirect/partial.erb',
         domain => $domain,
         path => 'really_absent',
         path_is_webdir => true,
diff --git a/manifests/vhost/static.pp b/manifests/vhost/static.pp
index 76e2bee..cd5ac77 100644
--- a/manifests/vhost/static.pp
+++ b/manifests/vhost/static.pp
@@ -57,7 +57,7 @@ define apache::vhost::static(
     ::apache::vhost{$name:
         ensure => $ensure,
         path => $path,
-        template_mode => 'static',
+        template_partial => 'apache/vhosts/static/partial.erb',
         vhost_mode => $vhost_mode,
         vhost_source => $vhost_source,
         vhost_destination => $vhost_destination,
diff --git a/templates/vhosts/gitweb/gitweb.erb b/templates/vhosts/gitweb/gitweb.erb
deleted file mode 100644
index 570c42b..0000000
--- a/templates/vhosts/gitweb/gitweb.erb
+++ /dev/null
@@ -1,83 +0,0 @@
-# <%= servername %>
-<%- unless ssl_mode.to_s == 'only'  then -%>
-<VirtualHost *:80>
-<%  scope.unsetvar('vhost_part')
-  scope.setvar('vhost_part',:normal) -%> 
-  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
-<%  scope.unsetvar('vhost_part') -%>
-
-
-<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
-    <%- if ssl_mode.to_s == 'force' then -%>
-    RewriteEngine On
-    RewriteCond %{HTTPS} !=on
-    RewriteRule (.*) https://%{SERVER_NAME}$1 [R=permanent,L]
-
-    <%- end -%>
-
-    SetEnv GITWEB_CONFIG <%= gitweb_config %>
-    DirectoryIndex gitweb.cgi
-    <%- if not ssl_mode.to_s == 'force' then -%>
-    <Directory "<%= documentroot %>/">
-        <%- if options.to_s != 'absent' or do_includes.to_s == 'true' then -%>
-        Options <%- unless options.to_s == 'absent' then -%><%= options %><%- end -%><%- if do_includes.to_s == 'true' and not options.include?('+Includes') then -%> +Includes<%- end -%><%- unless options.include?('+ExecCGI') then -%> +ExecCGI<%- end -%>
-        <%- end -%>
-
-        AddHandler cgi-script .cgi
-        <Files gitweb.cgi>
-              Options ExecCGI FollowSymLinks
-              SetHandler cgi-script
-        </Files>
-        RewriteEngine on
-        RewriteRule ^[a-zA-Z0-9_-]+.git/?(\?.)?$ /gitweb.cgi%{REQUESTURI} [L,PT]
-
-<%= scope.function_template('apache/vhosts/partials/authentication.erb') %>
-    </Directory>
-
-    <%- end -%>
-
-<%= scope.function_template('apache/vhosts/partials/mod_security.erb') %>
-
-    <%- unless additional_options.to_s == 'absent' then -%>
-    <%= additional_options %>
-    <%- end -%>
-</VirtualHost>
-<%- end -%>
-
-<%- unless ssl_mode.to_s == 'false'  then -%>
-<VirtualHost *:443>
-<%  scope.unsetvar('vhost_part')
-  scope.setvar('vhost_part',:ssl) -%> 
-	<%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
-<%  scope.unsetvar('vhost_part') -%>
-
-<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
-
-    SetEnv GITWEB_CONFIG <%= gitweb_config %>
-    DirectoryIndex gitweb.cgi
-    <%- if not ssl_mode.to_s == 'force' then -%>
-    <Directory "<%= documentroot %>/">
-        <%- if options.to_s != 'absent' or do_includes.to_s == 'true' then -%>
-        Options <%- unless options.to_s == 'absent' then -%><%= options %><%- end -%><%- if do_includes.to_s == 'true' and not options.include?('+Includes') then -%> +Includes<%- end -%><%- unless options.include?('+ExecCGI') then -%> +ExecCGI<%- end -%>
-        <%- end -%>
-
-        AddHandler cgi-script .cgi
-        <Files gitweb.cgi>
-              Options ExecCGI FollowSymLinks
-              SetHandler cgi-script
-        </Files>
-        RewriteEngine on
-        RewriteRule ^[a-zA-Z0-9_-]+.git/?(\?.)?$ /gitweb.cgi%{REQUESTURI} [L,PT]
-
-<%= scope.function_template('apache/vhosts/partials/authentication.erb') %>
-    </Directory>
-
-    <%- end %>
-
-<%= scope.function_template('apache/vhosts/partials/mod_security.erb') %>
-
-    <%- unless additional_options.to_s == 'absent' then -%>
-    <%= additional_options %>
-    <%- end -%>
-</VirtualHost>
-<%- end -%>
diff --git a/templates/vhosts/gitweb/partial.erb b/templates/vhosts/gitweb/partial.erb
new file mode 100644
index 0000000..593aaff
--- /dev/null
+++ b/templates/vhosts/gitweb/partial.erb
@@ -0,0 +1,18 @@
+    SetEnv GITWEB_CONFIG <%= gitweb_config %>
+    DirectoryIndex gitweb.cgi
+    <%- if not ssl_mode.to_s == 'force' then -%>
+    <Directory "<%= documentroot %>/">
+        <%- if options.to_s != 'absent' or do_includes.to_s == 'true' then -%>
+        Options <%- unless options.to_s == 'absent' then -%><%= options %><%- end -%><%- if do_includes.to_s == 'true' and not options.include?('+Includes') then -%> +Includes<%- end -%><%- unless options.include?('+ExecCGI') then -%> +ExecCGI<%- end -%>
+        <%- end -%>
+
+        AddHandler cgi-script .cgi
+        <Files gitweb.cgi>
+              Options ExecCGI FollowSymLinks
+              SetHandler cgi-script
+        </Files>
+        RewriteEngine on
+        RewriteRule ^[a-zA-Z0-9_-]+.git/?(\?.)?$ /gitweb.cgi%{REQUESTURI} [L,PT]
+
+<%= scope.function_template('apache/vhosts/partials/authentication.erb') %>
+    </Directory>
\ No newline at end of file
diff --git a/templates/vhosts/proxy/CentOS.erb b/templates/vhosts/proxy/CentOS.erb
deleted file mode 120000
index 15a1b7c..0000000
--- a/templates/vhosts/proxy/CentOS.erb
+++ /dev/null
@@ -1 +0,0 @@
-proxy.erb
\ No newline at end of file
diff --git a/templates/vhosts/proxy/Debian.erb b/templates/vhosts/proxy/Debian.erb
deleted file mode 120000
index 15a1b7c..0000000
--- a/templates/vhosts/proxy/Debian.erb
+++ /dev/null
@@ -1 +0,0 @@
-proxy.erb
\ No newline at end of file
diff --git a/templates/vhosts/proxy/OpenBSD.erb b/templates/vhosts/proxy/OpenBSD.erb
deleted file mode 120000
index 15a1b7c..0000000
--- a/templates/vhosts/proxy/OpenBSD.erb
+++ /dev/null
@@ -1 +0,0 @@
-proxy.erb
\ No newline at end of file
diff --git a/templates/vhosts/proxy/partial.erb b/templates/vhosts/proxy/partial.erb
new file mode 100644
index 0000000..f0d4c9d
--- /dev/null
+++ b/templates/vhosts/proxy/partial.erb
@@ -0,0 +1,8 @@
+    <Proxy *>
+      Order deny,allow
+      Allow from all
+<%= scope.function_template('apache/vhosts/partials/authentication.erb') %>
+    </Proxy>
+    ProxyRequests Off
+    ProxyPass        /   <%= options %>/
+    ProxyPassReverse /   <%= options %>/
\ No newline at end of file
diff --git a/templates/vhosts/proxy/proxy.erb b/templates/vhosts/proxy/proxy.erb
deleted file mode 100644
index 622dd43..0000000
--- a/templates/vhosts/proxy/proxy.erb
+++ /dev/null
@@ -1,57 +0,0 @@
-# <%= servername %>
-<%- unless ssl_mode.to_s == 'only'  then -%>
-<VirtualHost *:80>
-<%  scope.unsetvar('vhost_part')
-  scope.setvar('vhost_part',:normal) -%> 
-  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
-<%  scope.unsetvar('vhost_part') -%>
-
-<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
-    <%- if ssl_mode.to_s == 'force' then -%>
-    RewriteEngine On
-    RewriteCond %{HTTPS} !=on
-    RewriteRule (.*) https://%{SERVER_NAME}$1 [R=permanent,L]
-    <% else -%>
-    <Proxy *>
-      Order deny,allow
-      Allow from all
-<%= scope.function_template('apache/vhosts/partials/authentication.erb') %>
-    </Proxy>
-    ProxyRequests Off
-    ProxyPass        /   <%= options %>/
-    ProxyPassReverse /   <%= options %>/
-    <%- end -%>
-
-<%= scope.function_template('apache/vhosts/partials/mod_security.erb') %>
-
-    <%- unless additional_options.to_s == 'absent' then -%>
-    <%= additional_options %>
-    <%- end -%>
-</VirtualHost>
-<%- end -%>
-
-<%- unless ssl_mode.to_s == 'false'  then -%>
-<VirtualHost *:443>
-<%  scope.unsetvar('vhost_part')
-  scope.setvar('vhost_part',:ssl) -%> 
-  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
-<%  scope.unsetvar('vhost_part') -%>
-
-<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
-
-<%= scope.function_template('apache/vhosts/partials/mod_security.erb') %>
-
-    <Proxy *>
-      Order deny,allow
-      Allow from all
-<%= scope.function_template('apache/vhosts/partials/authentication.erb') %>
-    </Proxy>
-    ProxyRequests Off
-    ProxyPass        /   <%= options %>/
-    ProxyPassReverse /   <%= options %>/
-
-    <%- unless additional_options.to_s == 'absent' then -%>
-    <%= additional_options %>
-    <%- end -%>
-</VirtualHost>
-<%- end -%>
diff --git a/templates/vhosts/redirect/partial.erb b/templates/vhosts/redirect/partial.erb
new file mode 100644
index 0000000..bd012c8
--- /dev/null
+++ b/templates/vhosts/redirect/partial.erb
@@ -0,0 +1 @@
+    Redirect permanent / https://<%= options %>
\ No newline at end of file
diff --git a/templates/vhosts/redirect/redirect.erb b/templates/vhosts/redirect/redirect.erb
deleted file mode 100644
index 6fc6922..0000000
--- a/templates/vhosts/redirect/redirect.erb
+++ /dev/null
@@ -1,32 +0,0 @@
-# <%= servername %>
-<%- unless ssl_mode.to_s == 'only'  then -%>
-<VirtualHost *:80>
-<%  scope.unsetvar('vhost_part')
-  scope.setvar('vhost_part',:normal) -%> 
-  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
-<%  scope.unsetvar('vhost_part') -%>
-
-<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
-    <%- if ssl_mode.to_s == 'force' then -%>
-    RewriteEngine On
-    RewriteCond %{HTTPS} !=on
-    RewriteRule (.*) https://%{SERVER_NAME}$1 [R=permanent,L]
-    <% else -%>
-    Redirect permanent / http://<%= options %>
-    <%- end -%>
-</VirtualHost>
-<%- end -%>
-
-<%- unless ssl_mode.to_s == 'false'  then -%>
-<VirtualHost *:443>
-<%  scope.unsetvar('vhost_part')
-  scope.setvar('vhost_part',:ssl) -%> 
-  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
-<%  scope.unsetvar('vhost_part') -%>
-
-<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
-
-    Redirect permanent / https://<%= options %>
-
-</VirtualHost>
-<%- end -%>
diff --git a/templates/vhosts/static/CentOS.erb b/templates/vhosts/static/CentOS.erb
deleted file mode 120000
index f10517f..0000000
--- a/templates/vhosts/static/CentOS.erb
+++ /dev/null
@@ -1 +0,0 @@
-static.erb
\ No newline at end of file
diff --git a/templates/vhosts/static/Debian.erb b/templates/vhosts/static/Debian.erb
deleted file mode 120000
index f10517f..0000000
--- a/templates/vhosts/static/Debian.erb
+++ /dev/null
@@ -1 +0,0 @@
-static.erb
\ No newline at end of file
diff --git a/templates/vhosts/static/OpenBSD.erb b/templates/vhosts/static/OpenBSD.erb
deleted file mode 120000
index f10517f..0000000
--- a/templates/vhosts/static/OpenBSD.erb
+++ /dev/null
@@ -1 +0,0 @@
-static.erb
\ No newline at end of file
diff --git a/templates/vhosts/static/partial.erb b/templates/vhosts/static/partial.erb
new file mode 100644
index 0000000..03bd2f8
--- /dev/null
+++ b/templates/vhosts/static/partial.erb
@@ -0,0 +1,8 @@
+    <Directory "<%= documentroot %>/">
+        AllowOverride <%= allow_override %>
+        <%- if options.to_s != 'absent' or do_includes.to_s == 'true' then -%>
+        Options <%- unless options.to_s == 'absent' then -%><%= options %><%- end -%><%- if do_includes.to_s == 'true' and not options.include?('+Includes') then -%> +Includes<%- end -%>
+
+        <%- end -%>
+<%= scope.function_template('apache/vhosts/partials/authentication.erb') %>
+    </Directory>
\ No newline at end of file
diff --git a/templates/vhosts/static/static.erb b/templates/vhosts/static/static.erb
deleted file mode 100644
index e8e278b..0000000
--- a/templates/vhosts/static/static.erb
+++ /dev/null
@@ -1,60 +0,0 @@
-# <%= servername %>
-<%- unless ssl_mode.to_s == 'only'  then -%>
-<VirtualHost *:80>
-<%  scope.unsetvar('vhost_part')
-  scope.setvar('vhost_part',:normal) -%> 
-  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
-<%  scope.unsetvar('vhost_part') -%>
-
-<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
-    <%- if ssl_mode.to_s == 'force' then -%>
-    RewriteEngine On
-    RewriteCond %{HTTPS} !=on
-    RewriteRule (.*) https://%{SERVER_NAME}$1 [R=permanent,L]
-
-    <%- end -%>
-
-    <%- if not ssl_mode.to_s == 'force' then -%>
-    <Directory "<%= documentroot %>/">
-        AllowOverride <%= allow_override %>
-        <%- if options.to_s != 'absent' or do_includes.to_s == 'true' then -%>
-        Options <%- unless options.to_s == 'absent' then -%><%= options %><%- end -%><%- if do_includes.to_s == 'true' and not options.include?('+Includes') then -%> +Includes<%- end -%>
-
-        <%- end -%>
-<%= scope.function_template('apache/vhosts/partials/authentication.erb') %>
-    </Directory>
-    <%- end -%>
-
-<%= scope.function_template('apache/vhosts/partials/mod_security.erb') %>
-
-    <%- unless additional_options.to_s == 'absent' then -%>
-    <%= additional_options %>
-    <%- end -%>
-</VirtualHost>
-<%- end -%>
-
-<%- unless ssl_mode.to_s == 'false'  then -%>
-<VirtualHost *:443>
-<%  scope.unsetvar('vhost_part')
-  scope.setvar('vhost_part',:ssl) -%> 
-  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
-<%  scope.unsetvar('vhost_part') -%>
-
-<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
-
-    <Directory "<%= documentroot %>/">
-        AllowOverride <%= allow_override %>
-        <%- if options.to_s != 'absent' or do_includes.to_s == 'true' then -%>
-        Options <%= options %><%- if do_includes.to_s == 'true' and not options.include?('+Includes') then -%> +Includes<%- end -%>
-
-        <%- end -%>
-<%= scope.function_template('apache/vhosts/partials/authentication.erb') %>
-    </Directory>
-
-<%= scope.function_template('apache/vhosts/partials/mod_security.erb') %>
-
-    <%- unless additional_options.to_s == 'absent' then -%>
-    <%= additional_options %>
-    <%- end -%>
-</VirtualHost>
-<%- end -%>