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

3 files changed, 4 insertions, 203 deletions

diff --git a/templates/vhosts/php_joomla/CentOS.erb b/templates/vhosts/php_joomla/CentOS.erb
deleted file mode 120000
index 307fc29..0000000
--- a/templates/vhosts/php_joomla/CentOS.erb
+++ /dev/null
@@ -1 +0,0 @@
-php_joomla.erb
\ No newline at end of file
diff --git a/templates/vhosts/php_joomla/Debian.erb b/templates/vhosts/php_joomla/Debian.erb
deleted file mode 120000
index 307fc29..0000000
--- a/templates/vhosts/php_joomla/Debian.erb
+++ /dev/null
@@ -1 +0,0 @@
-php_joomla.erb
\ No newline at end of file
diff --git a/templates/vhosts/php_joomla/php_joomla.erb b/templates/vhosts/php_joomla/php_joomla.erb
index a0e013d..fa095ff 100644
--- a/templates/vhosts/php_joomla/php_joomla.erb
+++ b/templates/vhosts/php_joomla/php_joomla.erb
@@ -1,157 +1,13 @@
-# <%= servername %>
-<%- if run_mode.to_s =~ /(proxy\-|static\-)itk/ -%>
-<IfDefine HttpdLocal>
-<%- end -%>
-<%- 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 run_mode.to_s =~ /(proxy\-|static\-)?itk/ -%>
-    <IfModule mpm_itk_module>
-        AssignUserId <%= run_uid+" "+run_gid %>
-    </IfModule>
-
-    <%- end -%>
-    <%- if not ssl_mode.to_s == 'force' then -%>
-    <Directory "<%= documentroot %>/">
-        Include include.d/joomla.inc
-
-        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') %>
-        php_admin_flag engine on
-        <%- unless php_default_charset.to_s == 'absent' then -%>
-        php_admin_value default_charset <%= php_default_charset %>
-        <%- end -%>
-        php_admin_value open_basedir <%= documentroot %>:<%= real_php_upload_tmp_dir %>:<%= real_php_session_save_path %>
-        php_admin_value upload_tmp_dir <%= real_php_upload_tmp_dir %>
-        php_admin_value session.save_path <%= real_php_session_save_path %>
-        <%- unless php_safe_mode_exec_bins.to_s == 'absent' then -%>
-        php_admin_value safe_mode_exec_dir <%= real_php_safe_mode_exec_bin_dir %>
-        <%- end -%>
-    </Directory>
-    <%- end -%>
-	
-    <Directory "<%= documentroot %>/administrator/">
-        RewriteEngine on
-
-        # Rewrite URLs to https that go for the admin area
-        RewriteCond %{REMOTE_ADDR} !^127\.[0-9]+\.[0-9]+\.[0-9]+$
-        RewriteCond %{HTTPS} !=on
-        RewriteCond %{REQUEST_URI} (.*/administrator/.*)
-        RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R]
-    </Directory>
-
-    <%- unless run_mode.to_s =~ /(proxy\-|static\-)itk/ -%>
-<%= scope.function_template('apache/vhosts/partials/mod_security.erb') %>
-    <%- end -%>
-
-    <%- 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') %>
-
-    <%- if run_mode.to_s =~ /(proxy\-|static\-)?itk/ -%>
-
-    <IfModule mpm_itk_module>
-        AssignUserId <%= run_uid+" "+run_gid %>
-    </IfModule>
-    <%- end -%>
-
     <Directory "<%= documentroot %>/">
-        Include include.d/joomla.inc
+<%= scope.function_template('apache/vhosts/partials/std_override_options.erb') %>
 
-        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 -%>
+<%= scope.function_template('apache/vhosts/partials/php_settings.erb') %>        
 
-        <%- end -%>
 <%= scope.function_template('apache/vhosts/partials/authentication.erb') %>
-        php_admin_flag engine on
-        <%- unless php_default_charset.to_s == 'absent' then -%>
-        php_admin_value default_charset <%= php_default_charset %>
-        <%- end -%>
-        php_admin_value open_basedir <%= documentroot %>:<%= real_php_upload_tmp_dir %>:<%= real_php_session_save_path %>
-        php_admin_value upload_tmp_dir <%= real_php_upload_tmp_dir %>
-        php_admin_value session.save_path <%= real_php_session_save_path %>
-        <%- unless php_safe_mode_exec_bins.to_s == 'absent' then -%>
-        php_admin_value safe_mode_exec_dir <%= real_php_safe_mode_exec_bin_dir %>
-        <%- end -%>
-    </Directory>
-
-    <%- unless run_mode.to_s =~ /(proxy\-|static\-)itk/ -%>
-<%= scope.function_template('apache/vhosts/partials/mod_security.erb') %>
-    <%- end -%>
-
-    <%- unless additional_options.to_s == 'absent' then -%>
-    <%= additional_options %>
-    <%- end -%>
-</VirtualHost>
-<%- end -%>
-<%- if run_mode.to_s =~ /(proxy\-|static\-)itk/ -%>
-</IfDefine>
-<IfDefine !HttpdLocal>
-<%- 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') -%>
-    DirectoryIndex index.htm index.html index.php
-
-<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
-
-    ProxyPreserveHost On
-    ProxyRequests off
-    <%- if run_mode.to_s == 'static-itk' -%>
-    ProxyPassMatch ^/(.*\.php/?.*)$ http://127.0.0.1/$1
-    <%- else -%>
-    ProxyPass / http://127.0.0.1/
-    <%- end -%>
-    ProxyPassReverse / http://127.0.0.1/
-
-    <%- if ssl_mode.to_s == 'force' then -%>
-    RewriteEngine On
-    RewriteCond %{HTTPS} !=on
-    RewriteRule (.*) https://%{SERVER_NAME}$1 [R=permanent,L]
 
-    <%- end -%>
-    <%- if run_mode.to_s == 'static-itk' then -%>
-    <%- if not ssl_mode.to_s == 'force' then -%>
-    <Directory "<%= documentroot %>/">
         Include include.d/joomla.inc
-
-        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>
+	
     <Directory "<%= documentroot %>/administrator/">
         RewriteEngine on
 
@@ -160,57 +16,4 @@
         RewriteCond %{HTTPS} !=on
         RewriteCond %{REQUEST_URI} (.*/administrator/.*)
         RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R]
-    </Directory>
-    <%- end -%>
-    <%- 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') -%>
-    DirectoryIndex index.htm index.html index.php
-
-<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
-
-    ProxyPreserveHost On
-    ProxyRequests off
-    SSLProxyEngine On
-    <%- if run_mode.to_s == 'static-itk' -%>
-    ProxyPassMatch ^/(.*\.php/?.*)$ https://127.0.0.1/$1
-    <%- else -%>
-    ProxyPass / https://127.0.0.1/
-    <%- end -%>
-    ProxyPassReverse / https://127.0.0.1/
-
-    <%- if run_mode.to_s == 'static-itk' -%>
-    <Directory "<%= documentroot %>/">
-        Include include.d/joomla.inc
-
-        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 -%>
-</IfDefine>
-<%- end -%>
+    </Directory>
\ No newline at end of file