X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fmirror_health.pp;h=41a970d783d473ad0cdd53ddc52c01ea5bfd9cb2;hb=4fbf65ed9df4af4b96dd2ef63bdef21f10f01a49;hp=1290967696e948e2def4984942a36de8903d894e;hpb=d62d808fee28e92e4c00e1b3b3feecd2e78c4cd2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/mirror_health.pp b/modules/roles/manifests/mirror_health.pp
index 129096769..41a970d78 100644
--- a/modules/roles/manifests/mirror_health.pp
+++ b/modules/roles/manifests/mirror_health.pp
@@ -2,26 +2,27 @@ define roles::mirror_health (
 	$check_hosts    = [],
 	$check_service  = '',
 	$url            = '',
+	$health_url     = '',
 	$check_interval = 60,
 ) {
-	package { 'python3-requests':
-		ensure   => installed,
-	}
+	ensure_packages(['python3-requests'], { ensure => 'installed' })
 
-        # XXX: avoid duplicating this?
-	file { '/usr/local/sbin/mirror-health':
-		source => 'puppet:///modules/roles/mirror_health/mirror-health',
-		owner  => 'root',
-		group  => 'root',
-		mode   => '0555',
-	}
+	if !defined(File['/usr/local/sbin/mirror-health']) {
+	        file { '/usr/local/sbin/mirror-health':
+		        source => 'puppet:///modules/roles/mirror_health/mirror-health',
+		        owner  => 'root',
+		        group  => 'root',
+		        mode   => '0555',
+                        notify  => Service["mirror-health-${check_service}"],
+                }
+        }
 
         file { "/etc/systemd/system/mirror-health-${check_service}.service":
 		owner   => 'root',
 		group   => 'root',
 		mode    => '0444',
                 content => template('roles/mirror-health.service.erb'),
-                notify  => Exec['systemctl daemon-reload'],
+                notify  => [Exec['systemctl daemon-reload'], Service["mirror-health-${check_service}"]],
         }
 
         file { "/etc/systemd/system/multi-user.target.wants/mirror-health-${check_service}.service":
@@ -29,4 +30,9 @@ define roles::mirror_health (
 		target => "../mirror-health-${check_service}.service",
 		notify => Exec['systemctl daemon-reload'],
 	}
+
+	service { "mirror-health-${check_service}":
+		require => Exec['systemctl daemon-reload'],
+		ensure  => running,
+        }
 }