linting

5 files changed, 441 insertions, 431 deletions

diff --git a/manifests/openbsd.pp b/manifests/openbsd.pp
index 1ba58f4..095f9ea 100644
--- a/manifests/openbsd.pp
+++ b/manifests/openbsd.pp
@@ -1,67 +1,73 @@
 ### openbsd
 class apache::openbsd inherits apache::base {
-    $config_dir = '/var/www'
+  $config_dir = '/var/www'
 
-    File[vhosts_dir]{
-        path => "$config_dir/vhosts.d",
-    }
-    File[modules_dir]{
-        path => "$config_dir/conf/modules",
-    }
-    File[config_dir]{
-        path => "$config_dir/conf.d",
-    }
-    File[include_dir]{
-        path => "$config_dir/include.d",
-    }
-    File['htpasswd_dir']{
-        group => www,
-    }
-    File[web_dir]{
-        group => daemon,
-    }
-    file_line{'enable_apache_on_boot':
-        path => '/etc/rc.conf.local',
-        line => 'httpd flags=""',
-    }
-    file{'apache_main_config':
-        path => "${config_dir}/conf/httpd.conf",
-        source => [ "puppet:///modules/site_apache/config/OpenBSD/${::fqdn}/httpd.conf",
-                    "puppet:///modules/site_apache/config/OpenBSD/${apache::cluster_node}/httpd.conf",
-                    "puppet:///modules/site_apache/config/OpenBSD//httpd.conf",
-                    "puppet:///modules/apache/config/OpenBSD/httpd.conf" ],
-        notify => Service['apache'],
-        owner => root, group => 0, mode => 0644;
-    }
-    File[default_apache_index] {
-        path => '/var/www/htdocs/default/www/index.html',
-    }
-    file{'/opt/bin/restart_apache.sh':
-        source => "puppet:///modules/apache/scripts/OpenBSD/bin/restart_apache.sh",
-        require => File['/opt/bin'],
-        owner => root, group => 0, mode => 0700;
-    }
+  File[vhosts_dir]{
+    path => "${config_dir}/vhosts.d",
+  }
+  File[modules_dir]{
+    path => "${config_dir}/conf/modules",
+  }
+  File[config_dir]{
+    path => "${config_dir}/conf.d",
+  }
+  File[include_dir]{
+    path => "${config_dir}/include.d",
+  }
+  File['htpasswd_dir']{
+    group => www,
+  }
+  File[web_dir]{
+    group => daemon,
+  }
+  file_line{'enable_apache_on_boot':
+    path => '/etc/rc.conf.local',
+    line => 'httpd flags=""',
+  }
+  file{'apache_main_config':
+    path    => "${config_dir}/conf/httpd.conf",
+    source  => ["puppet:///modules/site_apache/config/OpenBSD/${::fqdn}/httpd.conf",
+                "puppet:///modules/site_apache/config/OpenBSD/${apache::cluster_node}/httpd.conf",
+                'puppet:///modules/site_apache/config/OpenBSD//httpd.conf',
+                'puppet:///modules/apache/config/OpenBSD/httpd.conf' ],
+    notify  => Service['apache'],
+    owner   => root,
+    group   => 0,
+    mode    => '0644';
+  }
+  File[default_apache_index] {
+    path => '/var/www/htdocs/default/www/index.html',
+  }
+  file{'/opt/bin/restart_apache.sh':
+    source  => 'puppet:///modules/apache/scripts/OpenBSD/bin/restart_apache.sh',
+    require => File['/opt/bin'],
+    owner   => root,
+    group   => 0,
+    mode    => '0700';
+  }
 
-    ::apache::vhost::webdir{'default': }
+  ::apache::vhost::webdir{'default': }
 
-    Service['apache']{
-        restart => '/opt/bin/restart_apache.sh',
-        status => 'apachectl status',
-        start => 'apachectl start',
-        stop => 'apachectl stop',
-    }
-    file{'/opt/bin/apache_logrotate.sh':
-        source => "puppet:///modules/apache/scripts/OpenBSD/bin/apache_logrotate.sh",
-        require => File['/opt/bin'],
-        owner => root, group => 0, mode => 0700;
-    }
-    cron { 'update_apache_logrotation':
-        command => '/bin/sh /opt/bin/apache_logrotate.sh  > /etc/newsyslog_apache.conf',
-        minute => '1',
-        hour => '1',
-    }
-    cron { 'run_apache_logrotation':
-        command => '/usr/bin/newsyslog -f /etc/newsyslog_apache.conf > /dev/null',
-        minute => '10',
-    }
+  Service['apache']{
+    restart => '/opt/bin/restart_apache.sh',
+    status  => 'apachectl status',
+    start   => 'apachectl start',
+    stop    => 'apachectl stop',
+  }
+  file{'/opt/bin/apache_logrotate.sh':
+    source  => 'puppet:///modules/apache/scripts/OpenBSD/bin/apache_logrotate.sh',
+    require => File['/opt/bin'],
+    owner   => root,
+    group   => 0,
+    mode    => '0700';
+  }
+  cron { 'update_apache_logrotation':
+    command => '/bin/sh /opt/bin/apache_logrotate.sh  > /etc/newsyslog_apache.conf',
+    minute  => '1',
+    hour    => '1',
+  }
+  cron { 'run_apache_logrotation':
+    command => '/usr/bin/newsyslog -f /etc/newsyslog_apache.conf > /dev/null',
+    minute  => '10',
+  }
 }
