no more afs stuff

diff --git a/manifests/site.pp b/manifests/site.pp
index be89e07236f65d95f631bfe4dffcc30999524f3b..6c9ecc032ab8c901852d57667f4f9328adb78d26 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -143,17 +143,9 @@ node default {
     include samhain
 
     case $hostname {
-        byrd,schuetz,tchaikovsky: {
+        byrd,schuetz,tchaikovsky,draghi,quantz,lamb,locke,rautavaara,rietz: {
             include krb
         }
-        draghi,quantz: {
-            include krb
-            include afs
-        }
-        lamb,locke,rautavaara,rietz: {
-            include krb
-            include afs::server
-        }
     }
 
     case $hostname {

diff --git a/modules/afs/files/CellServDB b/modules/afs/files/CellServDB
deleted file mode 100644 (file)
index fbbb394..0000000
--- a/modules/afs/files/CellServDB
+++ /dev/null
@@ -1,4 +0,0 @@
->debian.org
-82.195.75.101                   #lamb.debian.org
-194.177.211.199                 #rautavaara.debian.org
-206.12.19.120                   #locke.debian.org

diff --git a/modules/afs/files/ThisCell b/modules/afs/files/ThisCell
deleted file mode 100644 (file)
index 9973f0c..0000000
--- a/modules/afs/files/ThisCell
+++ /dev/null
@@ -1 +0,0 @@
-debian.org

diff --git a/modules/afs/files/afs.conf.client b/modules/afs/files/afs.conf.client
deleted file mode 100644 (file)
index 9f57054..0000000
--- a/modules/afs/files/afs.conf.client
+++ /dev/null
@@ -1,5 +0,0 @@
-AFS_CLIENT=true
-AFS_AFSDB=true
-AFS_CRYPT=true
-AFS_DYNROOT=true
-AFS_FAKESTAT=true

diff --git a/modules/afs/manifests/init.pp b/modules/afs/manifests/init.pp
deleted file mode 100644 (file)
index e879d5c..0000000
--- a/modules/afs/manifests/init.pp
+++ /dev/null
@@ -1,41 +0,0 @@
-class afs {
-    package {
-        "openafs-client":
-            ensure => installed,
-            require => File['/etc/openafs/CellServDB',
-                            '/etc/openafs/ThisCell',
-                            '/etc/openafs/afs.conf.client'],
-            ;
-        "openafs-krb5":
-            ensure => installed,
-            ;
-    }
-    file {
-        "/etc/openafs":
-            ensure  => directory,
-            mode    => 755,
-            ;
-        "/etc/openafs/CellServDB":
-            source  => "puppet:///modules/afs/CellServDB",
-            # notify  => # something to call fs newcell maybe?
-            mode    => 444
-            ;
-        "/etc/openafs/ThisCell":
-            source  => "puppet:///modules/afs/ThisCell",
-            mode    => 444
-            ;
-        "/etc/openafs/afs.conf.client":
-            source  => "puppet:///modules/afs/afs.conf.client",
-            mode    => 444
-            ;
-    }
-
-    @ferm::rule { "dsa-afs callback":
-        domain          => "(ip ip6)",
-        description  => "afs callback",
-        rule         => "&SERVICE(udp, afs3-callback)"
-    }
-}
-# vim:set et:
-# vim:set sts=4 ts=4:
-# vim:set shiftwidth=4:

diff --git a/modules/afs/manifests/server.pp b/modules/afs/manifests/server.pp
deleted file mode 100644 (file)
index 9e663d2..0000000
--- a/modules/afs/manifests/server.pp
+++ /dev/null
@@ -1,35 +0,0 @@
-class afs::server inherits afs {
-    @ferm::rule { "dsa-afs fileserver":
-        domain       => "(ip ip6)",
-        description  => "afs callback",
-        rule         => "&SERVICE(udp, afs3-fileserver)"
-    }
-    @ferm::rule { "dsa-afs prserver":
-        domain       => "(ip ip6)",
-        description  => "afs callback",
-        rule         => "&SERVICE(udp, afs3-prserver)"
-    }
-    @ferm::rule { "dsa-afs vlserver":
-        domain       => "(ip ip6)",
-        description  => "afs callback",
-        rule         => "&SERVICE(udp, afs3-vlserver)"
-    }
-    @ferm::rule { "dsa-afs kaserver":
-        domain       => "(ip ip6)",
-        description  => "afs callback",
-        rule         => "&SERVICE(udp, afs3-kaserver)"
-    }
-    @ferm::rule { "dsa-afs volser":
-        domain       => "(ip ip6)",
-        description  => "afs callback",
-        rule         => "&SERVICE(udp, afs3-volser)"
-    }
-    #@ferm::rule { "dsa-afs bos":
-    #    domain       => "(ip ip6)",
-    #    description  => "afs callback",
-    #    rule         => "&SERVICE(udp, afs3-bos)"
-    #}
-}
-# vim:set et:
-# vim:set sts=4 ts=4:
-# vim:set shiftwidth=4:

diff --git a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
index 25cdc2320f5da7ebe1766ffe9f836c23c8587410..7f5318cb52006d3abe4fbc5abffa6bd0a6b80f87 100644 (file)
--- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
+++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
@@ -27,6 +27,5 @@ end
 #when /(draghi|orff|ravel|klecker|geo[123]).debian.org/: ignore << %w{libdns69 libdns66 libdns64 bind9 libbind9-60 liblwres60 bind9-host libisccfg62 libisccfg60 libisc62 libisc60 dnsutils bind9utils libisccc60}
 #end
 
-ignore << '/openafs-modules-.*/'
 ignore.flatten.join("\n")
 %>