From fbb3cb7dcd8406f085e80f3f11fa873b55bd5073 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Sun, 17 May 2009 22:27:05 +0200
Subject: extracted every define and class in it's own file

---
 manifests/defines/0-README           |   7 -
 manifests/defines/configuration.pp   | 168 --------
 manifests/defines/htpasswd.pp        |  36 --
 manifests/defines/modules.pp         |  63 ---
 manifests/defines/permissions.pp     |  36 --
 manifests/defines/vhost_files.pp     | 381 -----------------
 manifests/defines/vhost_varieties.pp | 798 -----------------------------------
 7 files changed, 1489 deletions(-)
 delete mode 100644 manifests/defines/0-README
 delete mode 100644 manifests/defines/configuration.pp
 delete mode 100644 manifests/defines/htpasswd.pp
 delete mode 100644 manifests/defines/modules.pp
 delete mode 100644 manifests/defines/permissions.pp
 delete mode 100644 manifests/defines/vhost_files.pp
 delete mode 100644 manifests/defines/vhost_varieties.pp

(limited to 'manifests/defines')

diff --git a/manifests/defines/0-README b/manifests/defines/0-README
deleted file mode 100644
index f72d971..0000000
--- a/manifests/defines/0-README
+++ /dev/null
@@ -1,7 +0,0 @@
-# This folder contains various defines to work with apache.
-# They are separated into various categories:
-# 
-# - modules: manage apache modules
-# - configuration: common configuration defines
-# - vhost files: deploy vhost configuration files
-# - vhost varieties: vhost varieties
diff --git a/manifests/defines/configuration.pp b/manifests/defines/configuration.pp
deleted file mode 100644
index 38b044c..0000000
--- a/manifests/defines/configuration.pp
+++ /dev/null
@@ -1,168 +0,0 @@
-# manifests/defines/configuration.pp
-
-### common configuration defines
-
-# deploy apache (.conf) configuration file (non-vhost)
-define apache::config::file(
-    $ensure = present,
-    $source = 'absent',
-    $content = 'absent',
-    $destination = 'absent'
-){
-    $real_destination = $destination ? {
-        'absent' => $operatingsystem ? {
-            centos => "$apache::centos::config_dir/conf.d/${name}",
-            gentoo => "$apache::gentoo::config_dir/${name}",
-            debian => "$apache::debian::config_dir/conf.d/${name}",
-            ubuntu => "$apache::ubuntu::config_dir/conf.d/${name}",
-            openbsd => "$apache::openbsd::config_dir/conf.d/${name}",
-            default => "/etc/apache2/${name}",
-        },
-        default => $destination
-    }
-    file{"apache_${name}":
-        ensure => $ensure,
-        path => $real_destination,
-        notify => Service[apache],
-        owner => root, group => 0, mode => 0644;
-    }
-    case $content {
-        'absent': {
-            $real_source = $source ? {
-                'absent' => [ 
-                    "puppet://$server/files/apache/conf.d/${fqdn}/${name}",
-                    "puppet://$server/files/apache/conf.d/${apache_cluster_node}/${name}",
-                    "puppet://$server/files/apache/conf.d/${operatingsystem}.${lsbdistcodename}/${name}",
-                    "puppet://$server/files/apache/conf.d/${operatingsystem}/${name}",
-                    "puppet://$server/files/apache/conf.d/${name}",
-                    "puppet://$server/apache/conf.d/${operatingsystem}.${lsbdistcodename}/${name}",
-                    "puppet://$server/apache/conf.d/${operatingsystem}/${name}",
-                    "puppet://$server/apache/conf.d/${name}"
-                ],
-                default => "puppet://$server/$source",
-            }
-            File["apache_${name}"]{
-                source => $real_source,
-            }
-        }
-        default: {
-            File["apache_${name}"]{
-                content => $content,
-            }
-        }
-    }
-    case $operatingsystem {
-        openbsd: { info("no package dependency on ${operatingsystem} for ${name}") }
-        default: {
-            File["apache_${name}"]{
-                require => Package[apache],
-            }
-        }
-    }
-}
-
-# create webdir
-define apache::vhost::webdir(
-    $ensure = present,
-    $path = 'absent',
-    $owner = root,
-    $group = apache,
-    $mode = 0640,
-    $run_mode = 'normal',
-    $documentroot_owner = root,
-    $documentroot_group = apache,
-    $documentroot_mode = 0640,
-    $documentroot_recurse = false
-){
-    $real_path = $path ? {
-        'absent' => $operatingsystem ? {
-            openbsd => "/var/www/htdocs/${name}",
-            default => "/var/www/vhosts/${name}"
-        },
-        default => "${path}"
-    }
-
-    if ($run_mode == 'itk') and ($mode == '0640'){
-      $real_mode = 0644
-    } else {
-      $real_mode = $mode
-    }
-
-    $documentroot = "${real_path}/www"
-    $logdir = "${real_path}/logs"
-
-    if $owner == 'apache' {
-      if $apache_default_user == '' {
-        $real_owner = $operatingsystem ? {
-          openbsd => 'www',
-          default => $owner
-        }
-      } else {
-        $real_owner = $apache_default_user
-      }
-    } else {
-        $real_owner = $owner
-    }
-    if $group == 'apache' {
-      if $apache_default_group == '' {
-        $real_group = $operatingsystem ? {
-          openbsd => 'www',
-          default => $group
-        }
-      } else {
-        $real_group = $apache_default_group
-      }
-    } else {
-      $real_group = $group
-    }
-
-    if $documentroot_owner == 'apache' {
-      if $apache_default_user == '' {
-        $real_documentroot_owner = $operatingsystem ? {
-          openbsd => 'www',
-          default => $documentroot_owner
-        }
-      } else {
-        $real_documentroot_owner = $apache_default_user
-      }
-    } else {
-        $real_documentroot_owner = $documentroot_owner
-    }
-    if $documentroot_group == 'apache' {
-      if $apache_default_group == '' {
-        $real_documentroot_group = $operatingsystem ? {
-          openbsd => 'www',
-          default => $documentroot_group
-        }
-      } else {
-        $real_documentroot_group = $apache_default_group
-      }
-    } else {
-      $real_documentroot_group = $documentroot_group
-    }
-    case $ensure {
-        absent: {
-            file{[ "$real_path", "$documentroot", "$logdir" ]:
-                ensure => absent,
-                purge => true,
-                recurse => true,
-                force => true,
-            }
-        }
-        default: {
-            file{"$real_path":
-                ensure => directory,
-                owner => $real_owner, group => $real_group, mode => $real_mode;
-            }
-            file{"$documentroot":
-                ensure => directory,
-                recurse => $documentroot_recurse,
-                owner => $real_documentroot_owner, group => $real_documentroot_group, mode => $documentroot_mode;
-            }
-            file{"$logdir":
-                ensure => directory,
-                owner => $real_documentroot_owner, group => $real_documentroot_group, mode => 770;
-            }
-        }
-    }
-}
diff --git a/manifests/defines/htpasswd.pp b/manifests/defines/htpasswd.pp
deleted file mode 100644
index 2994f81..0000000
--- a/manifests/defines/htpasswd.pp
+++ /dev/null
@@ -1,36 +0,0 @@
-# manifests/defines/htpasswd.pp
-
-# ToDo: This should be rewritten as native type
-define apache::htpasswd_user(
-    $ensure = present,
-    $site = 'absent',
-    $username = 'absent',
-    $password,
-    $password_iscrypted = false,
-    $ensure = 'present',
-    $path = 'absent'
-){
-    case $username {
-        'absent': { $real_username = $name }
-        default: { $real_username = $username }
-    } 
-    case $site {
-        'absent': { $real_site = $name }
-        default: { $real_site = $site }
-    } 
-    case $path {
-        'absent': { $real_path = "/var/www/htpasswds/${real_site}" }
-        default: { $real_path = $path }
-    }
-    if $password_iscrypted {
-        $real_password = $password 
-    } else {
-        $real_password = htpasswd_sha1($password) 
-    }
-
-    line{"htpasswd_for_${real_site}":
-        ensure => $ensure,
-        file => $real_path,
-        line => "${username}:${real_password}",
-    }
-}
diff --git a/manifests/defines/modules.pp b/manifests/defines/modules.pp
deleted file mode 100644
index b0f5941..0000000
--- a/manifests/defines/modules.pp
+++ /dev/null
@@ -1,63 +0,0 @@
-# manifests/defines/modules.pp
-
-### manage apache modules
-
-define apache::centos::module(
-    $ensure = present,
-    $source = '',
-    $destination = ''
-){
-    $modules_dir = "$apache::centos::config_dir/modules.d/"
-    $real_destination = $destination ? {
-        '' => "${modules_dir}/${name}.so",
-        default => $destination,
-    }
-    $real_source = $source ? {
-        ''  => [
-            "puppet://$server/files/apache/modules.d/${fqdn}/${name}.so",
-            "puppet://$server/files/apache/modules.d/${apache_cluster_node}/${name}.so",
-            "puppet://$server/files/apache/modules.d/${name}.so",
-            "puppet://$server/apache/modules.d/${operatingsystem}/${name}.so",
-            "puppet://$server/apache/modules.d/${name}.so"
-        ],
-        default => "puppet://$server/$source",
-    }
-    file{"modules_${name}.conf":
-        ensure => $ensure,
-        path => $real_destination,
-        source => $real_source,
-        require => [ File[modules_dir], Package[apache] ],
-        notify => Service[apache],
-        owner => root, group => 0, mode => 0755;
-    }
-}
-
-define apache::gentoo::module(
-    $ensure = present,
-    $source = '',
-    $destination = ''
-){
-    $modules_dir = "$apache::gentoo::config_dir/modules.d/"
-    $real_destination = $destination ? {
-        '' => "${modules_dir}/${name}.conf",
-        default => $destination,
-    }
-    $real_source = $source ? {
-        ''  => [
-            "puppet://$server/files/apache/modules.d/${fqdn}/${name}.conf",
-            "puppet://$server/files/apache/modules.d/${apache_cluster_node}/${name}.conf",
-            "puppet://$server/files/apache/modules.d/${name}.conf",
-            "puppet://$server/apache/modules.d/${operatingsystem}/${name}.conf",
-            "puppet://$server/apache/modules.d/${name}.conf"
-        ],
-        default => "puppet://$server/$source",
-    }
-    file{"modules_${name}.conf":
-        ensure => $ensure,
-        path => $real_destination,
-        source => $real_source,
-        require => [ File[modules_dir], Package[apache] ],
-        notify => Service[apache],
-        owner => root, group => 0, mode => 0644;
-    }
-}
diff --git a/manifests/defines/permissions.pp b/manifests/defines/permissions.pp
deleted file mode 100644
index 621a74a..0000000
--- a/manifests/defines/permissions.pp
+++ /dev/null
@@ -1,36 +0,0 @@
-define apache::file::rw(
-    $owner = root,
-    $group = 0,
-    $mode = 0660
-) {
-    apache::file{$name:
-        owner => $owner,
-        group => $group,
-        mode => $mode,
-    }
-}
-define apache::file::readonly(
-    $owner = root,
-    $group = 0,
-    $mode = 0640
-) {
-    apache::file{$name:
-        owner => $owner,
-        group => $group,
-        mode => $mode,
-    }
-}
-define apache::file(
-    $owner = root,
-    $group = 0,
-    $mode = 0640
-) {
-    file{$name:
-# as long as there are significant memory problems using
-# recurse we avoid it
-#        recurse => true,
-        backup => false,
-        checksum => undef,
-        owner => $owner, group => $group, mode => $mode;
-    }
-}
diff --git a/manifests/defines/vhost_files.pp b/manifests/defines/vhost_files.pp
deleted file mode 100644
index 6ed4fb3..0000000
--- a/manifests/defines/vhost_files.pp
+++ /dev/null
@@ -1,381 +0,0 @@
-# manifests/defines/vhost_files.pp
-
-### vhost configuration files
-#
-# deploy vhost configuration files
-
-
-# this is a wrapper for apache::vhost::file and avhost::template below
-#
-# vhost_mode: which option is choosed to deploy the vhost
-#   - template: generate it from a template (default)
-#   - file: deploy a vhost file (apache::vhost::file will be called directly)
-#   
-define apache::vhost(
-    $ensure = present,
-    $path = 'absent',
-    $path_is_webdir = false,
-    $template_mode = 'static',
-    $vhost_mode = 'template',
-    $vhost_source = 'absent',
-    $vhost_destination = 'absent',
-    $content = 'absent',
-    $domain = 'absent',
-    $domainalias = 'absent',
-    $server_admin = 'absent',
-    $allow_override = 'None',
-    $php_upload_tmp_dir = 'absent',
-    $php_session_save_path = 'absent',
-    $cgi_binpath = 'absent',
-    $default_charset = 'absent',
-    $do_includes = false,
-    $options = 'absent',
-    $additional_options = 'absent',
-    $run_mode = 'normal',
-    $run_uid = 'absent',
-    $run_gid = 'absent',
-    $template_mode = 'static',
-    $ssl_mode = false,
-    $htpasswd_file = 'absent',
-    $htpasswd_path = 'absent',
-    $mod_security = true,
-    $ldap_auth = false,
-    $ldap_user = 'any'
-) {
-    # file or template mode?
-    case $vhost_mode {
-        'file': {
-            apache::vhost::file{$name:
-                ensure => $ensure,
-                vhost_source => $vhost_source,
-                vhost_destination => $vhost_destination,
-                do_includes => $do_includes,
-                htpasswd_file => $htpasswd_file,
-                htpasswd_path => $htpasswd_path,
-            }
-        }
-        'template': {
-            apache::vhost::template{$name:
-                ensure => $ensure,
-                path => $path,
-                path_is_webdir => $path_is_webdir,
-                domain => $domain,
-                domainalias => $domainalias,
-                server_admin => $server_admin,
-                php_upload_tmp_dir => $php_upload_tmp_dir,
-                php_session_save_path => $php_session_save_path,
-                cgi_binpath => $cgi_binpath,
-                allow_override => $allow_override,
-                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,
-                template_mode => $template_mode,
-                ssl_mode => $ssl_mode,
-                htpasswd_file => $htpasswd_file,
-                htpasswd_path => $htpasswd_path,
-                ldap_auth => $ldap_auth,
-                ldap_user => $ldap_user,
-                mod_security => $mod_security,
-            }
-        }
-        default: { fail("no such vhost_mode: $vhost_mode defined for $name.") }
-    }
-    
-}
-
-# htpasswd_file: wether to deploy a passwd for this vhost or not
-#   - absent: ignore (default)
-#   - nodeploy: htpasswd file isn't deployed by this mechanism
-#   - else: try to deploy the file
-#
-# htpasswd_path: where to deploy the passwd file
-#   - absent: standardpath (default)
-#   - else: path to deploy
-#
-define apache::vhost::file(
-    $ensure = present,
-    $vhost_source = 'absent',
-    $vhost_destination = 'absent',
-    $content = 'absent',
-    $do_includes = false,
-    $htpasswd_file = 'absent',
-    $htpasswd_path = 'absent'
-){
-    $vhosts_dir = $operatingsystem ? {
-        centos => "$apache::centos::config_dir/vhosts.d/",
-        gentoo => "$apache::gentoo::config_dir/vhosts.d/",
-        debian => "$apache::debian::config_dir/vhosts.d/",
-        ubuntu => "$apache::ubuntu::config_dir/vhosts.d/",
-        openbsd => "$apache::openbsd::config_dir/vhosts.d/",
-        default => '/etc/apache2/vhosts.d/',
-    }
-    $real_vhost_destination = $vhost_destination ? {
-        'absent' => "$vhosts_dir/$name.conf",
-        default => $vhost_destination,
-    } 
-    file{"${name}.conf":
-        ensure => $ensure,
-        path => $real_vhost_destination,
-        require => File[vhosts_dir],
-        notify => Service[apache],
-        owner => root, group => 0, mode => 0644;
-    }
-    if $do_includes {
-        include apache::includes 
-    }
-    case $content {
-        'absent': {
-            $real_vhost_source = $vhost_source ? {
-                'absent'  => [ 
-                    "puppet://$server/files/apache/vhosts.d/$fqdn/$name.conf",
-                    "puppet://$server/files/apache/vhosts.d/$apache_cluster_node/$name.conf",
-                    "puppet://$server/files/apache/vhosts.d/$operatingsystem.$lsbdistcodename/$name.conf",
-                    "puppet://$server/files/apache/vhosts.d/$operatingsystem/$name.conf",
-                    "puppet://$server/files/apache/vhosts.d/$name.conf", 
-                    "puppet://$server/apache/vhosts.d/$name.conf",
-                    "puppet://$server/apache/vhosts.d/$operatingsystem.$lsbdistcodename/$name.conf",
-                    "puppet://$server/apache/vhosts.d/$operatingsystem/$name.conf",
-                    "puppet://$server/apache/vhosts.d/$name.conf"
-                ],
-                default => "puppet://$server/$vhost_source",
-            }
-            File["${name}.conf"]{
-                source => $real_vhost_source,
-            }
-        }
-        default: {
-            File["${name}.conf"]{
-                content => $content,
-            }
-        }
-    }
-    case $htpasswd_file {
-        'absent','nodeploy': { info("don't deploy a htpasswd file for ${name") }
-        default: { 
-            if $htpasswd_path == 'absent' {
-                $real_htpasswd_path = "/var/www/htpasswds/$name"
-            } else {
-                $real_htpasswd_path = $htpasswd_path
-            }
-            file{$real_htpasswd_path:
-                ensure => $ensure,
-                source => [ "puppet://$server/files/apache/htpasswds/$fqdn/$name",
-                            "puppet://$server/files/apache/htpasswds/$apache_cluster_node/$name",
-                            "puppet://$server/files/apache/htpasswds/$name" ],
-                owner => root, group => 0, mode => 0644;
-            }
-        }
-    }
-}
-
-# template_mode:
-#   - php: for a default php application
-#   - static: for a static application (default)
-#   - perl: for a mod_perl application
-#   - php_joomla: for a joomla application
-#
-# domainalias:
-#   - absent: no domainalias is set (*default*)
-#   - www: domainalias is set to www.$domain
-#   - else: domainalias is set to that
-#
-# ssl_mode: wether this vhost supports ssl or not
-#   - false: don't enable ssl for this vhost (default)
-#   - true: enable ssl for this vhost
-#   - force: enable ssl and redirect non-ssl to ssl
-#
-define apache::vhost::template(
-    $ensure = present,
-    $path = 'absent',
-    $path_is_webdir = false,
-    $domain = 'absent',
-    $domainalias = 'absent',
-    $server_admin = 'absent',
-    $allow_override = 'None',
-    $php_upload_tmp_dir = 'absent',
-    $php_session_save_path = 'absent',
-    $cgi_binpath = 'absent',
-    $do_includes = false,
-    $options = 'absent',
-    $additional_options = 'absent',
-    $default_charset = 'absent',
-    $run_mode = 'normal',
-    $run_uid = 'absent',
-    $run_gid = 'absent',
-    $template_mode = 'static', 
-    $ssl_mode = false,
-    $mod_security = true,
-    $htpasswd_file = 'absent',
-    $htpasswd_path = 'absent',
-    $ldap_auth = false,
-    $ldap_user = 'any'
-){
-    $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 = "$real_path/logs"
-
-    $servername = $domain ? {
-        'absent' => $name,
-        default => $domain
-    }
-    $serveralias = $domainalias ? {
-        'absent' => '',
-        'www' => "www.${servername}",
-        default => $domainalias
-    }
-    if $htpasswd_path == 'absent' {
-      $real_htpasswd_path = "/var/www/htpasswds/$name"
-    } else {
-      $real_htpasswd_path = $htpasswd_path
-    }
-    case $run_mode {
-        'itk': {
-            case $run_uid {
-                'absent': { fail("you have to define run_uid for $name on $fqdn") }
-            }
-            case $run_gid {
-                'absent': { fail("you have to define run_gid for $name on $fqdn") }
-            }
-        }
-    }
-
-    # set default dirs for templates
-    # php upload_tmp_dir
-    case $php_upload_tmp_dir {
-        'absent': {
-            $real_php_upload_tmp_dir = "/var/www/upload_tmp_dir/$name"
-        }
-        default: { $real_php_upload_tmp_dir = $php_upload_tmp_dir }
-    }
-    # php session_save_path
-    case $php_session_save_path {
-        'absent': {
-            $real_php_session_save_path = "/var/www/session.save_path/$name"
-        }
-        default: { $real_php_session_save_path = $php_session_save_path }
-    }
-
-    apache::vhost::file{$name:
-        ensure => $ensure,
-        content => template("apache/vhosts/$template_mode/$operatingsystem.erb"),
-        do_includes => $do_includes,
-        htpasswd_file => $htpasswd_file,
-        htpasswd_path => $htpasswd_path,
-    }
-}
-
-
-define apache::vhost::file::documentrootfile(
-      $documentroot,
-      $filename,
-      $thedomain,
-      $owner='root',
-      $group='0',
-      $mode=440
-){
-    file{"$documentroot/$filename":
-        source  => [ "puppet://$server/files/apache/vhost_varieties/$fqdn/$thedomain/$filename",
-                    "puppet://$server/files/apache/vhost_varieties/$apache_cluster_node/$thedomain/$filename",
-                    "puppet://$server/files/apache/vhost_varieties/$operatingsystem.$lsbdistcodename/$thedomain/$filename",
-                    "puppet://$server/files/apache/vhost_varieties/$operatingsystem/$thedomain/$filename",
-                    "puppet://$server/files/apache/vhost_varieties/$thedomain/$filename",
-                    "puppet://$server/apache/vhost_varieties/$thedomain/$filename",
-                    "puppet://$server/apache/vhost_varieties/$operatingsystem.$lsbdistcodename/$thedomain/$filename",
-                    "puppet://$server/apache/vhost_varieties/$operatingsystem/$thedomain/$filename",
-                    "puppet://$server/apache/vhost_varieties/$thedomain/$filename"
-                   ],
-        ensure  => file,
-        require => Apache::Vhost::Webdir["$thedomain"],
-        owner => $owner, group => $group, mode => $mode;
-    }
-}
-
-define apache::vhost::file::documentrootdir(
-      $ensure = directory,
-      $documentroot,
-      $filename,
-      $thedomain,
-      $owner = 'root',
-      $group = '0',
-      $mode = 440
-){
-  file{"$documentroot/$filename":
-    require => Apache::Vhost::Webdir["$thedomain"],
-    owner => $owner, group => $group, mode => $mode;
-  }
-  if $ensure != 'absent' {
-    File["$documentroot/$filename"]{
-      ensure => directory,
-    }
-  } else {
-    File["$documentroot/$filename"]{
-      ensure => $ensure,
-    }
-  }
-}
-
-
-
-define apache::vhost::phpdirs(
-    $ensure = present,
-    $php_upload_tmp_dir = 'absent',
-    $php_session_save_path = 'absent',
-    $documentroot_owner = apache,
-    $documentroot_group = 0,
-    $documentroot_mode = 0750,
-    $run_mode = 'normal',
-    $run_uid = 'absent'
-){
-    # php upload_tmp_dir
-    case $php_upload_tmp_dir {
-        'absent': {
-            include apache::defaultphpdirs
-            $real_php_upload_tmp_dir = "/var/www/upload_tmp_dir/$name"
-        }
-        default: { $real_php_upload_tmp_dir = $php_upload_tmp_dir }
-    }
-    # php session_save_path
-    case $php_session_save_path {
-        'absent': {
-            include apache::defaultphpdirs
-            $real_php_session_save_path = "/var/www/session.save_path/$name"
-        }
-        default: { $real_php_session_save_path = $php_session_save_path }
-    }
-
-    case $ensure {
-        absent: {
-            file{[$real_php_upload_tmp_dir, $real_php_session_save_path ]:
-                ensure => absent,
-                purge => true,
-                force => true,
-                recurse => true,
-            }
-        }
-        default: {
-            file{[$real_php_upload_tmp_dir, $real_php_session_save_path ]:
-                ensure => directory,
-                owner => $run_mode ? {
-                    'itk' => $run_uid,
-                    default => $documentroot_owner
-                },
-                group => $documentroot_group, mode => $documentroot_mode;
-            }
-        }
-    }
-}
diff --git a/manifests/defines/vhost_varieties.pp b/manifests/defines/vhost_varieties.pp
deleted file mode 100644
index 6a6c988..0000000
--- a/manifests/defines/vhost_varieties.pp
+++ /dev/null
@@ -1,798 +0,0 @@
-# manifests/defines/vhost_varieties.pp
-
-### sepcific vhosts varieties
-#
-# - apache::vhost::static
-# - apache::vhost::php
-# - apache::vhost::joomla
-# - apache::vhost::wordpress
-# - apache::vhost::simplemachine
-# - apache::vhost::drubal
-# - apache::vhost::cgi TODO
-# - apache::vhost::modperl TODO
-# - apache::vhost::modpython TODO
-# - apache::vhost::modrails TODO
-# - apache::vhost::webdav
-# - apache::vhost::webapp (abstract)
-
-# vhost_mode: which option is chosen to deploy the vhost
-#   - template: generate it from a template (default)
-#   - file: deploy a vhost file (apache::vhost::file will be called directly)
-define apache::vhost::static(
-    $ensure = present,
-    $domain = 'absent',
-    $domainalias = 'absent',
-    $server_admin = 'absent',
-    $path = 'absent',
-    $owner = root,
-    $group = 0,
-    $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,
-    $vhost_mode = 'template',
-    $vhost_source = 'absent',
-    $vhost_destination = 'absent',
-    $htpasswd_file = 'absent',
-    $htpasswd_path = 'absent'
-){
-    # create webdir
-    apache::vhost::webdir{$name:
-        ensure => $ensure,
-        path => $path,
-        owner => $owner,
-        group => $group,
-        run_mode => 'normal',
-        documentroot_owner => $documentroot_owner,
-        documentroot_group => $documentroot_group,
-        documentroot_mode => $documentroot_mode,
-    }
-
-    # create vhost configuration file
-    apache::vhost{$name:
-        ensure => $ensure,
-        path => $path,
-        template_mode => 'static',
-        vhost_mode => $vhost_mode,
-        vhost_source => $vhost_source,
-        vhost_destination => $vhost_destination,
-        domain => $domain,
-        domainalias => $domainalias,
-        server_admin => $server_admin,
-        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 => false,
-    }
-}
-
-# run_mode:
-#   - normal: nothing special (*default*)
-#   - itk: apache is running with the itk module
-#          and run_uid and run_gid are used as vhost users
-# run_uid: the uid the vhost should run as with the itk module
-# run_gid: the gid the vhost should run as with the itk module
-define apache::vhost::php::standard(
-    $ensure = present,
-    $domain = 'absent',
-    $domainalias = 'absent',
-    $server_admin = 'absent',
-    $path = 'absent',
-    $template_mode = 'php',
-    $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_upload_tmp_dir = 'absent',
-    $php_session_save_path = 'absent',
-    $do_includes = false,
-    $options = 'absent',
-    $additional_options = 'absent',
-    $default_charset = 'absent',
-    $mod_security = true,
-    $ssl_mode = false,
-    $vhost_mode = 'template',
-    $vhost_source = 'absent',
-    $vhost_destination = 'absent',
-    $htpasswd_file = 'absent',
-    $htpasswd_path = 'absent'
-){
-
-    apache::vhost::phpdirs{"${name}":
-        ensure => $ensure,
-        php_upload_tmp_dir => $php_upload_tmp_dir,
-        php_session_save_path => $php_session_save_path,
-        documentroot_owner => $documentroot_owner,
-        documentroot_group => $documentroot_group,
-        documentroot_mode => $documentroot_mode,
-        run_mode => $run_mode,
-        run_uid => $run_uid,
-    }
-
-    # 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,
-    }
-
-    # create vhost configuration file
-    apache::vhost{$name:
-        ensure => $ensure,
-        path => $path,
-        template_mode => $template_mode,
-        vhost_mode => $vhost_mode,
-        vhost_source => $vhost_source,
-        vhost_destination => $vhost_destination,
-        domain => $domain,
-        domainalias => $domainalias,
-        server_admin => $server_admin,
-        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_upload_tmp_dir => $php_upload_tmp_dir,
-        php_session_save_path => $php_session_save_path,
-        ssl_mode => $ssl_mode,
-        htpasswd_file => $htpasswd_file,
-        htpasswd_path => $htpasswd_path,
-        mod_security => $mod_security,
-    }
-}
-
-# run_mode:
-#   - normal: nothing special (*default*)
-#   - itk: apache is running with the itk module
-#          and run_uid and run_gid are used as vhost users
-# run_uid: the uid the vhost should run as with the itk module
-# run_gid: the gid the vhost should run as with the itk module
-define apache::vhost::php::joomla(
-    $ensure = present,
-    $domain = 'absent',
-    $domainalias = 'absent',
-    $server_admin = 'absent',
-    $path = 'absent',
-    $owner = root,
-    $group = 0,
-    $documentroot_owner = apache,
-    $documentroot_group = 0,
-    $documentroot_mode = 0640,
-    $run_mode = 'normal',
-    $run_uid = 'absent',
-    $run_gid = 'absent',
-    $allow_override = 'None',
-    $php_upload_tmp_dir = 'absent',
-    $php_session_save_path = 'absent',
-    $do_includes = false,
-    $options = 'absent',
-    $additional_options = 'absent',
-    $default_charset = 'absent',
-    $mod_security = true,
-    $ssl_mode = false,
-    $vhost_mode = 'template',
-    $vhost_source = 'absent',
-    $vhost_destination = 'absent',
-    $htpasswd_file = 'absent',
-    $htpasswd_path = 'absent',
-    $manage_config = true,
-    $config_webwriteable = false,
-    $manage_directories = true
-){
-    include apache::joomla
-
-    $documentroot = $path ? {
-        'absent' => $operatingsystem ? {
-            openbsd => "/var/www/htdocs/${name}/www",
-            default => "/var/www/vhosts/${name}/www"
-        },
-        default => "${path}/www"
-    }
-
-    # create vhost configuration file
-    apache::vhost::php::webapp{$name:
-        ensure => $ensure,
-        domain => $domain,
-        domainalias => $domainalias,
-        server_admin => $server_admin,
-        path => $path,
-        template_mode => 'php_joomla',
-        owner => $owner,
-        group => $group,
-        documentroot_owner => $documentroot_owner,
-        documentroot_group => $documentroot_group,
-        documentroot_mode => $documentroot_mode,
-        run_mode => $run_mode,
-        run_uid => $run_uid,
-        run_gid => $run_gid,
-        allow_override => $allow_override,
-        php_upload_tmp_dir => $php_upload_tmp_dir,
-        php_session_save_path => $php_session_save_path,
-        do_includes => $do_includes,
-        options => $options,
-        additional_options => $additional_options,
-        default_charset => $default_charset,
-        mod_security => $mod_security,
-        ssl_mode => $ssl_mode,
-        vhost_mode => $vhost_mode,
-        vhost_source => $vhost_source,
-        vhost_destination => $vhost_destination,
-        htpasswd_file => $htpasswd_file,
-        htpasswd_path => $htpasswd_path,
-        manage_directories => $manage_directories,
-        managed_directories =>  [ "$documentroot/administrator/backups",
-                            "$documentroot/administrator/components",
-                            "$documentroot/administrator/language",
-                            "$documentroot/administrator/modules",
-                            "$documentroot/administrator/templates",
-                            "$documentroot/components",
-                            "$documentroot/images",
-                            "$documentroot/language",
-                            "$documentroot/media",
-                            "$documentroot/modules",
-                            "$documentroot/plugins",
-                            "$documentroot/templates",
-                            "$documentroot/cache",
-                            "$documentroot/administrator/cache" ],
-        manage_config => $manage_config,
-        config_webwriteable => $config_webwriteable,
-        config_file => 'configuration.php',
-    }
-
-}
-# run_mode:
-#   - normal: nothing special (*default*)
-#   - itk: apache is running with the itk module
-#          and run_uid and run_gid are used as vhost users
-# run_uid: the uid the vhost should run as with the itk module
-# run_gid: the gid the vhost should run as with the itk module
-define apache::vhost::php::wordpress(
-    $ensure = present,
-    $domain = 'absent',
-    $domainalias = 'absent',
-    $server_admin = 'absent',
-    $path = 'absent',
-    $owner = root,
-    $group = 0,
-    $documentroot_owner = apache,
-    $documentroot_group = 0,
-    $documentroot_mode = 0640,
-    $run_mode = 'normal',
-    $run_uid = 'absent',
-    $run_gid = 'absent',
-    $allow_override = 'FileInfo',
-    $php_upload_tmp_dir = 'absent',
-    $php_session_save_path = 'absent',
-    $do_includes = false,
-    $options = 'absent',
-    $additional_options = 'absent',
-    $default_charset = 'absent',
-    $mod_security = true,
-    $ssl_mode = false,
-    $vhost_mode = 'template',
-    $vhost_source = 'absent',
-    $vhost_destination = 'absent',
-    $htpasswd_file = 'absent',
-    $htpasswd_path = 'absent',
-    $manage_config = true,
-    $config_webwriteable = false,
-    $manage_directories = true
-){
-
-    $documentroot = $path ? {
-        'absent' => $operatingsystem ? {
-            openbsd => "/var/www/htdocs/${name}/www",
-            default => "/var/www/vhosts/${name}/www"
-        },
-        default => "${path}/www"
-    }
-
-    # create vhost configuration file
-    apache::vhost::php::webapp{$name:
-        ensure => $ensure,
-        domain => $domain,
-        domainalias => $domainalias,
-        server_admin => $server_admin,
-        path => $path,
-        template_mode => 'php_wordpress',
-        owner => $owner,
-        group => $group,
-        documentroot_owner => $documentroot_owner,
-        documentroot_group => $documentroot_group,
-        documentroot_mode => $documentroot_mode,
-        run_mode => $run_mode,
-        run_uid => $run_uid,
-        run_gid => $run_gid,
-        allow_override => $allow_override,
-        php_upload_tmp_dir => $php_upload_tmp_dir,
-        php_session_save_path => $php_session_save_path,
-        do_includes => $do_includes,
-        options => $options,
-        additional_options => $additional_options,
-        default_charset => $default_charset,
-        mod_security => $mod_security,
-        ssl_mode => $ssl_mode,
-        vhost_mode => $vhost_mode,
-        vhost_source => $vhost_source,
-        vhost_destination => $vhost_destination,
-        htpasswd_file => $htpasswd_file,
-        htpasswd_path => $htpasswd_path,
-        manage_directories => $manage_directories,
-        managed_directories => "$documentroot/wp-content",
-        manage_config => $manage_config,
-        config_webwriteable => $config_webwriteable,
-        config_file => 'wp-config.php',
-    }
-}
-
-# run_mode:
-#   - normal: nothing special (*default*)
-#   - itk: apache is running with the itk module
-#          and run_uid and run_gid are used as vhost users
-# run_uid: the uid the vhost should run as with the itk module
-# run_gid: the gid the vhost should run as with the itk module
-define apache::vhost::php::simplemachine(
-    $ensure = present,
-    $domain = 'absent',
-    $domainalias = 'absent',
-    $server_admin = 'absent',
-    $path = 'absent',
-    $owner = root,
-    $group = 0,
-    $documentroot_owner = apache,
-    $documentroot_group = 0,
-    $documentroot_mode = 0640,
-    $run_mode = 'normal',
-    $run_uid = 'absent',
-    $run_gid = 'absent',
-    $allow_override = 'None',
-    $php_upload_tmp_dir = 'absent',
-    $php_session_save_path = 'absent',
-    $do_includes = false,
-    $options = 'absent',
-    $additional_options = 'absent',
-    $default_charset = 'absent',
-    $mod_security = true,
-    $ssl_mode = false,
-    $vhost_mode = 'template',
-    $vhost_source = 'absent',
-    $vhost_destination = 'absent',
-    $htpasswd_file = 'absent',
-    $htpasswd_path = 'absent',
-    $manage_config = true,
-    $config_webwriteable = false,
-    $manage_directories = true
-){
-    $documentroot = $path ? {
-        'absent' => $operatingsystem ? {
-            openbsd => "/var/www/htdocs/${name}/www",
-            default => "/var/www/vhosts/${name}/www"
-        },
-        default => "${path}/www"
-    }
-
-    # create vhost configuration file
-    apache::vhost::php::webapp{$name:
-        ensure => $ensure,
-        domain => $domain,
-        domainalias => $domainalias,
-        server_admin => $server_admin,
-        path => $path,
-        template_mode => 'php_simplemachine',
-        owner => $owner,
-        group => $group,
-        documentroot_owner => $documentroot_owner,
-        documentroot_group => $documentroot_group,
-        documentroot_mode => $documentroot_mode,
-        run_mode => $run_mode,
-        run_uid => $run_uid,
-        run_gid => $run_gid,
-        allow_override => $allow_override,
-        php_upload_tmp_dir => $php_upload_tmp_dir,
-        php_session_save_path => $php_session_save_path,
-        do_includes => $do_includes,
-        options => $options,
-        additional_options => $additional_options,
-        default_charset => $default_charset,
-        mod_security => $mod_security,
-        ssl_mode => $ssl_mode,
-        vhost_mode => $vhost_mode,
-        vhost_source => $vhost_source,
-        vhost_destination => $vhost_destination,
-        htpasswd_file => $htpasswd_file,
-        htpasswd_path => $htpasswd_path,
-        manage_directories => $manage_directories,
-        managed_directories => [
-          "$documentroot/attachments",
-          "$documentroot/Packages",
-          "$documentroot/Themes",
-          "$documentroot/agreement.txt",
-          "$documentroot/Packages/installed.list",
-          "$documentroot/avatars" ],
-        manage_config => $manage_config,
-        config_webwriteable => $config_webwriteable,
-        config_file => 'Settings.php',
-    }
-}
-
-# run_mode:
-#   - normal: nothing special (*default*)
-#   - itk: apache is running with the itk module
-#          and run_uid and run_gid are used as vhost users
-# run_uid: the uid the vhost should run as with the itk module
-# run_gid: the gid the vhost should run as with the itk module
-define apache::vhost::php::drupal(
-    $ensure = present,
-    $domain = 'absent',
-    $domainalias = 'absent',
-    $server_admin = 'absent',
-    $path = 'absent',
-    $owner = root,
-    $group = 0,
-    $documentroot_owner = apache,
-    $documentroot_group = 0,
-    $documentroot_mode = 0640,
-    $run_mode = 'normal',
-    $run_uid = 'absent',
-    $run_gid = 'absent',
-    $allow_override = 'None',
-    $php_upload_tmp_dir = 'absent',
-    $php_session_save_path = 'absent',
-    $do_includes = false,
-    $options = 'absent',
-    $additional_options = 'absent',
-    $default_charset = 'absent',
-    $mod_security = true,
-    $ssl_mode = false,
-    $vhost_mode = 'template',
-    $vhost_source = 'absent',
-    $vhost_destination = 'absent',
-    $htpasswd_file = 'absent',
-    $htpasswd_path = 'absent',
-    $manage_cron = true
-){
-    $documentroot = $path ? {
-        'absent' => $operatingsystem ? {
-            openbsd => "/var/www/htdocs/${name}/www",
-            default => "/var/www/vhosts/${name}/www"
-        },
-        default => "${path}/www"
-    }
-
-    if $manage_cron {
-        file{"/etc/cron.d/drupal_cron_${name}":
-            content => "0   *   *   *   *   apache wget -O - -q -t 1 http://${doamin}/cron.php\n",
-            owner => root, group => 0, mode => 0644;
-        }
-    }
-
-    # create vhost configuration file
-    apache::vhost::php::webapp{$name:
-        ensure => $ensure,
-        domain => $domain,
-        domainalias => $domainalias,
-        server_admin => $server_admin,
-        path => $path,
-        template_mode => 'php_drupal',
-        owner => $owner,
-        group => $group,
-        documentroot_owner => $documentroot_owner,
-        documentroot_group => $documentroot_group,
-        documentroot_mode => $documentroot_mode,
-        run_mode => $run_mode,
-        run_uid => $run_uid,
-        run_gid => $run_gid,
-        allow_override => $allow_override,
-        php_upload_tmp_dir => $php_upload_tmp_dir,
-        php_session_save_path => $php_session_save_path,
-        do_includes => $do_includes,
-        options => $options,
-        additional_options => $additional_options,
-        default_charset => $default_charset,
-        mod_security => $mod_security,
-        ssl_mode => $ssl_mode,
-        vhost_mode => $vhost_mode,
-        vhost_source => $vhost_source,
-        vhost_destination => $vhost_destination,
-        htpasswd_file => $htpasswd_file,
-        htpasswd_path => $htpasswd_path,
-        manage_directories => false,
-        manage_config => false,
-    }
-}
-
-# Webdav vhost: to manage webdav accessible targets
-# run_mode:
-#   - normal: nothing special (*default*)
-#   - itk: apache is running with the itk module
-#          and run_uid and run_gid are used as vhost users
-# run_uid: the uid the vhost should run as with the itk module
-# run_gid: the gid the vhost should run as with the itk module
-define apache::vhost::webdav(
-    $ensure = present,
-    $domain = 'absent',
-    $domainalias = 'absent',
-    $server_admin = 'absent',
-    $path = 'absent',
-    $owner = root,
-    $group = 0,
-    $manage_webdir = true,
-    $path_is_webdir = false,
-    $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,
-    $ssl_mode = false,
-    $vhost_mode = 'template',
-    $vhost_source = 'absent',
-    $vhost_destination = 'absent',
-    $htpasswd_file = 'absent',
-    $htpasswd_path = 'absent',
-    $ldap_auth = false,
-    $ldap_user = 'any'
-){
-    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,
-        }
-    }
-    # create vhost configuration file
-    apache::vhost{$name:
-        ensure => $ensure,
-        path => $path,
-        path_is_webdir => $path_is_webdir,
-        template_mode => 'webdav',
-        vhost_mode => $vhost_mode,
-        vhost_source => $vhost_source,
-        vhost_destination => $vhost_destination,
-        domain => $domain,
-        domainalias => $domainalias,
-        server_admin => $server_admin,
-        run_mode => $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,
-    }
-}
-
-# run_mode:
-#   - normal: nothing special (*default*)
-#   - itk: apache is running with the itk module
-#          and run_uid and run_gid are used as vhost users
-# run_uid: the uid the vhost should run as with the itk module
-# run_gid: the gid the vhost should run as with the itk module
-define apache::vhost::modperl(
-    $ensure = present,
-    $domain = 'absent',
-    $domainalias = 'absent',
-    $server_admin = 'absent',
-    $path = 'absent',
-    $owner = root,
-    $group = 0,
-    $documentroot_owner = apache,
-    $documentroot_group = 0,
-    $documentroot_mode = 0640,
-    $run_mode = 'normal',
-    $run_uid = 'absent',
-    $run_gid = 'absent',
-    $allow_override = 'None',
-    $cgi_binpath = 'absent',
-    $do_includes = false,
-    $options = 'absent',
-    $additional_options = 'absent',
-    $default_charset = 'absent',
-    $mod_security = true,
-    $ssl_mode = false,
-    $vhost_mode = 'template',
-    $vhost_source = 'absent',
-    $vhost_destination = 'absent',
-    $htpasswd_file = 'absent',
-    $htpasswd_path = 'absent'
-){
-    # cgi_bin path
-    case $cgi_binpath {
-        'absent': {
-            $real_path = $path ? {
-                'absent' => $operatingsystem ? {
-                    openbsd => "/var/www/htdocs/${name}",
-                    default => "/var/www/vhosts/${name}"
-                },
-                default => "${path}"
-            }
-            $real_cgi_binpath = "${real_path}/cgi-bin"
-        }
-        default: { $real_cgi_binpath = $cgi_binpath }
-    }
-    file{$real_cgi_binpath:
-        ensure => directory,
-        owner => $documentroot_owner,
-        group => $documentroot_group,
-        mode => $documentroot_mode;
-    }
-
-    # 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,
-    }
-
-    # create vhost configuration file
-    apache::vhost{$name:
-        ensure => $ensure,
-        path => $path,
-        template_mode => 'perl',
-        vhost_mode => $vhost_mode,
-        vhost_source => $vhost_source,
-        vhost_destination => $vhost_destination,
-        domain => $domain,
-        domainalias => $domainalias,
-        server_admin => $server_admin,
-        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,
-        cgi_binpath => $real_cgi_binpath,
-        ssl_mode => $ssl_mode,
-        htpasswd_file => $htpasswd_file,
-        htpasswd_path => $htpasswd_path,
-        mod_security => $mod_security,
-    }
-}
-
-# run_mode:
-#   - normal: nothing special (*default*)
-#   - itk: apache is running with the itk module
-#          and run_uid and run_gid are used as vhost users
-# run_uid: the uid the vhost should run as with the itk module
-# run_gid: the gid the vhost should run as with the itk module
-define apache::vhost::php::webapp(
-    $ensure = present,
-    $domain = 'absent',
-    $domainalias = 'absent',
-    $server_admin = 'absent',
-    $path = 'absent',
-    $template_mode,
-    $owner = root,
-    $group = 0,
-    $documentroot_owner = apache,
-    $documentroot_group = 0,
-    $documentroot_mode = 0640,
-    $run_mode = 'normal',
-    $run_uid = 'absent',
-    $run_gid = 'absent',
-    $allow_override = 'None',
-    $php_upload_tmp_dir = 'absent',
-    $php_session_save_path = 'absent',
-    $do_includes = false,
-    $options = 'absent',
-    $additional_options = 'absent',
-    $default_charset = 'absent',
-    $mod_security = true,
-    $ssl_mode = false,
-    $vhost_mode = 'template',
-    $vhost_source = 'absent',
-    $vhost_destination = 'absent',
-    $htpasswd_file = 'absent',
-    $htpasswd_path = 'absent',
-    $manage_config = true,
-    $config_file = 'absent',
-    $config_webwriteable = false,
-    $manage_directories = true,
-    $managed_directories
-){
-    if ($ensure != 'absent') {
-        if $manage_directories {
-            apache::file::rw{ $managed_directories :
-                owner => $documentroot_owner,
-                group => $documentroot_group,
-            }
-        }
-
-        if $manage_config {
-            if $config_file == 'absent' { fail("No config file defined for ${name} on ${fqdn}, if you'd like to manage the config, you have to add one!") }
-            apache::vhost::file::documentrootfile{"configurationfile_${name}":
-                documentroot => $documentroot,
-                filename => $config_file,
-                thedomain => $name,
-                owner => $documentroot_owner,
-                group => $documentroot_group,
-            }
-            if $config_webwriteable {
-                Apache::Vhost::File::Documentrootfile["configurationfile_${name}"]{
-                    mode => 0660,
-                }
-            } else {
-                Apache::Vhost::File::Documentrootfile["configurationfile_${name}"]{
-                    mode => 0440,
-                }
-            }
-        }
-    }
-
-    # create vhost configuration file
-    apache::vhost::php::standard{$name:
-        ensure => $ensure,
-        domain => $domain,
-        domainalias => $domainalias,
-        server_admin => $server_admin,
-        path => $path,
-        template_mode => $template_mode,
-        owner => $owner,
-        group => $group,
-        documentroot_owner => $documentroot_owner,
-        documentroot_group => $documentroot_group,
-        documentroot_mode => $documentroot_mode,
-        run_mode => $run_mode,
-        run_uid => $run_uid,
-        run_gid => $run_gid,
-        allow_override => $allow_override,
-        php_upload_tmp_dir => $php_upload_tmp_dir,
-        php_session_save_path => $php_session_save_path,
-        do_includes => $do_includes,
-        options => $options,
-        additional_options => $additional_options,
-        default_charset => $default_charset,
-        mod_security => $mod_security,
-        ssl_mode => $ssl_mode,
-        vhost_mode => $vhost_mode,
-        vhost_source => $vhost_source,
-        vhost_destination => $vhost_destination,
-        htpasswd_file => $htpasswd_file,
-        htpasswd_path => $htpasswd_path,
-    }
-}
-- 
cgit v1.2.3