diff options
| -rw-r--r-- | deployment/mgagit/manifests/init.pp | 34 | ||||
| -rw-r--r-- | deployment/mgagit/manifests/tmpl.pp | 2 |
2 files changed, 18 insertions, 18 deletions
diff --git a/deployment/mgagit/manifests/init.pp b/deployment/mgagit/manifests/init.pp index 00ece81e..38cb201d 100644 --- a/deployment/mgagit/manifests/init.pp +++ b/deployment/mgagit/manifests/init.pp @@ -9,15 +9,15 @@ class mgagit( $git_homedir = "/var/lib/${git_login}" $gitolite_dir = "${git_homedir}/.gitolite" $gitolite_keydir = "${gitolite_dir}/keydir" - $gitolite_tmpldir = "/etc/mgagit/tmpl" + $gitolite_tmpldir = '/etc/mgagit/tmpl' $gitolite_confdir = "${gitolite_dir}/conf" $gitolite_hooksdir = "${gitolite_dir}/hooks" $gitolite_commonhooksdir = "${gitolite_hooksdir}/common" $gitolite_conf = "${gitolite_confdir}/gitolite.conf" - $gitoliterc = "$git_homedir/.gitolite.rc" + $gitoliterc = "${git_homedir}/.gitolite.rc" $bindpwfile = '/etc/mgagit.secret' $reposconf_dir = "${git_homedir}/repos-config" - $vhostdir = "$git_homedir/www" + $vhostdir = "${git_homedir}/www" package { ['mgagit', 'gitolite', 'python-bugz']: ensure => installed, @@ -43,7 +43,7 @@ class mgagit( require => Package['mgagit'], } - file { "$gitolite_commonhooksdir/git_multimail.py": + file { "${gitolite_commonhooksdir}/git_multimail.py": ensure => present, owner => $git_login, group => $git_login, @@ -52,7 +52,7 @@ class mgagit( require => File[$gitolite_commonhooksdir], } - file { "$gitolite_commonhooksdir/post-receive": + file { "${gitolite_commonhooksdir}/post-receive": ensure => present, owner => $git_login, group => $git_login, @@ -61,7 +61,7 @@ class mgagit( require => File[$gitolite_commonhooksdir], } - file { "$gitolite_commonhooksdir/post-update": + file { "${gitolite_commonhooksdir}/post-update": ensure => present, owner => $git_login, group => $git_login, @@ -77,12 +77,12 @@ class mgagit( mode => '0755', } - file { "$gitolite_tmpldir/group.gl": + file { "${gitolite_tmpldir}/group.gl": ensure => 'link', target => '/usr/share/mgagit/tmpl/group.gl', } - file { "$gitolite_tmpldir/repodef_repo.gl": + file { "${gitolite_tmpldir}/repodef_repo.gl": ensure => present, owner => root, group => root, @@ -92,24 +92,24 @@ class mgagit( mgagit::tmpl { 'artwork': tmpldir => $gitolite_tmpldir, - ml => 'atelier', + ml => 'atelier', } mgagit::tmpl { 'doc': tmpldir => $gitolite_tmpldir, - ml => 'atelier', # NB This is wrong, we should have a doc-commits@ ML (and thus remove this line) + ml => 'atelier', # NB This is wrong, we should have a doc-commits@ ML (and thus remove this line) } mgagit::tmpl { 'infrastructure': tmpldir => $gitolite_tmpldir, - group => 'sysadmin', - ml => 'sysadmin', + group => 'sysadmin', + ml => 'sysadmin', } mgagit::tmpl { 'org': tmpldir => $gitolite_tmpldir, - group => 'board', - ml => 'board', + group => 'board', + ml => 'board', } mgagit::tmpl { 'qa': @@ -118,12 +118,12 @@ class mgagit( mgagit::tmpl { 'soft': tmpldir => $gitolite_tmpldir, - group => 'packagers-committers', + group => 'packagers-committers', } mgagit::tmpl { 'web': tmpldir => $gitolite_tmpldir, - ml => 'atelier', + ml => 'atelier', } file { [$gitolite_dir, $gitolite_keydir, $gitolite_confdir, @@ -158,7 +158,7 @@ class mgagit( mode => '0755', } - file { "$git_homedir/repositories": + file { "${git_homedir}/repositories": ensure => 'link', target => $git_dir, } diff --git a/deployment/mgagit/manifests/tmpl.pp b/deployment/mgagit/manifests/tmpl.pp index 3ef10aaa..ef188ed2 100644 --- a/deployment/mgagit/manifests/tmpl.pp +++ b/deployment/mgagit/manifests/tmpl.pp @@ -1,5 +1,5 @@ define mgagit::tmpl($tmpldir, $group = $title, $ml = $title) { - file { "$tmpldir/${title}_repo.gl": + file { "${tmpldir}/${title}_repo.gl": ensure => present, owner => root, group => root, |