diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-06-02 17:49:17 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-06-02 17:49:17 -0300 |
| commit | 2f93ac4ad08c6152463beecd5dec109da00bdda6 (patch) | |
| tree | d35a579f5f5b04b940a5ef6a4221097ce907a173 | |
| parent | 8276c5e947953786945de7c6dbd2898e962cf402 (diff) | |
| download | puppet-puppet-2f93ac4ad08c6152463beecd5dec109da00bdda6.tar.gz puppet-puppet-2f93ac4ad08c6152463beecd5dec109da00bdda6.tar.bz2 | |
Use 'git' instead of 'gitolite' user
| -rw-r--r-- | files/sudoers | 2 | ||||
| -rw-r--r-- | manifests/repo.pp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/files/sudoers b/files/sudoers index 71b8ab8..6236cbf 100644 --- 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 30c31dd..1321d1b 100644 --- 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, |