introduce a new template style, less duplicated things, more handy options

2 files changed, 18 insertions, 4 deletions

diff --git a/templates/vhosts/partials/php_settings.erb b/templates/vhosts/partials/php_settings.erb
index be4662a..8d4fec4 100644
--- a/templates/vhosts/partials/php_settings.erb
+++ b/templates/vhosts/partials/php_settings.erb
@@ -1,7 +1,17 @@
-<% php_settings.each do |key,value| -%>
-<% if ['on','off' ].include?(value.downcase) -%>
-    php_admin_flag <%= key %> <%= value %>
+<% php_settings.each do |key,value|
+  dvalue = value.to_s.downcase
+  munged_value = if dvalue == 'true'
+	    'on'
+	  elsif dvalue == 'false'
+	    'off'
+	  elsif ['on','off'].include?(dvalue)
+	    dvalue
+	  else
+	    value
+	  end
+  if ['on','off' ].include?(munged_value) -%>
+    php_admin_flag <%= key %> <%= munged_value %>
 <% else -%>
-    php_admin_value <%= key %> <%= value %>
+    php_admin_value <%= key %> <%= munged_value %>
 <% end -%>
 <% end -%>
\ No newline at end of file
diff --git a/templates/vhosts/partials/std_override_options.erb b/templates/vhosts/partials/std_override_options.erb
new file mode 100644
index 0000000..d43b042
--- /dev/null
+++ b/templates/vhosts/partials/std_override_options.erb
@@ -0,0 +1,4 @@
+        AllowOverride <%= allow_override %>
+        <% if options.to_s != 'absent' || do_includes.to_s == 'true' -%>
+        Options <%- unless options.to_s == 'absent' then -%><%= options %><% end -%><% if do_includes.to_s == 'true' && !options.include?('+Includes') -%> +Includes<% end -%>
+				<% end -%>
\ No newline at end of file