From a0bd7c33d4d2968d9824fd4613c701c94a91c2cc Mon Sep 17 00:00:00 2001 From: Micah Date: Tue, 7 Jun 2016 15:26:01 -0400 Subject: refresh_stunnel sometimes doesn't run (#8168). It turns out that in some corner-cases, the script is not called: (1) start the deploy, create files in /var/lib/puppet/stunnel4/config (2) halt puppet before apply finishes (3) re-run deploy in this scenario, next time you run deploy, refresh_stunnel will never get called to populate /etc/stunnel, because the files in /var/lib/puppet/stunnel4/config haven't changed. This problem can be really confusing when it happens. To fix this, we just run refresh_stunnel every, it is pretty fast and the script has more complete logic for what to do than puppet, which has only an asymmetrical view on the situation. Change-Id: I9e5fad1d081c2fe07f3ac8f07cfb87d86b88f7c9 --- puppet/modules/stunnel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'puppet/modules/stunnel/files') diff --git a/puppet/modules/stunnel b/puppet/modules/stunnel index 79e874c1..008777bd 160000 --- a/puppet/modules/stunnel +++ b/puppet/modules/stunnel @@ -1 +1 @@ -Subproject commit 79e874c1a86ad5c48c4e726a5d4c68bd879ce454 +Subproject commit 008777bd9837c87a8f501f36dbf2bd4f79c8c868 -- cgit v1.2.3 From 5e3c2f821dec68d2fd61454e495b8ffb6e0d2dcf Mon Sep 17 00:00:00 2001 From: Micah Date: Tue, 14 Jun 2016 10:02:40 -0400 Subject: update stunnel module for refresh_stunnel fixes Change-Id: I7675dbaba4d896a62dab9fcf4817092ea69f1298 --- puppet/modules/stunnel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'puppet/modules/stunnel/files') diff --git a/puppet/modules/stunnel b/puppet/modules/stunnel index 008777bd..421c8e52 160000 --- a/puppet/modules/stunnel +++ b/puppet/modules/stunnel @@ -1 +1 @@ -Subproject commit 008777bd9837c87a8f501f36dbf2bd4f79c8c868 +Subproject commit 421c8e527d57fd4d1221dbd341394d954cd38314 -- cgit v1.2.3 From 4a9be045411e43534df0aec4289d64f4129c52d2 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 14 Jun 2016 10:46:20 -0400 Subject: Ensure stunnel package, service and default ordering. --- puppet/modules/stunnel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'puppet/modules/stunnel/files') diff --git a/puppet/modules/stunnel b/puppet/modules/stunnel index 421c8e52..4056d79a 160000 --- a/puppet/modules/stunnel +++ b/puppet/modules/stunnel @@ -1 +1 @@ -Subproject commit 421c8e527d57fd4d1221dbd341394d954cd38314 +Subproject commit 4056d79a2e07b7178cbbdb1576aa6f5ccd1d9e83 -- cgit v1.2.3 From 25cdee309d4ad749d633c8b4d5bf7e65f83fb75b Mon Sep 17 00:00:00 2001 From: Micah Date: Tue, 14 Jun 2016 12:37:10 -0400 Subject: make sure required x509 bits are there before stunnel is started Change-Id: I772c3b6e489e3c1848c45c6bcaa240324fc88928 --- puppet/modules/stunnel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'puppet/modules/stunnel/files') diff --git a/puppet/modules/stunnel b/puppet/modules/stunnel index 4056d79a..523612fb 160000 --- a/puppet/modules/stunnel +++ b/puppet/modules/stunnel @@ -1 +1 @@ -Subproject commit 4056d79a2e07b7178cbbdb1576aa6f5ccd1d9e83 +Subproject commit 523612fb6daff51837423619f5014e62dc835559 -- cgit v1.2.3