X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_master.pp;h=6a36ed3fc5e13b62a4514bbd56ed72228ef09b34;hb=0ed55c82789b31b34176a2fdb803dd09a4d6e686;hp=60c0c15ac74d3dc40121ee73daa7b765de13fab0;hpb=885b1390848612043dfe4656dd447989ac7555fe;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/static_master.pp b/modules/roles/manifests/static_master.pp
index 60c0c15ac..6a36ed3fc 100644
--- a/modules/roles/manifests/static_master.pp
+++ b/modules/roles/manifests/static_master.pp
@@ -7,6 +7,12 @@ class roles::static_master {
   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',
     mode   => '0555',
@@ -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,
-    }
-  }
 }