From: Martin Zobel-Helas <zobel@debian.org>
Date: Sat, 19 Feb 2011 21:16:43 +0000 (+0100)
Subject: move that into debian.org module, like the other sysctl stuff. puppet does not like... 
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=1bd1273a7c4eff1869ba892588a657b61b40465a;p=mirror%2Fdsa-puppet.git

move that into debian.org module, like the other sysctl stuff. puppet does not like it if i redefine class sysctl
---

diff --git a/manifests/site.pp b/manifests/site.pp
index 9a09d547f..f5dd399f0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -147,7 +147,7 @@ node default {
 
     case $hostname {
         chopin,geo3,soler,wieck: {
-            include sysctl
+            include debian-radvd
         }
    }
 }
diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 123a0e855..b19a7456f 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -158,6 +158,19 @@ class debian-proliant inherits debian-org {
             notify  => Exec["apt-get update"];
     }
 }
+
+class debian-radvd inherits debian-org {
+    sysctl {
+        "dsa-accept-ra-default" :
+            key         => "net.ipv6.conf.default.accept_ra",
+            value       => 0,
+    }
+    sysctl {
+        "dsa-accept-ra-all" :
+            key         => "net.ipv6.conf.all.accept_ra",
+            value       => 0,
+    }
+}
 # vim:set et:
 # vim:set sts=4 ts=4:
 # vim:set shiftwidth=4:
diff --git a/modules/sysctl/files/common/dsa-radvd.conf b/modules/sysctl/files/common/dsa-radvd.conf
deleted file mode 100644
index de2ea3333..000000000
--- a/modules/sysctl/files/common/dsa-radvd.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-net.ipv6.conf.default.accept_ra=0
-net.ipv6.conf.all.accept_ra=0
diff --git a/modules/sysctl/manifests/init.pp b/modules/sysctl/manifests/init.pp
deleted file mode 100644
index 6b8d92331..000000000
--- a/modules/sysctl/manifests/init.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-class sysctl {
-	package { procps: ensure => installed }
-
-	file { "/etc/sysctl.d/dsa-radvd.conf":
-		owner   => root,
-		group   => root,
-		mode    => 444,
-		source  => [ "puppet:///modules/sysctl/per-host/$fqdn/dsa-radvd.conf",
-		             "puppet:///modules/sysctl/common/dsa-radvd.conf" ],
-		require => Package["procps"]
-                ;
-
-	}
-}
-# vim:set et:
-# vim:set sts=4 ts=4:
-# vim:set shiftwidth=4: