From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 19 Jun 2015 21:13:11 +0000 (-0300)
Subject: Merge remote-tracking branch 'sarava/adapt-to-jessie'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=e6f1bc67ca9a86dce0b17eb624c103e8ea702d2b;p=puppet-git.git

Merge remote-tracking branch 'sarava/adapt-to-jessie'
---

e6f1bc67ca9a86dce0b17eb624c103e8ea702d2b
diff --cc manifests/gitolite.pp
index b04926b,e4e33d7..64220c1
--- a/manifests/gitolite.pp
+++ b/manifests/gitolite.pp
@@@ -34,10 -34,10 +34,10 @@@ class git::gitolite inherits git 
    package { "gitosis": ensure => purged }
  
    # ensures that the group exists
 -  group { "gitolite":
 +  group { "git":
      ensure    => present,
      allowdupe => false,
-     require   => Package["gitolite"],
+     require   => Package["gitolite3"],
    }
  
    # alters the user's home dir