X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_master.pp;h=c2aec647b1b38260d5f6bda8df007928ff188223;hb=bfcd2cf1ea494a37e5c6ce31f6d3cdfc7fd26433;hp=6750aa6a931086b6a03eca1907126623789dd10c;hpb=d6e20ea4c083d9978ad4c3e5eccaffa2e887698a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/static_master.pp b/modules/roles/manifests/static_master.pp
index 6750aa6a9..c2aec647b 100644
--- a/modules/roles/manifests/static_master.pp
+++ b/modules/roles/manifests/static_master.pp
@@ -1,22 +1,35 @@
-class roles::static_master inherits roles::mirror_base {
-    file {
-        '/etc/ssh/userkeys/staticsync':
-            content => template('roles/static-master-authorized_keys.erb'),
-            ;
-        '/usr/local/bin/static-master-run':
-            source  => "puppet:///modules/roles/static-mirroring/static-master-run",
-            mode => 555,
-            ;
-        '/usr/local/bin/static-master-ssh-wrap':
-            source  => "puppet:///modules/roles/static-mirroring/static-master-ssh-wrap",
-            mode => 555,
-            ;
-        '/usr/local/bin/static-master-update-component':
-            source  => "puppet:///modules/roles/static-mirroring/static-master-update-component",
-            mode => 555,
-            ;
-    }
+class roles::static_master {
+
+	include roles::static_base
+
+	file { '/usr/local/bin/static-master-run':
+		source => 'puppet:///modules/roles/static-mirroring/static-master-run',
+		mode   => '0555',
+	}
+	file { '/usr/local/bin/static-master-update-component':
+		source => 'puppet:///modules/roles/static-mirroring/static-master-update-component',
+		mode   => '0555',
+	}
+	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,
+		}
+	}
 }
-# vim:set et:
-# vim:set sts=4 ts=4:
-# vim:set shiftwidth=4: