Drop gitosis support

diff --git a/README b/README
index 205b7311aa048a781af33cb8cb618c8eef16cda7..fe31745608cb568f06c6c65a771f8217eaa39a62 100644 (file)
--- a/README
+++ b/README
@@ -4,7 +4,7 @@ Puppet module for git management
 This module sets all structure need to run git in a server. It's dependent on
 puppet-inetd module if you want to use git-daemon.
 
-The only manual step needed is to load your ssh pubkey into gitosis
-configuration, by doing something like
+The only manual step needed is to load your ssh pubkey into the configuration,
+by doing something like
 
-  sudo -H -u gitosis gitosis-init
+  sudo -H -u git gitolite setup -pk yourkey.pub

diff --git a/manifests/daemon.pp b/manifests/daemon.pp
index 740a2addd7a71eaf1544344e3cd836cc03abbc90..47746a60fc577a3b0d3ba216564d18ba8fbdbc03 100644 (file)
--- a/manifests/daemon.pp
+++ b/manifests/daemon.pp
@@ -1,7 +1,7 @@
 class git::daemon (
   $implementation = hiera('git::daemon::implementation', 'gitolite')
 ) {
-  # directory for gitosis user and repositories
+  # directory for git user and repositories
   file { "/var/git":
     ensure => directory,
     mode   => 0755,
@@ -67,14 +67,8 @@ class git::daemon (
     require  => File['/usr/local/sbin/git-mass-update-server-info'],
   }
 
-  case $implementation {
-    'gitosis': {
-      include git::gitosis
-    }
-    default: {
-      include git::gitolite
-    }
-  }
+  # default implementation
+  include git::gitolite
 
   # the needed packages and services
   include inetd

diff --git a/manifests/gitolite.pp b/manifests/gitolite.pp
index cb99edceeaa95a0f82c379aa8c49f95dcd28f4a4..acba3284216d3ac67f9af6b9d49fd837c34664b4 100644 (file)
--- a/manifests/gitolite.pp
+++ b/manifests/gitolite.pp
@@ -11,9 +11,6 @@ class git::gitolite inherits git {
      ensure => installed
   }
 
-  # make sure this is not installed
-  package { "gitosis": ensure => purged }
-
   # tries to get rid of ugly directory structure
   file { "/srv/gitolite":
     ensure  => absent,

diff --git a/manifests/gitosis.pp b/manifests/gitosis.pp
deleted file mode 100644 (file)
index 168e2a2..0000000
--- a/manifests/gitosis.pp
+++ /dev/null
@@ -1,26 +0,0 @@
-# This class handles a gitosis installation, with /var/git as the root for
-# git repositories.
-
-class git::gitosis inherits git {
-  # the needed packages
-  package { "gitosis": ensure => installed }
-
-  # make sure this is not installed
-  package { "gitolite": ensure => purged }
-
-  # tries to get rid of ugly directory structure
-  file { "/srv/gitosis":
-    ensure  => absent,
-    force   => true,
-    backup => false,
-    require => User["git"],
-  }
-
-  # we also don't need /var/gitosis
-  file { "/var/gitosis":
-    ensure  => absent,
-    force   => true,
-    backup => false,
-    require => User["git"],
-  }
-}

diff --git a/templates/gitweb.conf.erb b/templates/gitweb.conf.erb
index 00f20537e44230e1879065b847467057cb341a85..d01f5758a64a1ac6ca95977724de926ab26785ee 100644 (file)
--- a/templates/gitweb.conf.erb
+++ b/templates/gitweb.conf.erb
@@ -13,7 +13,7 @@ $git_temp = "/tmp";
 $home_text = "indextext.html";
 
 # file with project list; by default, simply scan the projectroot dir.
-$projects_list = "/var/git/<% if implementation == 'gitosis' %><%= implementation %>/<% end %>projects.list";
+$projects_list = "/var/git/projects.list";
 
 # stylesheet to use
 $stylesheet = "/gitweb.css";