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

diff --git a/modules/roles/manifests/static_master.pp b/modules/roles/manifests/static_master.pp
index 82cd33856..6a36ed3fc 100644
--- a/modules/roles/manifests/static_master.pp
+++ b/modules/roles/manifests/static_master.pp
@@ -7,9 +7,9 @@ class roles::static_master {
   include roles::static::base
   include roles::static::srvdir
 
-  # masters need to talk to mirrors and sources
+  # masters need to talk to mirrors and sources and themselves
   class { 'roles::static::ssh':
-    add_tag     => [ 'staticsync-mirror', 'staticsync-source' ],
+    add_tag     => [ 'staticsync-mirror', 'staticsync-source', 'staticsync-master' ],
     collect_tag => 'staticsync-master',
   }
 
@@ -35,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,
-    }
-  }
 }