gabrielli: decomission

[dsa-puppet.git] / modules / autofs / manifests / bytemark.pp

diff --git a/modules/autofs/manifests/bytemark.pp b/modules/autofs/manifests/bytemark.pp
index c4da0bf8322986a25ef960207720932f9dc754de..78bf67344b628f41211043633a69c448cf246e2a 100644 (file)
--- a/modules/autofs/manifests/bytemark.pp
+++ b/modules/autofs/manifests/bytemark.pp
@@ -1,18 +1,6 @@
 class autofs::bytemark {
-       package { 'autofs': ensure => installed }
-       package { 'nfs-common': ensure => installed }
+       include autofs::common
 
-       exec { 'autofs reload':
-               path        => '/usr/bin:/usr/sbin:/bin:/sbin',
-               command     => 'service autofs reload',
-               refreshonly => true,
-               require =>  Package['autofs'],
-       }
-
-
-       file { '/etc/auto.master.d':
-               source  => directory
-       }
        file { '/etc/auto.master.d/dsa.autofs':
                source  => "puppet:///modules/autofs/bytemark/auto.master.d-dsa.autofs",
                notify  => Exec['autofs reload']
@@ -21,4 +9,9 @@ class autofs::bytemark {
                source  => "puppet:///modules/autofs/bytemark/auto.dsa",
                notify  => Exec['autofs reload']
        }
+
+       file { '/srv/mirrors': ensure  => directory }
+       file { '/srv/mirrors/debian': ensure  => '/auto.dsa/debian' }
+       file { '/srv/mirrors/debian-backports': ensure  => '/auto.dsa/debian-backports' }
+       file { '/srv/mirrors/debian-security': ensure  => '/auto.dsa/debian-security' }
 }