diff options
-rw-r--r-- | manifests/defines/vhost_files.pp | 3 | ||||
-rw-r--r-- | manifests/defines/vhost_varieties.pp | 6 | ||||
-rw-r--r-- | templates/vhosts/perl/CentOS.erb | 64 | ||||
-rw-r--r-- | templates/vhosts/php/CentOS.erb | 53 | ||||
-rw-r--r-- | templates/vhosts/static/OpenBSD.erb | 4 |
5 files changed, 129 insertions, 1 deletions
diff --git a/manifests/defines/vhost_files.pp b/manifests/defines/vhost_files.pp index 5352745..443375c 100644 --- a/manifests/defines/vhost_files.pp +++ b/manifests/defines/vhost_files.pp @@ -24,6 +24,7 @@ define apache::vhost( $php_upload_tmp_dir = 'absent', $php_session_save_path = 'absent', $cgi_binpath = 'absent', + $default_charset = 'absent', $do_includes = false, $options = 'absent', $additional_options = 'absent', @@ -59,6 +60,7 @@ define apache::vhost( do_includes => $do_includes, options => $options, additional_options => $additional_options, + default_charset => $default_charset, run_mode => $run_mode, run_uid => $run_uid, run_gid => $run_gid, @@ -181,6 +183,7 @@ define apache::vhost::template( $do_includes = false, $options = 'absent', $additional_options = 'absent', + $default_charset = 'absent', $run_mode = 'normal', $run_uid = 'absent', $run_gid = 'absent', diff --git a/manifests/defines/vhost_varieties.pp b/manifests/defines/vhost_varieties.pp index f84e537..1f2a0ed 100644 --- a/manifests/defines/vhost_varieties.pp +++ b/manifests/defines/vhost_varieties.pp @@ -26,6 +26,7 @@ define apache::vhost::static( $do_includes = false, $options = 'absent', $additional_options = 'absent', + $default_charset = 'absent', $ssl_mode = false, $vhost_mode = 'template', $vhost_source = 'absent', @@ -56,6 +57,7 @@ define apache::vhost::static( do_includes => $do_includes, options => $options, additional_options => $additional_options, + default_charset => $default_charset, ssl_mode => $ssl_mode, htpasswd_file => $htpasswd_file, htpasswd_path => $htpasswd_path, @@ -78,6 +80,7 @@ define apache::vhost::php::standard( $do_includes = false, $options = 'absent', $additional_options = 'absent', + $default_charset = 'absent', $mod_security = true, $ssl_mode = false, $vhost_mode = 'template', @@ -139,6 +142,7 @@ define apache::vhost::php::standard( do_includes => $do_includes, options => $options, additional_options => $additional_options, + default_charset => $default_charset, php_upload_tmp_dir => $real_upload_tmp_dir, php_session_save_path => $real_session_save_path, ssl_mode => $ssl_mode, @@ -171,6 +175,7 @@ define apache::vhost::modperl( $do_includes = false, $options = 'absent', $additional_options = 'absent', + $default_charset = 'absent', $mod_security = true, $ssl_mode = false, $vhost_mode = 'template', @@ -226,6 +231,7 @@ define apache::vhost::modperl( do_includes => $do_includes, options => $options, additional_options => $additional_options, + default_charset => $default_charset, cgi_binpath => $real_cgi_binpath, ssl_mode => $ssl_mode, htpasswd_file => $htpasswd_file, diff --git a/templates/vhosts/perl/CentOS.erb b/templates/vhosts/perl/CentOS.erb index e6d2402..0dbdb69 100644 --- a/templates/vhosts/perl/CentOS.erb +++ b/templates/vhosts/perl/CentOS.erb @@ -1,3 +1,4 @@ +# <%= servername %> <VirtualHost *:80> Include conf.d/defaults.inc @@ -9,7 +10,69 @@ ErrorLog <%= logdir %>/error_log CustomLog <%= logdir %>/access_log combined + <%- if ssl_mode.to_s == 'force' then -%> + Redirect permanent / https://<%= servername %>/ + <%- end -%> + <%- if default_charset.to_s != 'absent' then -%> + AddDefaultCharset <%= default_charset %> + <%- end -%> + <%- if run_mode.to_s == 'itk' -%> + <IfModule mpm_itk_module> + AssignUserId <%= run_uid+" "+run_gid %> + </IfModule> + <%- end -%> + <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 -%> + <%- unless htpasswd_file.to_s == 'absent' then -%> + AuthType Basic + AuthName "Access fuer <%= servername %>" + AuthUserFile <%= real_htpasswd_path %> + require valid-user + <%- end -%> + </Directory> + ScriptAlias /cgi-bin/ <%= cgi_binpath %>/ + <%- unless htpasswd_file.to_s == 'absent' then -%> + <Directory "<%= cgi_binpath %>/"> + AuthType Basic + AuthName "Access fuer <%= servername %>" + AuthUserFile <%= real_htpasswd_path %> + require valid-user + </Directory> + <%- end -%> + + <IfModule mod_security2.c> + SecRuleEngine <%= if mod_security.to_s == 'true' then "On" else "Off" end %> + </IfModule> + + <%- unless additional_options.to_s == 'absent' then -%> + <%= additional_options %> + <%- end -%> +</VirtualHost> + +<%- unless ssl_mode.to_s == 'false' then -%> +<VirtualHost *:443> + Include conf.d/defaults.inc + Include conf.d/ssl_defaults.inc + + ServerName <%= servername %> + <%- unless serveralias.to_s.empty? then -%> + ServerAlias <%= serveralias %> + <%- end -%> + DocumentRoot <%= documentroot %>/ + + ErrorLog <%= logdir %>/error_log + CustomLog <%= logdir %>/access_log combined + <%- if ssl_mode.to_s == 'force' then -%> + Redirect permanent / https://<%= servername %>/ + <%- end -%> + <%- if default_charset.to_s != 'absent' then -%> + AddDefaultCharset <%= default_charset %> + <%- end -%> <%- if run_mode.to_s == 'itk' -%> <IfModule mpm_itk_module> AssignUserId <%= run_uid+" "+run_gid %> @@ -47,3 +110,4 @@ <%= additional_options %> <%- end -%> </VirtualHost> +<%- end -%> diff --git a/templates/vhosts/php/CentOS.erb b/templates/vhosts/php/CentOS.erb index 4519188..3841c39 100644 --- a/templates/vhosts/php/CentOS.erb +++ b/templates/vhosts/php/CentOS.erb @@ -1,3 +1,4 @@ +# <%= servername %> <VirtualHost *:80> Include conf.d/defaults.inc @@ -9,7 +10,58 @@ ErrorLog <%= logdir %>/error_log CustomLog <%= logdir %>/access_log combined + <%- if ssl_mode.to_s == 'force' then -%> + Redirect permanent / https://<%= servername %>/ + <%- end -%> + <%- if default_charset.to_s != 'absent' then -%> + AddDefaultCharset <%= default_charset %> + <%- end -%> + <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 -%> + <%- unless htpasswd_file.to_s == 'absent' then -%> + AuthType Basic + AuthName "Access fuer <%= servername %>" + AuthUserFile <%= real_htpasswd_path %> + require valid-user + <%- end -%> + php_admin_flag engine on + php_admin_value open_basedir <%= documentroot %>:<%= php_upload_tmp_dir %>:<%= php_session_save_path %> + php_admin_value upload_tmp_dir <%= php_upload_tmp_dir %> + php_admin_value session.save_path <%= php_session_save_path %> + </Directory> + + <IfModule mod_security2.c> + SecRuleEngine <%= if mod_security.to_s == 'true' then "On" else "Off" end %> + </IfModule> + + <%- unless additional_options.to_s == 'absent' then -%> + <%= additional_options %> + <%- end -%> +</VirtualHost> + +<%- unless ssl_mode.to_s == 'false' then -%> +<VirtualHost *:443> + Include conf.d/defaults.inc + Include conf.d/ssl_defaults.inc + ServerName <%= servername %> + <%- unless serveralias.to_s.empty? then -%> + ServerAlias <%= serveralias %> + <%- end -%> + DocumentRoot <%= documentroot %>/ + + ErrorLog <%= logdir %>/error_log + CustomLog <%= logdir %>/access_log combined + <%- if ssl_mode.to_s == 'force' then -%> + Redirect permanent / https://<%= servername %>/ + <%- end -%> + <%- if default_charset.to_s != 'absent' then -%> + AddDefaultCharset <%= default_charset %> + <%- end -%> <Directory "<%= documentroot %>/"> AllowOverride <%= allow_override %> <%- if options.to_s != 'absent' or do_includes.to_s == 'true' then -%> @@ -36,3 +88,4 @@ <%= additional_options %> <%- end -%> </VirtualHost> +<%- end -%> diff --git a/templates/vhosts/static/OpenBSD.erb b/templates/vhosts/static/OpenBSD.erb index 4e95988..9aee749 100644 --- a/templates/vhosts/static/OpenBSD.erb +++ b/templates/vhosts/static/OpenBSD.erb @@ -9,7 +9,9 @@ ErrorLog <%= logdir %>/error_log CustomLog <%= logdir %>/access_log combined - + <%- if default_charset.to_s != 'absent' then -%> + AddDefaultCharset <%= default_charset %> + <%- end -%> <%- if ssl_mode.to_s == 'force' then -%> Redirect permanent / https://<%= servername %>/ <%- end -%> |