aboutsummaryrefslogtreecommitdiffstats
path: root/deployment/mgagit/manifests
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2013-07-15 17:39:51 +0000
committerNicolas Vigier <boklm@mageia.org>2013-07-15 17:39:51 +0000
commitdc085412e762e5dfb7c8f8d5ce9e57de380a0ee2 (patch)
tree69a78162f469f3674d1b5548ec871b1aa6d1a7c2 /deployment/mgagit/manifests
parent31fdf1de491aa3de5f5e207a193fba1041e834b4 (diff)
downloadpuppet-dc085412e762e5dfb7c8f8d5ce9e57de380a0ee2.tar
puppet-dc085412e762e5dfb7c8f8d5ce9e57de380a0ee2.tar.gz
puppet-dc085412e762e5dfb7c8f8d5ce9e57de380a0ee2.tar.bz2
puppet-dc085412e762e5dfb7c8f8d5ce9e57de380a0ee2.tar.xz
puppet-dc085412e762e5dfb7c8f8d5ce9e57de380a0ee2.zip
mgagit: add http://projects.mageia.org/ vhost
Diffstat (limited to 'deployment/mgagit/manifests')
-rw-r--r--deployment/mgagit/manifests/init.pp9
1 files changed, 8 insertions, 1 deletions
diff --git a/deployment/mgagit/manifests/init.pp b/deployment/mgagit/manifests/init.pp
index 86dd6907..7ad981d8 100644
--- a/deployment/mgagit/manifests/init.pp
+++ b/deployment/mgagit/manifests/init.pp
@@ -2,6 +2,7 @@ class mgagit(
$git_dir = '/git',
$ldap_server = 'ldap.mageia.org',
$binddn = 'uid=mgagit,ou=People,dc=mageia,dc=org',
+ $vhost = 'projects.mageia.org',
$bindpw
){
$git_login = 'git'
@@ -13,6 +14,7 @@ class mgagit(
$gitoliterc = "$git_homedir/.gitolite.rc"
$bindpwfile = '/etc/mgagit.secret'
$reposconf_dir = "${git_homedir}/repos-config"
+ $vhostdir = "$git_homedir/www"
package { ['mgagit', 'gitolite']:
ensure => installed,
@@ -38,7 +40,8 @@ class mgagit(
require => Package['mgagit'],
}
- file { [$gitolite_dir, $gitolite_keydir, $gitolite_confdir, $reposconf_dir]:
+ file { [$gitolite_dir, $gitolite_keydir, $gitolite_confdir,
+ $reposconf_dir, $vhostdir]:
ensure => directory,
owner => $git_login,
group => $git_login,
@@ -72,5 +75,9 @@ class mgagit(
ensure => 'link',
target => $git_dir,
}
+
+ apache::vhost::base { $vhost:
+ location => $vhostdir,
+ },
}
# vim: sw=2