X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_mirror.pp;h=c95d062c50882175ab4c1590ff3327ce059e91d3;hb=a4e7c18790b8adb585d3540adcea247939b2bb56;hp=f7cefc6141b0d5310b2a351089d5c1bdfea1ac97;hpb=2064fb719c37fed1ae8ddaa175bec7964dac432b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index f7cefc614..c95d062c5 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -21,12 +21,15 @@ class roles::static_mirror {
 		mode   => '0555',
 	}
 
-	file { '/etc/cron.d/puppet-static-mirror':
-			content => "MAILTO=root\nPATH=/usr/local/bin:/usr/bin:/bin\n@reboot staticsync sleep 60; chronic static-mirror-run-all\n",
+	file { '/etc/cron.d/puppet-static-mirror': ensure => absent, }
+	concat::fragment { 'dsa-puppet-stuff--static-mirror':
+		target => '/etc/cron.d/dsa-puppet-stuff',
+		content  => @(EOF)
+			@reboot staticsync sleep 60; chronic static-mirror-run-all
+			| EOF
 	}
 
 	$onion_v4_addr = $::hostname ? {
-		busoni     => '140.211.166.202',
 		klecker    => '130.89.148.14',
 		mirror-isc => '149.20.4.15',
 		senfter    => '5.153.231.4',
@@ -119,6 +122,7 @@ class roles::static_mirror {
 	ssl::service { 'micronews.debian.org'          : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'mozilla.debian.net'            : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'news.debian.net'               : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+	ssl::service { 'sources.debian.net'            : ensure => "present",  notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'timeline.debian.net'           : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'video.debian.net'              : ensure => "present",  notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'wnpp-by-tags.debian.net'       : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }