aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorOlivier Blin <blino@mageia.org>2010-11-25 11:46:30 +0000
committerOlivier Blin <blino@mageia.org>2010-11-25 11:46:30 +0000
commit01a3654078b903f649f1fc29790577a45d4daf18 (patch)
tree3c816d719ddaeb1c3578522f0cc8f33f6ee042ac /modules
parentecd21a040e8e6a2dc2dc577a2e0441b7856bfb9e (diff)
downloadpuppet-01a3654078b903f649f1fc29790577a45d4daf18.tar
puppet-01a3654078b903f649f1fc29790577a45d4daf18.tar.gz
puppet-01a3654078b903f649f1fc29790577a45d4daf18.tar.bz2
puppet-01a3654078b903f649f1fc29790577a45d4daf18.tar.xz
puppet-01a3654078b903f649f1fc29790577a45d4daf18.zip
add pkgsubmit vhost
Diffstat (limited to 'modules')
-rw-r--r--modules/buildsystem/manifests/init.pp4
-rw-r--r--modules/buildsystem/templates/vhost_pkgsubmit.conf13
2 files changed, 17 insertions, 0 deletions
diff --git a/modules/buildsystem/manifests/init.pp b/modules/buildsystem/manifests/init.pp
index eb85b6e8..9a271559 100644
--- a/modules/buildsystem/manifests/init.pp
+++ b/modules/buildsystem/manifests/init.pp
@@ -31,6 +31,10 @@ class buildsystem {
vhost_file => "buildsystem/vhost_repository.conf",
}
+ apache::vhost_other_app { "pkgsubmit.$domain":
+ vhost_file => "buildsystem/vhost_pkgsubmit.conf",
+ }
+
include scheduler
include gatherer
}
diff --git a/modules/buildsystem/templates/vhost_pkgsubmit.conf b/modules/buildsystem/templates/vhost_pkgsubmit.conf
new file mode 100644
index 00000000..e37f6f8d
--- /dev/null
+++ b/modules/buildsystem/templates/vhost_pkgsubmit.conf
@@ -0,0 +1,13 @@
+<%
+pkgsubmit_root = "/home/schedbot/uploads"
+%>
+
+<VirtualHost *:80>
+ ServerName pkgsubmit.<%= domain %>
+ DocumentRoot <%= pkgsubmit_root %>
+ Alias /uploads /home/schedbot/uploads
+ <Location />
+ Allow from all
+ Options Indexes
+ </Location>
+</VirtualHost>