X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_master.pp;h=c16870a1f1ce97afc24e32d24d86423aea69b3be;hb=0a5b5cce3089ae780a23c11849ef470f6df1567e;hp=457c558e18536732141dd522b248d6dc7e322ef8;hpb=b3d1e16b4dabefa8e1c978f2cf2a697676cdf3cf;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/static_master.pp b/modules/roles/manifests/static_master.pp
index 457c558e1..c16870a1f 100644
--- a/modules/roles/manifests/static_master.pp
+++ b/modules/roles/manifests/static_master.pp
@@ -1,6 +1,6 @@
 class roles::static_master {
-
 	include roles::static_base
+	include roles::static_srvdir
 
 	file { '/usr/local/bin/static-master-run':
 		source => 'puppet:///modules/roles/static-mirroring/static-master-run',
@@ -14,6 +14,17 @@ class roles::static_master {
 		content => template('roles/static-mirroring/static-clients.conf.erb'),
 	}
 
+	file { "/home/staticsync/static-master":
+		ensure => link,
+		target => '/srv/static.debian.org',
+	}
+	file { '/srv/static.debian.org/master':
+		ensure => directory,
+		mode   => '0755',
+		owner  => 'staticsync',
+		group  => 'staticsync',
+	}
+
 	# export some information for the onion.debian.org build
 	if $::hostname in [dillon] {
 		file { '/srv/puppet.debian.org':
@@ -23,7 +34,13 @@ class roles::static_master {
 			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,
+		}
 	}
 }