Use 'git' instead of 'gitolite' user

diff --git a/files/sudoers b/files/sudoers
index 71b8ab81a620cb7c1d52a1a1fbc2abd2a002914b..6236cbf6c2d7cd83bb12651fb39aecfffbf33b5f 100644 (file)
--- a/files/sudoers
+++ b/files/sudoers
@@ -2,4 +2,4 @@
 Cmnd_Alias PUPPETUPDATE = /usr/local/sbin/update-puppet-conf.sh
 
 # User privilege specification
-gitolite ALL=(puppet) NOPASSWD:PUPPETUPDATE
+git ALL=(puppet) NOPASSWD:PUPPETUPDATE

diff --git a/manifests/repo.pp b/manifests/repo.pp
index 30c31dd170148a7da39ea1f8a2334f68f74aa9fd..1321d1b023b4a31a3301816c737e72afc872a0a9 100644 (file)
--- a/manifests/repo.pp
+++ b/manifests/repo.pp
@@ -9,15 +9,15 @@ class puppet::repo(
   exec { "make-puppet-repo":
     command => "/bin/sh -c 'mkdir -p /var/git/repositories/puppet.git && cd /var/git/repositories/puppet.git && git --bare init'",
     unless  => "/bin/sh -c '[ -e /var/git/repositories/puppet.git ]'",
-    user    => gitolite,
-    require => [ User['gitolite'], File['/var/git/repositories'] ],
+    user    => git,
+    require => [ User['git'], File['/var/git/repositories'] ],
   }
 
   # use a post-update hook
   file { '/var/git/repositories/puppet.git/hooks/post-update':
     mode    => 0750,
-    owner   => gitolite,
-    group   => gitolite,
+    owner   => git,
+    group   => git,
     ensure  => $method ? {
       'cron'  => absent,
       default => $ensure,