diff options
| -rw-r--r-- | manifests/nodes.pp | 1 | ||||
| -rw-r--r-- | modules/bugzilla/manifests/init.pp | 9 | ||||
| -rw-r--r-- | modules/bugzilla/templates/vhost_mageia.org.conf | 13 | ||||
| -rw-r--r-- | modules/bugzilla/templates/webapp_bugzilla.conf | 35 |
4 files changed, 58 insertions, 0 deletions
diff --git a/manifests/nodes.pp b/manifests/nodes.pp index b758d5f2..96070733 100644 --- a/manifests/nodes.pp +++ b/manifests/nodes.pp @@ -53,6 +53,7 @@ node alamut { include mga-mirrors include epoll include transifex + include bugzilla } # buildnode diff --git a/modules/bugzilla/manifests/init.pp b/modules/bugzilla/manifests/init.pp index 4e2a70bd..c50a91c7 100644 --- a/modules/bugzilla/manifests/init.pp +++ b/modules/bugzilla/manifests/init.pp @@ -23,5 +23,14 @@ class bugzilla { mode => 644, content => template("bugzilla/params") } + + include apache::mod_fcgid + apache::webapp_other{"bugzilla": + webapp_file => "bugzilla/webapp_bugzilla.conf", + } + + apache::vhost_other_app { "bugs.$domain": + vhost_file => "bugzilla/vhost_bugs.mageia.org.conf", + } } diff --git a/modules/bugzilla/templates/vhost_mageia.org.conf b/modules/bugzilla/templates/vhost_mageia.org.conf new file mode 100644 index 00000000..625fb666 --- /dev/null +++ b/modules/bugzilla/templates/vhost_mageia.org.conf @@ -0,0 +1,13 @@ +<% +path_data_directory = "/usr/lib" + ( architecture == "x86_64" ? '64' : '') + "/bugzilla" +%> + +<VirtualHost *:80> + ServerName bugs.mageia.org + DocumentRoot /usr/share/bugzilla/www + Alias /bugzilla/data <%= path_data_directory %> + Alias /bugzilla /usr/share/bugzilla/www + <Location /> + Allow from all + </Location> +</VirtualHost> diff --git a/modules/bugzilla/templates/webapp_bugzilla.conf b/modules/bugzilla/templates/webapp_bugzilla.conf new file mode 100644 index 00000000..6f22eed0 --- /dev/null +++ b/modules/bugzilla/templates/webapp_bugzilla.conf @@ -0,0 +1,35 @@ +<% +path_data_directory = "/usr/lib" + ( architecture == "x86_64" ? '64' : '') + "/bugzilla" +%> + +<Directory /usr/share/bugzilla/www> + Order allow,deny + Allow from all + + Options ExecCGI + DirectoryIndex index.cgi +</Directory> + +# The duplicates.rdf must be accessible, as it is used by +# duplicates.xul +<Directory <%= path_data_directory %>> + <Files duplicates.rdf> + Order allow,deny + Allow from all + </Files> +</Directory> + +# The dot files must be accessible to the public webdot server +# The png files locally created locally must be accessible +<Directory <%= path_data_directory %>/webdot> + <FilesMatch \.dot$> + Order deny,allow + Deny from all + Allow from research.att.com + </FilesMatch> + + <FilesMatch \.png$> + Order allow,deny + Allow from all + </FilesMatch> +</Directory> |