From ded5106de8e6fef521343f6db6662641992a3f0d Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Fri, 5 Dec 2008 18:07:46 +0000
Subject: fixed option decision, centos static is now link of openbsd, as we
 can use the same

---
 templates/vhosts/perl/CentOS.erb   |  2 +-
 templates/vhosts/php/CentOS.erb    |  2 +-
 templates/vhosts/static/CentOS.erb | 26 +-------------------------
 3 files changed, 3 insertions(+), 27 deletions(-)
 mode change 100644 => 120000 templates/vhosts/static/CentOS.erb

diff --git a/templates/vhosts/perl/CentOS.erb b/templates/vhosts/perl/CentOS.erb
index 92e703c..d2b768f 100644
--- a/templates/vhosts/perl/CentOS.erb
+++ b/templates/vhosts/perl/CentOS.erb
@@ -17,7 +17,7 @@
     <%- end -%>
     <Directory "<%= documentroot %>/">
         AllowOverride <%= allow_override %>
-        <%- unless options.to_s == 'absent' then -%>
+        <%- unless 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 -%>
         <%- unless htpasswd_file.to_s == 'absent' then -%>
diff --git a/templates/vhosts/php/CentOS.erb b/templates/vhosts/php/CentOS.erb
index cee935e..e89db77 100644
--- a/templates/vhosts/php/CentOS.erb
+++ b/templates/vhosts/php/CentOS.erb
@@ -12,7 +12,7 @@
 
     <Directory "<%= documentroot %>/">
         AllowOverride <%= allow_override %>
-        <%- unless options.to_s == 'absent' then -%>
+        <%- unless 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 -%>
         <%- unless htpasswd_file.to_s == 'absent' then -%>
diff --git a/templates/vhosts/static/CentOS.erb b/templates/vhosts/static/CentOS.erb
deleted file mode 100644
index e990f5e..0000000
--- a/templates/vhosts/static/CentOS.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-<VirtualHost *:80>
-    Include conf.d/defaults.inc
-
-    ServerName <%= servername %>
-    <%- unless serveralias.to_s.empty? -%>
-    ServerAlias <%= serveralias %>
-    <%- end -%>
-    DocumentRoot <%= documentroot %>
-
-    ErrorLog <%= logdir %>/error_log
-    CustomLog <%= logdir %>/access_log combined
-
-    <Directory "<%= documentroot %>">
-        AllowOverride <%= allow_override %>
-        Options <%= options %> <%- if do_includes.to_s == 'true' and not options.include?('+Includes') then -%>+Includes<%- end -%>
-    </Directory>
-
-    <IfModule mod_security2.c>
-        SecRuleEngine <%= if mod_security.to_s == 'true' then "On" else "Off" end %>
-    </IfModule>
-
-    <%- unless additional_options == 'absent' then -%>
-    <%= additional_options %>
-    <%- end -%>
-</VirtualHost>
diff --git a/templates/vhosts/static/CentOS.erb b/templates/vhosts/static/CentOS.erb
new file mode 120000
index 0000000..58a2ba5
--- /dev/null
+++ b/templates/vhosts/static/CentOS.erb
@@ -0,0 +1 @@
+OpenBSD.erb
\ No newline at end of file
-- 
cgit v1.2.3