extending apache and webhosting modules for joomla. extending git module with clone

2 files changed, 122 insertions, 1 deletions

diff --git a/manifests/defines/vhost_files.pp b/manifests/defines/vhost_files.pp
index 29ddf49..612a0e6 100644
--- a/manifests/defines/vhost_files.pp
+++ b/manifests/defines/vhost_files.pp
@@ -169,6 +169,7 @@ define apache::vhost::file(
 #   - 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*)
diff --git a/manifests/defines/vhost_varieties.pp b/manifests/defines/vhost_varieties.pp
index d2c5589..1fc7a91 100644
--- a/manifests/defines/vhost_varieties.pp
+++ b/manifests/defines/vhost_varieties.pp
@@ -9,7 +9,7 @@
 # - apache::vhost::modpython TODO
 # - apache::vhost::modrails TODO
 
-# vhost_mode: which option is choosed to deploy the vhost
+# 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)
 #   
@@ -165,6 +165,126 @@ define apache::vhost::php::standard(
 #          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(
+    $domain = 'absent',
+    $domainalias = 'absent',
+    $path = 'absent',
+    $owner = root,
+    $group = 0,
+    $documentroot_owner = apache,
+    $documentroot_group = 0,
+    $documentroot_mode = 0750,
+    $run_mode = 'normal',
+    $run_uid = 'absent',
+    $run_gid = 'absent',
+    $allow_override = 'None',
+    $upload_tmp_dir = 'absent',
+    $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'
+){
+    # php upload_tmp_diR
+    case $upload_tmp_dir {
+        'absent': {
+            include apache::defaultphpdirs
+            $real_upload_tmp_dir = "/var/www/upload_tmp_dir/$name"
+        }
+        default: { $real_upload_tmp_dir = $upload_tmp_dir }
+    }
+    # php session_save_path
+    case $session_save_path {
+        'absent': {
+            include apache::defaultphpdirs
+            $real_session_save_path = "/var/www/session.save_path/$name"
+        }
+        default: { $real_session_save_path = $session_save_path }
+    }
+    file{[$real_upload_tmp_dir, $real_session_save_path ]:
+        ensure => directory,
+        owner => $run_mode ? {
+            'itk' => $run_uid,
+            default => $documentroot_owner
+        },
+        group => $documentroot_group, 
+        mode => $documentroot_mode;
+    }
+
+    $real_path = $path ? {
+        'absent' => $operatingsystem ? {
+            openbsd => "/var/www/htdocs/${name}",
+            default => "/var/www/vhosts/${name}"
+        },
+        default => "${path}"
+    }
+    $documentroot = "${real_path}/www"
+
+    # create webdir
+    apache::vhost::webdir{$name:
+        path => $real_path,
+        owner => $owner,
+        group => $group,
+        documentroot_owner => $documentroot_owner,
+        documentroot_group => $documentroot_group,
+        documentroot_mode => $documentroot_mode,
+    }
+
+	git::clone{"git_clone_$name":
+		git_repo => "file:///e/gitrepos/joomla",
+    	projectroot => $documentroot
+	}
+
+    file{[
+        "$documentroot/components"
+        ,"$documentroot/dmdocuments"
+        ,"$documentroot/images"
+        ,"$documentroot/language"
+    ]:
+        ensure => directory,
+        mode => 0770;
+    }
+
+     
+    # create vhost configuration file
+    apache::vhost{$name:
+        path => $path,
+        template_mode => 'php_joomla',
+        vhost_mode => $vhost_mode,
+        vhost_source => $vhost_source,
+        vhost_destination => $vhost_destination,
+        domain => $domain,
+        domainalias => $domainalias,
+        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 => $real_upload_tmp_dir,
+        php_session_save_path => $real_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::modperl(
     $domain = 'absent',
     $domainalias = 'absent',