diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2016-03-09 19:11:56 -0300 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2016-03-09 19:11:56 -0300 |
commit | dee99cd4f9f05158c6d7b5626d47b874b9819ff2 (patch) | |
tree | 55a984b02715f064e6109392836c561d7b582b1c /manifests | |
parent | 795f727af45e9fab1f2fd12799b96078f7ca2300 (diff) | |
download | puppet-git-dee99cd4f9f05158c6d7b5626d47b874b9819ff2.tar.gz puppet-git-dee99cd4f9f05158c6d7b5626d47b874b9819ff2.tar.bz2 |
Drop gitosis support
Diffstat (limited to 'manifests')
-rw-r--r-- | manifests/daemon.pp | 12 | ||||
-rw-r--r-- | manifests/gitolite.pp | 3 | ||||
-rw-r--r-- | manifests/gitosis.pp | 26 |
3 files changed, 3 insertions, 38 deletions
diff --git a/manifests/daemon.pp b/manifests/daemon.pp index 740a2ad..47746a6 100644 --- 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 cb99edc..acba328 100644 --- 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 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"], - } -} |