X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Fstatic_master.pp;h=c2aec647b1b38260d5f6bda8df007928ff188223;hb=4939162b3524926ead9e4a832c314b78d379b770;hp=0816754df828fb73a4793aeb51cfd1c7e48a578b;hpb=b5b17876a34290b9816805a274c81a2ffc209145;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/static_master.pp b/modules/roles/manifests/static_master.pp
index 0816754df..c2aec647b 100644
--- a/modules/roles/manifests/static_master.pp
+++ b/modules/roles/manifests/static_master.pp
@@ -2,17 +2,10 @@ class roles::static_master {
 
 	include roles::static_base
 
-	file { '/etc/ssh/userkeys/staticsync':
-		content => template('roles/static-mirroring/static-master-authorized_keys.erb'),
-	}
 	file { '/usr/local/bin/static-master-run':
 		source => 'puppet:///modules/roles/static-mirroring/static-master-run',
 		mode   => '0555',
 	}
-	file {'/usr/local/bin/static-master-ssh-wrap':
-		source => 'puppet:///modules/roles/static-mirroring/static-master-ssh-wrap',
-		mode   => '0555',
-	}
 	file { '/usr/local/bin/static-master-update-component':
 		source => 'puppet:///modules/roles/static-mirroring/static-master-update-component',
 		mode   => '0555',
@@ -20,4 +13,23 @@ class roles::static_master {
 	file { '/etc/static-clients.conf':
 		content => template('roles/static-mirroring/static-clients.conf.erb'),
 	}
+
+	# 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,
+		}
+	}
 }