rename dsa-puppet-stuff to puppet-crontab

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

diff --git a/modules/roles/manifests/static_master.pp b/modules/roles/manifests/static_master.pp
index bb48757..6a36ed3 100644 (file)
--- a/modules/roles/manifests/static_master.pp
+++ b/modules/roles/manifests/static_master.pp
@@ -4,8 +4,14 @@
 # to the master, and from there to all the mirrors.
 #
 class roles::static_master {
-  include roles::static_base
-  include roles::static_srvdir
+  include roles::static::base
+  include roles::static::srvdir
+
+  # masters need to talk to mirrors and sources and themselves
+  class { 'roles::static::ssh':
+    add_tag     => [ 'staticsync-mirror', 'staticsync-source', 'staticsync-master' ],
+    collect_tag => 'staticsync-master',
+  }
 
   file { '/usr/local/bin/static-master-run':
     source => 'puppet:///modules/roles/static-mirroring/static-master-run',
@@ -29,23 +35,4 @@ class roles::static_master {
     owner  => 'staticsync',
     group  => 'staticsync',
   }
-
-  # export some information for the onion.debian.org build
-  if $::hostname in [dillon] {
-    file { '/srv/puppet.debian.org':
-      ensure => directory
-    }
-    file { '/srv/puppet.debian.org/puppet-facts':
-      ensure => directory
-    }
-    concat { '/srv/puppet.debian.org/puppet-facts/onionbalance-services.yaml':
-      notify  => Exec['rebuild-onion-website'],
-    }
-    Concat::Fragment <<| tag == 'onionbalance-services.yaml' |>>
-
-    exec { 'rebuild-onion-website':
-      command => '/bin/su - staticsync -c \'make -C /srv/onion-master.debian.org\'',
-      refreshonly => true,
-    }
-  }
 }