summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2016-06-14 10:42:04 -0400
committerMicah Anderson <micah@riseup.net>2016-06-14 10:42:04 -0400
commit4056d79a2e07b7178cbbdb1576aa6f5ccd1d9e83 (patch)
treeb931f55ac3512bd472ec78813da0126ed8063e05
parent008777bd9837c87a8f501f36dbf2bd4f79c8c868 (diff)
Ensure ordering for package, service and defaults
-rw-r--r--manifests/debian.pp8
-rw-r--r--manifests/init.pp3
2 files changed, 7 insertions, 4 deletions
diff --git a/manifests/debian.pp b/manifests/debian.pp
index bde1e21..1135b98 100644
--- a/manifests/debian.pp
+++ b/manifests/debian.pp
@@ -5,13 +5,15 @@ class stunnel::debian inherits stunnel::linux {
}
Service['stunnel'] {
- name => 'stunnel4',
- pattern => '/usr/bin/stunnel4',
+ name => 'stunnel4',
+ pattern => '/usr/bin/stunnel4',
+ subscribe => File['/etc/default/stunnel4'],
+ require => Package['stunnel4']
}
file { '/etc/default/stunnel4':
content => template('stunnel/Debian/default'),
- require => Package['stunnel4'],
+ before => Package['stunnel4'],
notify => Service['stunnel4'],
owner => root,
group => 0,
diff --git a/manifests/init.pp b/manifests/init.pp
index f38a202..9e7d87a 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -58,6 +58,7 @@ class stunnel (
}
exec { 'refresh_stunnel':
- command => "${stunnel_staging}/bin/refresh_stunnel.sh"
+ command => "${stunnel_staging}/bin/refresh_stunnel.sh",
+ require => [ Package['stunnel4'], File['/etc/default/stunnel4'] ]
}
}