Move common code to git::daemon

1 files changed, 2 insertions, 62 deletions

diff --git a/manifests/gitosis.pp b/manifests/gitosis.pp
index 2463ea0..168e2a2 100644
--- a/manifests/gitosis.pp
+++ b/manifests/gitosis.pp
@@ -2,52 +2,11 @@
 # git repositories.
 
 class git::gitosis inherits git {
-  # directory for gitosis user and repositories
-  file { "/var/git":
-    ensure => directory,
-    mode   => 0755,
-    owner  => git,
-    group  => git,
-  }
-
-  # repositories folder
-  file { "/var/git/repositories":
-    ensure  => directory,
-    owner   => git,
-    group   => git,
-    mode    => 0755,
-    recurse => false,
-  }
-
-  # symbolic link
-  file { "/var/cache/git":
-    ensure  => "/var/git/repositories",
-    force   => true,
-    backup  => false,
-    require => File['/var/git/repositories'],
-  }
-
   # the needed packages
   package { "gitosis": ensure => installed }
 
-  # ensures that the group exists
-  group { "git":
-    ensure    => present,
-    allowdupe => false,
-    require   => Package["gitosis"],
-  }
-
-  # alters the user's home dir
-  user { "git":
-    allowdupe => false,
-    comment   => "git repository hosting,,,",
-    ensure    => present,
-    home      => "/var/git",
-    shell     => "/bin/sh",
-    gid       => "git",
-    groups    => [ "puppet" ],
-    require   => Group["git"],
-  }
+  # make sure this is not installed
+  package { "gitolite": ensure => purged }
 
   # tries to get rid of ugly directory structure
   file { "/srv/gitosis":
@@ -64,23 +23,4 @@ class git::gitosis inherits git {
     backup => false,
     require => User["git"],
   }
-
-  # mass update script
-  file { "/usr/local/sbin/git-mass-update-server-info":
-    ensure => present,
-    owner  => root,
-    group  => root,
-    mode   => 0755,
-    source => "puppet:///modules/git/git-mass-update-server-info",
-  }
-
-  # mass update hourly
-  cron { "/usr/local/sbin/git-mass-update-server-info":
-    command  => "/usr/local/sbin/git-mass-update-server-info &> /dev/null",
-    user     => root,
-    hour     => "*/1",
-    minute   => "20",
-    ensure   => present,
-    require  => File['/usr/local/sbin/git-mass-update-server-info'],
-  }
 }