diff --git a/manifests/vhost/php/standard.pp b/manifests/vhost/php/standard.pp
index 3c98a8a..2f381ce 100644
--- a/manifests/vhost/php/standard.pp
+++ b/manifests/vhost/php/standard.pp
@@ -25,227 +25,231 @@
 #   - anonym: Don't log ips for CustomLog, send ErrorLog to /dev/null
 #   - semianonym: Don't log ips for CustomLog, log normal ErrorLog
 define apache::vhost::php::standard(
-    $ensure = present,
-    $domain = 'absent',
-    $domainalias = 'absent',
-    $server_admin = 'absent',
-    $logmode = 'default',
-    $logpath = 'absent',
-    $path = 'absent',
-    $manage_webdir = true,
-    $path_is_webdir = false,
-    $manage_docroot = true,
-    $owner = root,
-    $group = apache,
-    $documentroot_owner = apache,
-    $documentroot_group = 0,
-    $documentroot_mode = 0640,
-    $run_mode = 'normal',
-    $run_uid = 'absent',
-    $run_gid = 'absent',
-    $allow_override = 'None',
-    $php_settings = {},
-    $php_options = {},
-    $do_includes = false,
-    $options = 'absent',
-    $additional_options = 'absent',
-    $default_charset = 'absent',
-    $use_mod_macro = false,
-    $mod_security = true,
-    $mod_security_relevantonly = true,
-    $mod_security_rules_to_disable = [],
-    $mod_security_additional_options = 'absent',
-    $ssl_mode = false,
-    $vhost_mode = 'template',
-    $template_partial = 'apache/vhosts/php/partial.erb',
-    $vhost_source = 'absent',
-    $vhost_destination = 'absent',
-    $htpasswd_file = 'absent',
-    $htpasswd_path = 'absent'
+  $ensure                           = present,
+  $domain                           = 'absent',
+  $domainalias                      = 'absent',
+  $server_admin                     = 'absent',
+  $logmode                          = 'default',
+  $logpath                          = 'absent',
+  $path                             = 'absent',
+  $manage_webdir                    = true,
+  $path_is_webdir                   = false,
+  $manage_docroot                   = true,
+  $owner                            = root,
+  $group                            = apache,
+  $documentroot_owner               = apache,
+  $documentroot_group               = 0,
+  $documentroot_mode                = 0640,
+  $run_mode                         = 'normal',
+  $run_uid                          = 'absent',
+  $run_gid                          = 'absent',
+  $allow_override                   = 'None',
+  $php_settings                     = {},
+  $php_options                      = {},
+  $do_includes                      = false,
+  $options                          = 'absent',
+  $additional_options               = 'absent',
+  $default_charset                  = 'absent',
+  $use_mod_macro                    = false,
+  $mod_security                     = true,
+  $mod_security_relevantonly        = true,
+  $mod_security_rules_to_disable    = [],
+  $mod_security_additional_options  = 'absent',
+  $ssl_mode                         = false,
+  $vhost_mode                       = 'template',
+  $template_partial                 = 'apache/vhosts/php/partial.erb',
+  $vhost_source                     = 'absent',
+  $vhost_destination                = 'absent',
+  $htpasswd_file                    = 'absent',
+  $htpasswd_path                    = 'absent'
 ){
 
-    if $manage_webdir {
-      # create webdir
-      ::apache::vhost::webdir{$name:
-        ensure => $ensure,
-        path => $path,
-        owner => $owner,
-        group => $group,
-        run_mode => $run_mode,
-        manage_docroot => $manage_docroot,
-        documentroot_owner => $documentroot_owner,
-        documentroot_group => $documentroot_group,
-        documentroot_mode => $documentroot_mode,
+  if $manage_webdir {
+    # create webdir
+    ::apache::vhost::webdir{$name:
+      ensure              => $ensure,
+      path                => $path,
+      owner               => $owner,
+      group               => $group,
+      run_mode            => $run_mode,
+      manage_docroot      => $manage_docroot,
+      documentroot_owner  => $documentroot_owner,
+      documentroot_group  => $documentroot_group,
+      documentroot_mode   => $documentroot_mode,
+    }
+  }
+
+  $real_path = $path ? {
+    'absent' => $::operatingsystem ? {
+      openbsd => "/var/www/htdocs/${name}",
+      default => "/var/www/vhosts/${name}"
+    },
+    default   => $path
+  }
+
+  if $path_is_webdir {
+    $documentroot = $real_path
+  } else {
+    $documentroot = "${real_path}/www"
+  }
+  $logdir = $logpath ? {
+    'absent'  => "${real_path}/logs",
+    default   => $logpath
+  }
+
+  $std_php_options = {
+    smarty  => false,
+    pear    => false,
+  }
+  $real_php_options = merge($std_php_options,$php_options)
+
+  if $real_php_options[smarty] {
+    include php::extensions::smarty
+    $smarty_path = '/usr/share/php/Smarty/:'
+  } else {
+    $smarty_path = ''
+  }
+
+  if $real_php_options[pear] {
+    $pear_path = '/usr/share/pear/:'
+  } else {
+    $pear_path = ''
+  }
+
+
+  $std_php_settings = {
+    engine              =>  'On',
+    upload_tmp_dir      => "/var/www/upload_tmp_dir/${name}",
+    'session.save_path' => "/var/www/session.save_path/${name}",
+    open_basedir        => "${smarty_path}${pear_path}${documentroot}:/var/www/upload_tmp_dir/${name}:/var/www/session.save_path/${name}",
+    safe_mode           => 'On'
+  }
+  if $logmode != 'nologs' {
+    $std_php_settings[error_log] = "${logdir}/php_error_log"
+  }
+  if $run_mode == 'fcgid' {
+    $std_php_settings[safe_mode_gid] = 'On'
+  }
+
+  if has_key($php_settings,'safe_mode_exec_dir') {
+    $php_safe_mode_exec_dir = $php_settings[safe_mode_exec_dir]
+  } else {
+    $php_safe_mode_exec_dir =  $path ? {
+      'absent' => $::operatingsystem ? {
+        openbsd => "/var/www/htdocs/${name}/bin",
+        default => "/var/www/vhosts/${name}/bin"
+      },
+      default   => "${path}/bin"
+    }
+  }
+  file{$php_safe_mode_exec_dir:
+    recurse => true,
+    force   => true,
+    purge   => true,
+  }
+  if has_key($php_options,'safe_mode_exec_bins') {
+    $std_php_settings[safe_mode_exec_dir] = $php_safe_mode_exec_dir
+    $ensure_exec = $ensure ? {
+      'present'  => directory,
+      default    => 'absent',
+    }
+    File[$php_safe_mode_exec_dir]{
+      ensure => $ensure_exec,
+      owner  => $documentroot_owner,
+      group  => $documentroot_group,
+      mode   => '0750',
+    }
+    $php_safe_mode_exec_bins_subst = regsubst($php_options[safe_mode_exec_bins],'(.+)',"${name}@\\1")
+    apache::vhost::php::safe_mode_bin{
+      $php_safe_mode_exec_bins_subst:
+        ensure  => $ensure,
+        path    => $php_safe_mode_exec_dir;
+    }
+  }else{
+    File[$php_safe_mode_exec_dir]{
+      ensure => absent,
+    }
+  }
+
+  if !has_key($php_settings,'default_charset') {
+    if $default_charset != 'absent' {
+      $std_php_settings[default_charset] =  $default_charset ? {
+        'On'    => 'iso-8859-1',
+        default => $default_charset
       }
     }
+  }
 
-    $real_path = $path ? {
-        'absent' => $::operatingsystem ? {
-            openbsd => "/var/www/htdocs/${name}",
-            default => "/var/www/vhosts/${name}"
-        },
-        default => $path
-    }
+  $real_php_settings = merge($std_php_settings,$php_settings)
 
-    if $path_is_webdir {
-        $documentroot = $real_path
-    } else {
-        $documentroot = "${real_path}/www"
-    }
-    $logdir = $logpath ? {
-        'absent' => "$real_path/logs",
-        default => $logpath
-    }
-
-    $std_php_options = {
-      smarty => false,
-      pear => false,
-    }
-    $real_php_options = merge($std_php_options,$php_options)
-
-    if $real_php_options[smarty] {
-        include php::extensions::smarty
-        $smarty_path = '/usr/share/php/Smarty/:'
-    } else {
-      $smarty_path = ''
-    }
-
-    if $real_php_options[pear] {
-      $pear_path = '/usr/share/pear/:'
-    } else {
-      $pear_path = ''
-    }
-
-
-    $std_php_settings = {
-        engine              =>  'On',
-        upload_tmp_dir      => "/var/www/upload_tmp_dir/${name}",
-        'session.save_path' => "/var/www/session.save_path/${name}",
-        open_basedir        => "${smarty_path}${pear_path}${documentroot}:/var/www/upload_tmp_dir/${name}:/var/www/session.save_path/${name}",
-        safe_mode           => 'On'
-    }
-    if $logmode != 'nologs' {
-      $std_php_settings[error_log] = "${logdir}/php_error_log"
-    }
-    if $run_mode == 'fcgid' {
-      $std_php_settings[safe_mode_gid] = 'On'
-    }
-
-    if has_key($php_settings,'safe_mode_exec_dir') {
-      $php_safe_mode_exec_dir = $php_settings[safe_mode_exec_dir]
-    } else {
-      $php_safe_mode_exec_dir =  $path ? {
-        'absent' => $::operatingsystem ? {
-          openbsd => "/var/www/htdocs/${name}/bin",
-          default => "/var/www/vhosts/${name}/bin"
-        },
-        default => "${path}/bin"
+  if $ensure != 'absent' {
+    case $run_mode {
+      'proxy-itk','static-itk': {
+        include ::php::itk_plus
       }
-    }
-    file{$php_safe_mode_exec_dir:
-      recurse => true,
-      force => true,
-      purge => true,
-    }
-    if has_key($php_options,'safe_mode_exec_bins') {
-     $std_php_settings[safe_mode_exec_dir] = $php_safe_mode_exec_dir
-     File[$php_safe_mode_exec_dir]{
-        ensure => $ensure ? {
-          'present' => directory,
-          default => absent,
-        },
-        owner => $documentroot_owner, group => $documentroot_group, mode => 0750,
-      }
-      $php_safe_mode_exec_bins_subst = regsubst($php_options[safe_mode_exec_bins],"(.+)","${name}@\\1")
-      apache::vhost::php::safe_mode_bin{ $php_safe_mode_exec_bins_subst:
-        ensure => $ensure,
-        path => $php_safe_mode_exec_dir
-      }
-    }else{
-      File[$php_safe_mode_exec_dir]{
-        ensure => absent,
-      }
-    }
-
-    if !has_key($php_settings,'default_charset') {
-      if $default_charset != 'absent' {
-        $std_php_settings[default_charset] =  $default_charset ? {
-          'On' => 'iso-8859-1',
-          default => $default_charset
-        }
-      }
-    }
-
-    $real_php_settings = merge($std_php_settings,$php_settings)
-
-    if $ensure != 'absent' {
-      case $run_mode {
-        'proxy-itk','static-itk': {
-          include ::php::itk_plus
+      'itk': { include ::php::itk }
+      'fcgid': {
+        include ::mod_fcgid
+        include ::php::mod_fcgid
+        include apache::include::mod_fcgid
+
+        mod_fcgid::starter {$name:
+          php_tmp_dir      => $real_php_settings[php_tmp_dir],
+          cgi_type         => 'php',
+          cgi_type_options => delete($real_php_settings, php_tmp_dir),
+          owner            => $run_uid,
+          group            => $run_gid,
+          notify           => Service['apache'],
         }
-        'itk': { include ::php::itk }
-        'fcgid': {
-          include ::mod_fcgid
-          include ::php::mod_fcgid
-          include apache::include::mod_fcgid
-
-          mod_fcgid::starter {$name:
-            php_tmp_dir      => $real_php_settings[php_tmp_dir],
-            cgi_type         => 'php',
-            cgi_type_options => delete($real_php_settings, php_tmp_dir),
-            owner            => $run_uid,
-            group            => $run_gid,
-            notify           => Service['apache'],
-          }
-        }
-        default: { include ::php }
       }
-    }
-
-    ::apache::vhost::phpdirs{"${name}":
-        ensure => $ensure,
-        php_upload_tmp_dir => $real_php_settings[upload_tmp_dir],
-        php_session_save_path => $real_php_settings['session.save_path'],
-        documentroot_owner => $documentroot_owner,
-        documentroot_group => $documentroot_group,
-        documentroot_mode => $documentroot_mode,
-        run_mode => $run_mode,
-        run_uid => $run_uid,
-    }
-
-    # create vhost configuration file
-    ::apache::vhost{$name:
-        ensure => $ensure,
-        path => $path,
-        path_is_webdir => $path_is_webdir,
-        vhost_mode => $vhost_mode,
-        template_partial => $template_partial,
-        vhost_source => $vhost_source,
-        vhost_destination => $vhost_destination,
-        domain => $domain,
-        domainalias => $domainalias,
-        server_admin => $server_admin,
-        logmode => $logmode,
-        logpath => $logpath,
-        run_mode => $run_mode,
-        run_uid => $run_uid,
-        run_gid => $run_gid,
-        allow_override => $allow_override,
-        do_includes => $do_includes,
-        options => $options,
-        additional_options => $additional_options,
-        default_charset => $default_charset,
-        php_settings => $real_php_settings,
-        php_options => $real_php_options,
-        ssl_mode => $ssl_mode,
-        htpasswd_file => $htpasswd_file,
-        htpasswd_path => $htpasswd_path,
-        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 => 'php',
-    }
+      default: { include ::php }
+    }
+  }
+
+  ::apache::vhost::phpdirs{$name:
+    ensure                => $ensure,
+    php_upload_tmp_dir    => $real_php_settings[upload_tmp_dir],
+    php_session_save_path => $real_php_settings['session.save_path'],
+    documentroot_owner    => $documentroot_owner,
+    documentroot_group    => $documentroot_group,
+    documentroot_mode     => $documentroot_mode,
+    run_mode              => $run_mode,
+    run_uid               => $run_uid,
+  }
+
+  # create vhost configuration file
+  ::apache::vhost{$name:
+    ensure                          => $ensure,
+    path                            => $path,
+    path_is_webdir                  => $path_is_webdir,
+    vhost_mode                      => $vhost_mode,
+    template_partial                => $template_partial,
+    vhost_source                    => $vhost_source,
+    vhost_destination               => $vhost_destination,
+    domain                          => $domain,
+    domainalias                     => $domainalias,
+    server_admin                    => $server_admin,
+    logmode                         => $logmode,
+    logpath                         => $logpath,
+    run_mode                        => $run_mode,
+    run_uid                         => $run_uid,
+    run_gid                         => $run_gid,
+    allow_override                  => $allow_override,
+    do_includes                     => $do_includes,
+    options                         => $options,
+    additional_options              => $additional_options,
+    default_charset                 => $default_charset,
+    php_settings                    => $real_php_settings,
+    php_options                     => $real_php_options,
+    ssl_mode                        => $ssl_mode,
+    htpasswd_file                   => $htpasswd_file,
+    htpasswd_path                   => $htpasswd_path,
+    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               => 'php',
+  }
 }
 
diff --git a/manifests/vhost/static.pp b/manifests/vhost/static.pp
index f1dbcc2..a315e05 100644
--- a/manifests/vhost/static.pp
+++ b/manifests/vhost/static.pp
@@ -13,70 +13,70 @@
 #    - true: activate mod_security
 #
 define apache::vhost::static(
-    $ensure = present,
-    $domain = 'absent',
-    $domainalias = 'absent',
-    $server_admin = 'absent',
-    $logmode = 'default',
-    $path = 'absent',
-    $owner = root,
-    $group = apache,
-    $documentroot_owner = apache,
-    $documentroot_group = 0,
-    $documentroot_mode = 0640,
-    $allow_override = 'None',
-    $do_includes = false,
-    $options = 'absent',
-    $additional_options = 'absent',
-    $default_charset = 'absent',
-    $ssl_mode = false,
-    $run_mode = 'normal',
-    $vhost_mode = 'template',
-    $template_partial = 'apache/vhosts/static/partial.erb',
-    $vhost_source = 'absent',
-    $vhost_destination = 'absent',
-    $htpasswd_file = 'absent',
-    $htpasswd_path = 'absent',
-    $mod_security = false,
-    $mod_security_relevantonly = true,
-    $mod_security_rules_to_disable = [],
-    $mod_security_additional_options = 'absent'
+    $ensure                           = present,
+    $domain                           = 'absent',
+    $domainalias                      = 'absent',
+    $server_admin                     = 'absent',
+    $logmode                          = 'default',
+    $path                             = 'absent',
+    $owner                            = root,
+    $group                            = apache,
+    $documentroot_owner               = apache,
+    $documentroot_group               = 0,
+    $documentroot_mode                = 0640,
+    $allow_override                   = 'None',
+    $do_includes                      = false,
+    $options                          = 'absent',
+    $additional_options               = 'absent',
+    $default_charset                  = 'absent',
+    $ssl_mode                         = false,
+    $run_mode                         = 'normal',
+    $vhost_mode                       = 'template',
+    $template_partial                 = 'apache/vhosts/static/partial.erb',
+    $vhost_source                     = 'absent',
+    $vhost_destination                = 'absent',
+    $htpasswd_file                    = 'absent',
+    $htpasswd_path                    = 'absent',
+    $mod_security                     = false,
+    $mod_security_relevantonly        = true,
+    $mod_security_rules_to_disable    = [],
+    $mod_security_additional_options  = 'absent'
 ){
     # create webdir
     ::apache::vhost::webdir{$name:
-        ensure => $ensure,
-        path => $path,
-        owner => $owner,
-        group => $group,
-        run_mode => $run_mode,
-        documentroot_owner => $documentroot_owner,
-        documentroot_group => $documentroot_group,
-        documentroot_mode => $documentroot_mode,
+        ensure              => $ensure,
+        path                => $path,
+        owner               => $owner,
+        group               => $group,
+        run_mode            => $run_mode,
+        documentroot_owner  => $documentroot_owner,
+        documentroot_group  => $documentroot_group,
+        documentroot_mode   => $documentroot_mode,
     }
 
     # create vhost configuration file
     ::apache::vhost{$name:
-        ensure => $ensure,
-        path => $path,
-        template_partial => $template_partial,
-        vhost_mode => $vhost_mode,
-        vhost_source => $vhost_source,
-        vhost_destination => $vhost_destination,
-        domain => $domain,
-        domainalias => $domainalias,
-        server_admin => $server_admin,
-        logmode => $logmode,
-        allow_override => $allow_override,
-        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,
-        mod_security => $mod_security,
-        mod_security_relevantonly => $mod_security_relevantonly,
-        mod_security_rules_to_disable => $mod_security_rules_to_disable,
+        ensure                          => $ensure,
+        path                            => $path,
+        template_partial                => $template_partial,
+        vhost_mode                      => $vhost_mode,
+        vhost_source                    => $vhost_source,
+        vhost_destination               => $vhost_destination,
+        domain                          => $domain,
+        domainalias                     => $domainalias,
+        server_admin                    => $server_admin,
+        logmode                         => $logmode,
+        allow_override                  => $allow_override,
+        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,
+        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,
     }
 }
diff --git a/manifests/vhost/webdav.pp b/manifests/vhost/webdav.pp
index 003a308..5570dcc 100644
--- a/manifests/vhost/webdav.pp
+++ b/manifests/vhost/webdav.pp
@@ -24,100 +24,100 @@
 #   - semianonym: Don't log ips for CustomLog, log normal ErrorLog
 #
 define apache::vhost::webdav(
-    $ensure = present,
-    $domain = 'absent',
-    $domainalias = 'absent',
-    $server_admin = 'absent',
-    $path = 'absent',
-    $owner = root,
-    $group = apache,
-    $manage_webdir = true,
-    $path_is_webdir = false,
-    $logmode = 'default',
-    $logpath = 'absent',
-    $documentroot_owner = apache,
-    $documentroot_group = 0,
-    $documentroot_mode = 0640,
-    $run_mode = 'normal',
-    $run_uid = 'absent',
-    $run_gid = 'absent',
-    $options = 'absent',
-    $additional_options = 'absent',
-    $default_charset = 'absent',
-    $mod_security = false,
-    $mod_security_relevantonly = true,
-    $mod_security_rules_to_disable = [],
-    $mod_security_additional_options = 'absent',
-    $ssl_mode = false,
-    $vhost_mode = 'template',
-    $vhost_source = 'absent',
-    $vhost_destination = 'absent',
-    $htpasswd_file = 'absent',
-    $htpasswd_path = 'absent',
-    $ldap_auth = false,
-    $ldap_user = 'any',
-    $dav_db_dir = 'absent'
+    $ensure                           = present,
+    $domain                           = 'absent',
+    $domainalias                      = 'absent',
+    $server_admin                     = 'absent',
+    $path                             = 'absent',
+    $owner                            = root,
+    $group                            = apache,
+    $manage_webdir                    = true,
+    $path_is_webdir                   = false,
+    $logmode                          = 'default',
+    $logpath                          = 'absent',
+    $documentroot_owner               = apache,
+    $documentroot_group               = 0,
+    $documentroot_mode                = 0640,
+    $run_mode                         = 'normal',
+    $run_uid                          = 'absent',
+    $run_gid                          = 'absent',
+    $options                          = 'absent',
+    $additional_options               = 'absent',
+    $default_charset                  = 'absent',
+    $mod_security                     = false,
+    $mod_security_relevantonly        = true,
+    $mod_security_rules_to_disable    = [],
+    $mod_security_additional_options  = 'absent',
+    $ssl_mode                         = false,
+    $vhost_mode                       = 'template',
+    $vhost_source                     = 'absent',
+    $vhost_destination                = 'absent',
+    $htpasswd_file                    = 'absent',
+    $htpasswd_path                    = 'absent',
+    $ldap_auth                        = false,
+    $ldap_user                        = 'any',
+    $dav_db_dir                       = 'absent'
 ){
-    ::apache::vhost::davdbdir{$name:
-        ensure => $ensure,
-        dav_db_dir => $dav_db_dir,
-        documentroot_owner => $documentroot_owner,
-        documentroot_group => $documentroot_group,
-        documentroot_mode => $documentroot_mode,
-        run_mode => $run_mode,
-        run_uid => $run_uid,
-    }
+  ::apache::vhost::davdbdir{$name:
+    ensure              => $ensure,
+    dav_db_dir          => $dav_db_dir,
+    documentroot_owner  => $documentroot_owner,
+    documentroot_group  => $documentroot_group,
+    documentroot_mode   => $documentroot_mode,
+    run_mode            => $run_mode,
+    run_uid             => $run_uid,
+  }
 
-    if $manage_webdir {
-        # create webdir
-        ::apache::vhost::webdir{$name:
-            ensure => $ensure,
-            path => $path,
-            owner => $owner,
-            group => $group,
-            run_mode => $run_mode,
-            documentroot_owner => $documentroot_owner,
-            documentroot_group => $documentroot_group,
-            documentroot_mode => $documentroot_mode,
-        }
+  if $manage_webdir {
+    # create webdir
+    ::apache::vhost::webdir{$name:
+      ensure              => $ensure,
+      path                => $path,
+      owner               => $owner,
+      group               => $group,
+      run_mode            => $run_mode,
+      documentroot_owner  => $documentroot_owner,
+      documentroot_group  => $documentroot_group,
+      documentroot_mode   => $documentroot_mode,
     }
+  }
 
-    if $run_mode == 'static-itk' {
-      notice("static-itk mode is not possible for webdav vhosts, rewriting it to proxy-itk")
-      $real_run_mode = 'proxy-itk'
-    } else {
-      $real_run_mode = $run_mode
-    }
+  if $run_mode == 'static-itk' {
+    notice("static-itk mode is not possible for webdav vhosts, rewriting it to proxy-itk")
+    $real_run_mode = 'proxy-itk'
+  } else {
+    $real_run_mode = $run_mode
+  }
 
-    # create vhost configuration file
-    ::apache::vhost{$name:
-        ensure => $ensure,
-        path => $path,
-        path_is_webdir => $path_is_webdir,
-        logpath => $logpath,
-        logmode => $logmode,
-        template_partial => 'apache/vhosts/webdav/partial.erb',
-        vhost_mode => $vhost_mode,
-        vhost_source => $vhost_source,
-        vhost_destination => $vhost_destination,
-        domain => $domain,
-        domainalias => $domainalias,
-        server_admin => $server_admin,
-        run_mode => $real_run_mode,
-        run_uid => $run_uid,
-        run_gid => $run_gid,
-        options => $options,
-        additional_options => $additional_options,
-        default_charset => $default_charset,
-        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,
-    }
+  # create vhost configuration file
+  ::apache::vhost{$name:
+    ensure                          => $ensure,
+    path                            => $path,
+    path_is_webdir                  => $path_is_webdir,
+    logpath                         => $logpath,
+    logmode                         => $logmode,
+    template_partial                => 'apache/vhosts/webdav/partial.erb',
+    vhost_mode                      => $vhost_mode,
+    vhost_source                    => $vhost_source,
+    vhost_destination               => $vhost_destination,
+    domain                          => $domain,
+    domainalias                     => $domainalias,
+    server_admin                    => $server_admin,
+    run_mode                        => $real_run_mode,
+    run_uid                         => $run_uid,
+    run_gid                         => $run_gid,
+    options                         => $options,
+    additional_options              => $additional_options,
+    default_charset                 => $default_charset,
+    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,
+  }
 }
 
diff --git a/manifests/vhost/webdir.pp b/manifests/vhost/webdir.pp
index 507ab25..1e663e5 100644
--- a/manifests/vhost/webdir.pp
+++ b/manifests/vhost/webdir.pp
@@ -1,15 +1,15 @@
 # create webdir
 define apache::vhost::webdir(
-  $ensure = present,
-  $path = 'absent',
-  $owner = root,
-  $group = apache,
-  $mode = 0640,
-  $run_mode = 'normal',
-  $manage_docroot = true,
-  $documentroot_owner = root,
-  $documentroot_group = apache,
-  $documentroot_mode = 0640,
+  $ensure               = present,
+  $path                 = 'absent',
+  $owner                = root,
+  $group                = apache,
+  $mode                 = 0640,
+  $run_mode             = 'normal',
+  $manage_docroot       = true,
+  $documentroot_owner   = root,
+  $documentroot_group   = apache,
+  $documentroot_mode    = 0640,
   $documentroot_recurse = false
 ){
   $real_path = $path ? {