X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_master.pp;h=2f786a4aa3a1df5622c2ed16425175f8cf3d11bf;hb=a2afb600d7d2187b16da01c98a50f00f06aea6a6;hp=c16870a1f1ce97afc24e32d24d86423aea69b3be;hpb=9768916cd03adff997b5306ed0497c31d30f2624;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/static_master.pp b/modules/roles/manifests/static_master.pp
index c16870a1f..2f786a4aa 100644
--- a/modules/roles/manifests/static_master.pp
+++ b/modules/roles/manifests/static_master.pp
@@ -1,46 +1,5 @@
-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',
-		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'),
-	}
-
-	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':
-			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,
-		}
-	}
+#
+class roles::static_master(
+) {
+  include staticsync::static_master
 }