senfl is our first static source

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 9dbbe8d478cb3f6391e478961e6b81a7624b2821..917a7dad83f95e27f382e3b01e949363dac3c433 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -281,5 +281,7 @@ host_settings:
     - bizet.debian.org
   static_mirror:
     - klecker.debian.org
+  static_source:
+    - senfl.debian.org
 #  reservedaddrs:
 #    ball.debian.org: "0.0.0.0/8 : 127.0.0.0/8 : 169.254.0.0/16 : 172.16.0.0/12 : 192.0.0.0/17 : 192.168.0.0/16 : 224.0.0.0/4 : 240.0.0.0/5 : 248.0.0.0/5"

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index ede7f9b1d5ce3434f403dde3f688ed3955798b6c..20304d2580fb037080503591b36dc6485e5b361e 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -73,5 +73,7 @@ class roles {
 
        if getfromhash($site::nodeinfo, 'static_mirror') {
                include roles::static_mirror
+       } elsif getfromhash($site::nodeinfo, 'static_source') {
+               include roles::static_source
        }
 }

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index ca9fea47359dc986c92a54e686f86e05af11ec57..bf8d445abfebe7806ccf9629d13ce0094d191a57 100644 (file)
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -1,19 +1,10 @@
-class roles::static_mirror inherits roles::static_base {
+class roles::static_mirror inherits roles::static_source {
     file {
-        '/etc/ssh/userkeys/staticsync':
-            content => template('roles/static-mirror-authorized_keys.erb'),
-            ;
         '/usr/local/bin/static-mirror-run':
             source  => "puppet:///modules/roles/static-mirroring/static-mirror-run",
             mode => 555,
             ;
-        '/usr/local/bin/static-mirror-ssh-wrap':
-            source  => "puppet:///modules/roles/static-mirroring/static-mirror-ssh-wrap",
-            mode => 555,
-            ;
-    }
 
-    file {
         "/srv/static.debian.org":
             ensure  => directory,
             owner   => staticsync,

diff --git a/modules/roles/manifests/static_source.pp b/modules/roles/manifests/static_source.pp
new file mode 100644 (file)
index 0000000..a3b6103
--- /dev/null
+++ b/modules/roles/manifests/static_source.pp
@@ -0,0 +1,14 @@
+class roles::static_source inherits roles::static_base {
+    file {
+        '/etc/ssh/userkeys/staticsync':
+            content => template('roles/static-mirror-authorized_keys.erb'),
+            ;
+        '/usr/local/bin/static-mirror-ssh-wrap':
+            source  => "puppet:///modules/roles/static-mirroring/static-mirror-ssh-wrap",
+            mode => 555,
+            ;
+    }
+}
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: