aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorDexter Morgan <dmorgan@mageia.org>2010-11-18 19:59:40 +0000
committerDexter Morgan <dmorgan@mageia.org>2010-11-18 19:59:40 +0000
commita3fada2b55b6ae09260012784af73f785e5b9834 (patch)
treea334c3789108fdab8bd1cbe7db11e03ea23decbd /modules
parent1d16a82d8fd7c752ad5319db7ee5f0260999bf58 (diff)
downloadpuppet-a3fada2b55b6ae09260012784af73f785e5b9834.tar
puppet-a3fada2b55b6ae09260012784af73f785e5b9834.tar.gz
puppet-a3fada2b55b6ae09260012784af73f785e5b9834.tar.bz2
puppet-a3fada2b55b6ae09260012784af73f785e5b9834.tar.xz
puppet-a3fada2b55b6ae09260012784af73f785e5b9834.zip
Add vhost and webapps.d files for bugzilla
Diffstat (limited to 'modules')
-rw-r--r--modules/bugzilla/manifests/init.pp9
-rw-r--r--modules/bugzilla/templates/vhost_mageia.org.conf13
-rw-r--r--modules/bugzilla/templates/webapp_bugzilla.conf35
3 files changed, 57 insertions, 0 deletions
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>