diff options
| -rw-r--r-- | modules/bugzilla/manifests/init.pp | 16 | ||||
| -rw-r--r-- | modules/bugzilla/templates/vhost_bugs.conf | 13 |
2 files changed, 13 insertions, 16 deletions
diff --git a/modules/bugzilla/manifests/init.pp b/modules/bugzilla/manifests/init.pp index 29b74adf..104aed69 100644 --- a/modules/bugzilla/manifests/init.pp +++ b/modules/bugzilla/manifests/init.pp @@ -46,11 +46,21 @@ class bugzilla { apache::webapp_other{"bugzilla": webapp_file => "bugzilla/webapp_bugzilla.conf", - } + } + + $bugs_vhost = "bugs.$domain" + $vhost_root = "/usr/share/bugzilla/www" - apache::vhost_other_app { "bugs.$domain": - vhost_file => "bugzilla/vhost_bugs.conf", + apache::redirect_ssl { "$bugs_vhost": } + + apache::vhost_base { "$bugs_vhost": + aliases => { "/bugzilla/data" => "$lib_dir/bugzilla", + "/bugzilla/" => $vhost_root }, + use_ssl => true, + location => $vhost_root, + vhost => $bugs_vhost, } + subversion::snapshot { $bugzilla_location: source => "svn://svn.mageia.org/svn/web/templates/bugzilla/trunk" } diff --git a/modules/bugzilla/templates/vhost_bugs.conf b/modules/bugzilla/templates/vhost_bugs.conf deleted file mode 100644 index 25306b1e..00000000 --- a/modules/bugzilla/templates/vhost_bugs.conf +++ /dev/null @@ -1,13 +0,0 @@ -<% -path_data_directory = lib_dir + "/bugzilla" -%> - -<VirtualHost *:80> - ServerName bugs.<%= domain %> - DocumentRoot /usr/share/bugzilla/www - Alias /bugzilla/data <%= path_data_directory %> - Alias /bugzilla /usr/share/bugzilla/www - <Location /> - Allow from all - </Location> -</VirtualHost> |