Do not use site-wide cgit.conf

[dsa-puppet.git] / modules / roles / manifests / dgit_browse.pp

diff --git a/modules/roles/manifests/dgit_browse.pp b/modules/roles/manifests/dgit_browse.pp
index 686c7f7f5f5764f845d6ba0215e3a21ff1a07c2c..fe06a31bbd40001a4fee8a9c6fb0bb719d6eedc0 100644 (file)
--- a/modules/roles/manifests/dgit_browse.pp
+++ b/modules/roles/manifests/dgit_browse.pp
@@ -6,11 +6,15 @@ class roles::dgit_browse {
        #       source => 'puppet:///modules/roles/wiki/rsyncd.conf',
        #}
 
-       package { 'cgi': ensure => installed, }
+       package { 'cgit': ensure => installed, }
 
        file { '/etc/cgitrc':
                source => 'puppet:///modules/roles/dgit/cgitrc',
        }
+       file { '/etc/apache2/conf-enabled/cgit.conf':
+               ensure => absent,
+               notify => Service['apache2'],
+       }
 
        apache2::site { '010-browse.dgit.debian.org':
                site    => 'browse.dgit.debian.org',