From a59012ff522a534aebd128236b8520eff413578b Mon Sep 17 00:00:00 2001 From: mh Date: Wed, 2 Jul 2014 21:34:31 +0200 Subject: linting --- manifests/vhost.pp | 152 ++++++++++++++++++++++++++--------------------------- 1 file changed, 76 insertions(+), 76 deletions(-) (limited to 'manifests') diff --git a/manifests/vhost.pp b/manifests/vhost.pp index dcb26a2..2f3a79e 100644 --- a/manifests/vhost.pp +++ b/manifests/vhost.pp @@ -29,94 +29,94 @@ # - true: activate mod_security # define apache::vhost( - $ensure = present, - $path = 'absent', - $path_is_webdir = false, - $logpath = 'absent', - $logmode = 'default', - $vhost_mode = 'template', - $template_partial = 'apache/vhosts/static/partial.erb', - $vhost_source = 'absent', - $vhost_destination = 'absent', - $content = 'absent', - $domain = 'absent', - $domainalias = 'absent', - $server_admin = 'absent', - $allow_override = 'None', - $php_settings = {}, - $php_options = {}, - $cgi_binpath = 'absent', - $default_charset = 'absent', - $do_includes = false, - $options = 'absent', - $additional_options = 'absent', - $run_mode = 'normal', - $run_uid = 'absent', - $run_gid = 'absent', - $ssl_mode = false, - $htpasswd_file = 'absent', - $htpasswd_path = 'absent', - $mod_security = true, - $mod_security_relevantonly = true, - $mod_security_rules_to_disable = [], - $mod_security_additional_options = 'absent', - $use_mod_macro = false, - $ldap_auth = false, - $ldap_user = 'any', - $passing_extension = 'absent', - $gempath = 'absent' + $ensure = present, + $path = 'absent', + $path_is_webdir = false, + $logpath = 'absent', + $logmode = 'default', + $vhost_mode = 'template', + $template_partial = 'apache/vhosts/static/partial.erb', + $vhost_source = 'absent', + $vhost_destination = 'absent', + $content = 'absent', + $domain = 'absent', + $domainalias = 'absent', + $server_admin = 'absent', + $allow_override = 'None', + $php_settings = {}, + $php_options = {}, + $cgi_binpath = 'absent', + $default_charset = 'absent', + $do_includes = false, + $options = 'absent', + $additional_options = 'absent', + $run_mode = 'normal', + $run_uid = 'absent', + $run_gid = 'absent', + $ssl_mode = false, + $htpasswd_file = 'absent', + $htpasswd_path = 'absent', + $mod_security = true, + $mod_security_relevantonly = true, + $mod_security_rules_to_disable = [], + $mod_security_additional_options = 'absent', + $use_mod_macro = false, + $ldap_auth = false, + $ldap_user = 'any', + $passing_extension = 'absent', + $gempath = 'absent' ) { # file or template mode? case $vhost_mode { 'file': { apache::vhost::file{$name: - ensure => $ensure, - vhost_source => $vhost_source, + ensure => $ensure, + vhost_source => $vhost_source, vhost_destination => $vhost_destination, - do_includes => $do_includes, - run_mode => $run_mode, - mod_security => $mod_security, - htpasswd_file => $htpasswd_file, - htpasswd_path => $htpasswd_path, - use_mod_macro => $use_mod_macro, + do_includes => $do_includes, + run_mode => $run_mode, + mod_security => $mod_security, + htpasswd_file => $htpasswd_file, + htpasswd_path => $htpasswd_path, + use_mod_macro => $use_mod_macro, } } 'template': { apache::vhost::template{$name: - ensure => $ensure, - path => $path, - path_is_webdir => $path_is_webdir, - logpath => $logpath, - logmode => $logmode, - domain => $domain, - domainalias => $domainalias, - server_admin => $server_admin, - cgi_binpath => $cgi_binpath, - allow_override => $allow_override, - do_includes => $do_includes, - options => $options, - additional_options => $additional_options, - default_charset => $default_charset, - php_settings => $php_settings, - php_options => $php_options, - run_mode => $run_mode, - run_uid => $run_uid, - run_gid => $run_gid, - template_partial => $template_partial, - ssl_mode => $ssl_mode, - htpasswd_file => $htpasswd_file, - htpasswd_path => $htpasswd_path, - ldap_auth => $ldap_auth, - ldap_user => $ldap_user, - mod_security => $mod_security, - mod_security_relevantonly => $mod_security_relevantonly, - mod_security_rules_to_disable => $mod_security_rules_to_disable, + ensure => $ensure, + path => $path, + path_is_webdir => $path_is_webdir, + logpath => $logpath, + logmode => $logmode, + domain => $domain, + domainalias => $domainalias, + server_admin => $server_admin, + cgi_binpath => $cgi_binpath, + allow_override => $allow_override, + do_includes => $do_includes, + options => $options, + additional_options => $additional_options, + default_charset => $default_charset, + php_settings => $php_settings, + php_options => $php_options, + run_mode => $run_mode, + run_uid => $run_uid, + run_gid => $run_gid, + template_partial => $template_partial, + ssl_mode => $ssl_mode, + htpasswd_file => $htpasswd_file, + htpasswd_path => $htpasswd_path, + ldap_auth => $ldap_auth, + ldap_user => $ldap_user, + mod_security => $mod_security, + mod_security_relevantonly => $mod_security_relevantonly, + mod_security_rules_to_disable => $mod_security_rules_to_disable, mod_security_additional_options => $mod_security_additional_options, - use_mod_macro => $use_mod_macro, - passing_extension => $passing_extension, - gempath => $gempath, + use_mod_macro => $use_mod_macro, + passing_extension => $passing_extension, + gempath => $gempath, } } - default: { fail("no such vhost_mode: $vhost_mode defined for $name.") } + default: { fail("No such vhost_mode: ${vhost_mode} defined for ${name}.") } } } -- cgit v1.2.3