diff options
author | Nicolas Vigier <boklm@mageia.org> | 2013-07-15 17:39:51 +0000 |
---|---|---|
committer | Nicolas Vigier <boklm@mageia.org> | 2013-07-15 17:39:51 +0000 |
commit | dc085412e762e5dfb7c8f8d5ce9e57de380a0ee2 (patch) | |
tree | 69a78162f469f3674d1b5548ec871b1aa6d1a7c2 | |
parent | 31fdf1de491aa3de5f5e207a193fba1041e834b4 (diff) | |
download | puppet-dc085412e762e5dfb7c8f8d5ce9e57de380a0ee2.tar puppet-dc085412e762e5dfb7c8f8d5ce9e57de380a0ee2.tar.gz puppet-dc085412e762e5dfb7c8f8d5ce9e57de380a0ee2.tar.bz2 puppet-dc085412e762e5dfb7c8f8d5ce9e57de380a0ee2.tar.xz puppet-dc085412e762e5dfb7c8f8d5ce9e57de380a0ee2.zip |
mgagit: add http://projects.mageia.org/ vhost
-rw-r--r-- | deployment/mgagit/manifests/init.pp | 9 | ||||
-rw-r--r-- | deployment/mgagit/templates/mgagit.conf | 1 |
2 files changed, 9 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 diff --git a/deployment/mgagit/templates/mgagit.conf b/deployment/mgagit/templates/mgagit.conf index 1d528e82..a818c93a 100644 --- a/deployment/mgagit/templates/mgagit.conf +++ b/deployment/mgagit/templates/mgagit.conf @@ -17,3 +17,4 @@ repos_config: - prefix: software gl_template: soft_repo git_url: file:///git/infrastructure/repositories/software.git +www_dir: <%= @vhostdir %> |