From c7c8436428e553f21e315e4dd14005980de7946d Mon Sep 17 00:00:00 2001 From: mh Date: Fri, 22 May 2009 23:35:54 +0200 Subject: we can now decide wether we'd like to manage webdir or the docroot, will be necessary for mediawiki stuff --- manifests/vhost/php/standard.pp | 9 +++++++-- manifests/vhost/php/webapp.pp | 4 ++++ manifests/vhost/webdir.pp | 5 ++++- 3 files changed, 15 insertions(+), 3 deletions(-) (limited to 'manifests/vhost') diff --git a/manifests/vhost/php/standard.pp b/manifests/vhost/php/standard.pp index 4e5873f..fcca6cd 100644 --- a/manifests/vhost/php/standard.pp +++ b/manifests/vhost/php/standard.pp @@ -10,6 +10,8 @@ define apache::vhost::php::standard( $domainalias = 'absent', $server_admin = 'absent', $path = 'absent', + $manage_webdir = true, + $manage_docroot = true, $template_mode = 'php', $owner = root, $group = apache, @@ -46,16 +48,19 @@ define apache::vhost::php::standard( run_uid => $run_uid, } - # create webdir - ::apache::vhost::webdir{$name: + 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, + } } # create vhost configuration file diff --git a/manifests/vhost/php/webapp.pp b/manifests/vhost/php/webapp.pp index 04fd29c..9989986 100644 --- a/manifests/vhost/php/webapp.pp +++ b/manifests/vhost/php/webapp.pp @@ -10,6 +10,8 @@ define apache::vhost::php::webapp( $domainalias = 'absent', $server_admin = 'absent', $path = 'absent', + $manage_webdir = true, + $manage_docroot = true, $template_mode, $owner = root, $group = 0, @@ -75,6 +77,8 @@ define apache::vhost::php::webapp( domainalias => $domainalias, server_admin => $server_admin, path => $path, + manage_webdir => $manage_webdir, + manage_docroot => $manage_docroot, template_mode => $template_mode, owner => $owner, group => $group, diff --git a/manifests/vhost/webdir.pp b/manifests/vhost/webdir.pp index b3b53f9..5f6a238 100644 --- a/manifests/vhost/webdir.pp +++ b/manifests/vhost/webdir.pp @@ -6,6 +6,7 @@ define apache::vhost::webdir( $group = apache, $mode = 0640, $run_mode = 'normal', + $manage_docroot = true, $documentroot_owner = root, $documentroot_group = apache, $documentroot_mode = 0640, @@ -91,10 +92,12 @@ define apache::vhost::webdir( ensure => directory, owner => $real_owner, group => $real_group, mode => $real_mode; } - file{"$documentroot": + if $manage_docroot { + file{"$documentroot": ensure => directory, recurse => $documentroot_recurse, owner => $real_documentroot_owner, group => $real_documentroot_group, mode => $documentroot_mode; + } } file{"$logdir": ensure => directory, -- cgit v1.2.3 From 1f33a379f8f4b6ed59e4463526c54f6e069b7cb5 Mon Sep 17 00:00:00 2001 From: mh Date: Fri, 22 May 2009 23:36:23 +0200 Subject: added a mediawiki vhost --- manifests/vhost/php/mediawiki.pp | 99 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 manifests/vhost/php/mediawiki.pp (limited to 'manifests/vhost') diff --git a/manifests/vhost/php/mediawiki.pp b/manifests/vhost/php/mediawiki.pp new file mode 100644 index 0000000..a3cf3c5 --- /dev/null +++ b/manifests/vhost/php/mediawiki.pp @@ -0,0 +1,99 @@ +# 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::mediawiki( + $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', + $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', + $image = 'absent', + $config = 'unmanaged', + $db_server = 'unmanaged', + $db_name = 'unmanaged', + $db_user = 'unmanaged', + $db_pwd = 'unmanaged', + $contact = 'unmanaged', + $sitename = 'unmanaged', + $secret_key = 'unmanaged', + $squid_servers = 'absent', + $exentions = 'absent', + $language = 'de', +){ + mediawiki::instance{$name: + path => $path, + image => $image, + config => $config, + db_server => $db_server, + db_name => $db_name, + db_user => $db_user, + db_pwd => $db_pwd, + contact => $contact, + sitename => $sitename, + secret_key => $secrect_key, + language => $language, + documentroot_owner => $documentroot_owner, + documentroot_group => $documentroot_group, + documentroot_mode => $documentroot_mode, + documentroot_write_mode => 0660, + } + + # create vhost configuration file + ::apache::vhost::php::webapp{$name: + ensure => $ensure, + domain => $domain, + domainalias => $domainalias, + server_admin => $server_admin, + path => $path, + manage_docroot = false, + template_mode => 'php_mediawiki', + 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, + 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, + } +} + -- cgit v1.2.3 From c2e26ab952c38900a4b5028f13a3e100206729de Mon Sep 17 00:00:00 2001 From: mh Date: Fri, 22 May 2009 23:45:40 +0200 Subject: we create the instance rather in the webhosting module --- manifests/vhost/php/mediawiki.pp | 35 +++-------------------------------- 1 file changed, 3 insertions(+), 32 deletions(-) (limited to 'manifests/vhost') diff --git a/manifests/vhost/php/mediawiki.pp b/manifests/vhost/php/mediawiki.pp index a3cf3c5..8cc91b1 100644 --- a/manifests/vhost/php/mediawiki.pp +++ b/manifests/vhost/php/mediawiki.pp @@ -10,6 +10,7 @@ define apache::vhost::php::mediawiki( $domainalias = 'absent', $server_admin = 'absent', $path = 'absent', + $manage_docroot = true, $owner = root, $group = 0, $documentroot_owner = apache, @@ -30,38 +31,8 @@ define apache::vhost::php::mediawiki( $vhost_source = 'absent', $vhost_destination = 'absent', $htpasswd_file = 'absent', - $htpasswd_path = 'absent', - $image = 'absent', - $config = 'unmanaged', - $db_server = 'unmanaged', - $db_name = 'unmanaged', - $db_user = 'unmanaged', - $db_pwd = 'unmanaged', - $contact = 'unmanaged', - $sitename = 'unmanaged', - $secret_key = 'unmanaged', - $squid_servers = 'absent', - $exentions = 'absent', - $language = 'de', + $htpasswd_path = 'absent' ){ - mediawiki::instance{$name: - path => $path, - image => $image, - config => $config, - db_server => $db_server, - db_name => $db_name, - db_user => $db_user, - db_pwd => $db_pwd, - contact => $contact, - sitename => $sitename, - secret_key => $secrect_key, - language => $language, - documentroot_owner => $documentroot_owner, - documentroot_group => $documentroot_group, - documentroot_mode => $documentroot_mode, - documentroot_write_mode => 0660, - } - # create vhost configuration file ::apache::vhost::php::webapp{$name: ensure => $ensure, @@ -69,7 +40,7 @@ define apache::vhost::php::mediawiki( domainalias => $domainalias, server_admin => $server_admin, path => $path, - manage_docroot = false, + manage_docroot = $manage_docroot, template_mode => 'php_mediawiki', owner => $owner, group => $group, -- cgit v1.2.3 From 61111f2a5206cf6bf56434f4ce776ebc467e9230 Mon Sep 17 00:00:00 2001 From: mh Date: Sun, 17 May 2009 22:48:17 +0200 Subject: fixing comment --- manifests/vhost/php/joomla.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'manifests/vhost') diff --git a/manifests/vhost/php/joomla.pp b/manifests/vhost/php/joomla.pp index 1294b52..21976ac 100644 --- a/manifests/vhost/php/joomla.pp +++ b/manifests/vhost/php/joomla.pp @@ -1,5 +1,5 @@ - -rmal: nothing special (*default*) +# 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 -- cgit v1.2.3 From aeb00010b88251661dcf4911d1a1f5a8dc99b522 Mon Sep 17 00:00:00 2001 From: Marcel Haerry Date: Tue, 19 May 2009 19:05:59 +0200 Subject: added gitweb vhost --- manifests/vhost/gitweb.pp | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 manifests/vhost/gitweb.pp (limited to 'manifests/vhost') diff --git a/manifests/vhost/gitweb.pp b/manifests/vhost/gitweb.pp new file mode 100644 index 0000000..ee9924a --- /dev/null +++ b/manifests/vhost/gitweb.pp @@ -0,0 +1,40 @@ +define apache::vhost::gitweb( + $ensure = present, + $domain = 'absent', + $domainalias = 'absent', + $server_admin = '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, + $htpasswd_file = 'absent', + $htpasswd_path = 'absent' +){ + # create vhost configuration file + ::apache::vhost{$name: + ensure => $ensure, + path => '/var/www/git', + path_is_webdir => true, + template_mode => 'gitweb', + 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, + } +} + -- cgit v1.2.3 From eac84749aec4251c38a252cf04eaa3a33adafe4d Mon Sep 17 00:00:00 2001 From: mh Date: Sat, 23 May 2009 01:29:13 +0200 Subject: fix typo --- manifests/vhost/php/mediawiki.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/vhost') diff --git a/manifests/vhost/php/mediawiki.pp b/manifests/vhost/php/mediawiki.pp index 8cc91b1..2a454d2 100644 --- a/manifests/vhost/php/mediawiki.pp +++ b/manifests/vhost/php/mediawiki.pp @@ -40,7 +40,7 @@ define apache::vhost::php::mediawiki( domainalias => $domainalias, server_admin => $server_admin, path => $path, - manage_docroot = $manage_docroot, + manage_docroot => $manage_docroot, template_mode => 'php_mediawiki', owner => $owner, group => $group, -- cgit v1.2.3 From 8e1961745bd0208f1c9d6d7a4fdc36f80df2314b Mon Sep 17 00:00:00 2001 From: mh Date: Sat, 23 May 2009 01:49:16 +0200 Subject: it's now possible to not pass managed directories to the webapp define --- manifests/vhost/php/webapp.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'manifests/vhost') diff --git a/manifests/vhost/php/webapp.pp b/manifests/vhost/php/webapp.pp index 9989986..d628dd8 100644 --- a/manifests/vhost/php/webapp.pp +++ b/manifests/vhost/php/webapp.pp @@ -39,10 +39,10 @@ define apache::vhost::php::webapp( $config_file = 'absent', $config_webwriteable = false, $manage_directories = true, - $managed_directories + $managed_directories = 'absent' ){ if ($ensure != 'absent') { - if $manage_directories { + if $manage_directories and ($managed_directories != 'absent') { ::apache::file::rw{ $managed_directories : owner => $documentroot_owner, group => $documentroot_group, -- cgit v1.2.3