From 31f27c8ca0117e7ccb75aa3e6919b3467627a93c Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 14 Jun 2016 21:19:31 +0200
Subject: git subrepo clone --force https://leap.se/git/puppet_stunnel
 puppet/modules/stunnel

subrepo:
  subdir:   "puppet/modules/stunnel"
  merged:   "523612f"
upstream:
  origin:   "https://leap.se/git/puppet_stunnel"
  branch:   "master"
  commit:   "523612f"
git-subrepo:
  version:  "0.3.0"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "cb2995b"
---
 puppet/modules/stunnel/.gitrepo            | 4 ++--
 puppet/modules/stunnel/manifests/debian.pp | 8 +++++---
 puppet/modules/stunnel/manifests/init.pp   | 6 ++++--
 3 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'puppet')

diff --git a/puppet/modules/stunnel/.gitrepo b/puppet/modules/stunnel/.gitrepo
index 6e2b2002..c6992ad1 100644
--- a/puppet/modules/stunnel/.gitrepo
+++ b/puppet/modules/stunnel/.gitrepo
@@ -6,6 +6,6 @@
 [subrepo]
 	remote = https://leap.se/git/puppet_stunnel
 	branch = master
-	commit = 008777bd9837c87a8f501f36dbf2bd4f79c8c868
-	parent = 5ce79e95cd966addb6d66aa0bf03203a7a24f086
+	commit = 523612fb6daff51837423619f5014e62dc835559
+	parent = 9be18eb2681eb5c9047782eaf4e0c6b8c03ce6e6
 	cmdver = 0.3.0
diff --git a/puppet/modules/stunnel/manifests/debian.pp b/puppet/modules/stunnel/manifests/debian.pp
index bde1e219..1135b98d 100644
--- a/puppet/modules/stunnel/manifests/debian.pp
+++ b/puppet/modules/stunnel/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/puppet/modules/stunnel/manifests/init.pp b/puppet/modules/stunnel/manifests/init.pp
index f38a2020..544ac04e 100644
--- a/puppet/modules/stunnel/manifests/init.pp
+++ b/puppet/modules/stunnel/manifests/init.pp
@@ -48,7 +48,8 @@ class stunnel (
       recurse => true,
       purge   => true,
       force   => true,
-      source  => undef;
+      source  => undef,
+      notify  => Exec['refresh_stunnel'];
 
     "${stunnel_staging}/bin/refresh_stunnel.sh":
       owner   => 0,
@@ -58,6 +59,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'] ]
   }
 }
-- 
cgit v1.2.3