diff options
author | mh <mh@immerda.ch> | 2009-05-22 23:45:40 +0200 |
---|---|---|
committer | mh <mh@immerda.ch> | 2009-05-22 23:45:40 +0200 |
commit | c2e26ab952c38900a4b5028f13a3e100206729de (patch) | |
tree | 10df21610731a1a6ac963b26e2b8dec3e97b767b /manifests/vhost/php | |
parent | 1f33a379f8f4b6ed59e4463526c54f6e069b7cb5 (diff) |
we create the instance rather in the webhosting module
Diffstat (limited to 'manifests/vhost/php')
-rw-r--r-- | manifests/vhost/php/mediawiki.pp | 35 |
1 files changed, 3 insertions, 32 deletions
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, |