From c0cbf928c057d299f533a2a8b61bb54cc6ba5974 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 f4f278ea62751220790dfc7fae58ecdc5756c4b5 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 3aba84e808035a02c35bb64a04daccc5ab03e5db 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 bf6d0fe1b74910026d577b80e5894f22c6edfde7 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 From 7ce3190986cf8e5fe037a7ccd4c1076505b117f4 Mon Sep 17 00:00:00 2001 From: Micah Date: Tue, 12 Jul 2016 16:41:59 -0400 Subject: remove submodules in preparation for move to subrepos Change-Id: Ia7655153b556337f676e3d909559c4a7306bedd6 --- puppet/modules/stunnel | 1 - 1 file changed, 1 deletion(-) delete mode 160000 puppet/modules/stunnel (limited to 'puppet/modules/stunnel/files') diff --git a/puppet/modules/stunnel b/puppet/modules/stunnel deleted file mode 160000 index 523612fb..00000000 --- a/puppet/modules/stunnel +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 523612fb6daff51837423619f5014e62dc835559 -- cgit v1.2.3 From 04279dd8d1390d61d696d2c14817199304ccd4d8 Mon Sep 17 00:00:00 2001 From: Micah Date: Tue, 12 Jul 2016 16:46:21 -0400 Subject: git subrepo clone 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" commit: "1e79595" Change-Id: If384c84c99d9cabc67d2b4b9d7d2fbfa4a47550a --- puppet/modules/stunnel/files/CentOS/stunnel.init | 143 +++++++++++++++++++++++ 1 file changed, 143 insertions(+) create mode 100644 puppet/modules/stunnel/files/CentOS/stunnel.init (limited to 'puppet/modules/stunnel/files') diff --git a/puppet/modules/stunnel/files/CentOS/stunnel.init b/puppet/modules/stunnel/files/CentOS/stunnel.init new file mode 100644 index 00000000..d5c60fd8 --- /dev/null +++ b/puppet/modules/stunnel/files/CentOS/stunnel.init @@ -0,0 +1,143 @@ +#!/bin/bash +# +# Script to run stunnel in daemon mode at boot time. +# +# Check http://www.gaztronics.net/ for the +# most up-to-date version of this script. +# +# This script is realeased under the terms of the GPL. +# You can source a copy at: +# http://www.fsf.org/copyleft/copyleft.html +# +# Please feel free to modify the script to suite your own needs. +# I always welcome email feedback with suggestions for improvements. +# Please do not email for general support. I do not have time to answer +# personal help requests. + +# Author: Gary Myers MIIE MBCS +# email: http://www.gaztronics.net/webform/ +# Revision 1.0 - 4th March 2005 + +#==================================================================== +# Run level information: +# +# chkconfig: 2345 99 99 +# description: Secure Tunnel +# processname: stunnel +# +# Run "/sbin/chkconfig --add stunnel" to add the Run levels. +# This will setup the symlinks and set the process to run at boot. +#==================================================================== + +#==================================================================== +# Paths and variables and system checks. + +# Source function library (It's a Red Hat thing!) +. /etc/rc.d/init.d/functions + +# Check that networking is up. +# +[ ${NETWORKING} ="yes" ] || exit 0 + +# Path to the executable. +# +SEXE=/usr/sbin/stunnel + +# Path to the configuration file. +# +CONF=/etc/stunnel/stunnel.conf + +# Check the configuration file exists. +# +if [ ! -f $CONF ] ; then + echo "The configuration file cannot be found!" +exit 0 +fi + +CHROOT=`grep '^chroot' /etc/stunnel/stunnel.conf | head -n 1 | sed 's/ //g' | awk -F= '{ print $2 }'` +PIDFILE=`grep '^pid' /etc/stunnel/stunnel.conf | head -n 1 | sed 's/ //g' | awk -F= '{ print $2 }'` +if [ -n "$CHROOT" ]; then + PIDFILE=$CHROOT/$PIDFILE +fi + +# Path to the lock file. +# +LOCK_FILE=/var/lock/subsys/stunnel + +#==================================================================== + +#==================================================================== +# Run controls: + +prog=$"stunnel" + +RETVAL=0 + +# Start stunnel as daemon. +# +start() { + if [ -f $LOCK_FILE ]; then + echo "stunnel is already running!" + exit 0 + else + echo -n $"Starting $prog: " + $SEXE $CONF + fi + + RETVAL=$? + [ $RETVAL -eq 0 ] && success + echo + [ $RETVAL -eq 0 ] && touch $LOCK_FILE + return $RETVAL +} + + +# Stop stunnel. +# +stop() { + if [ ! -f $LOCK_FILE ]; then + echo "stunnel is not running!" + exit 0 + + else + + echo -n $"Shutting down $prog: " + killproc -p $PIDFILE stunnel + RETVAL=$? + [ $RETVAL -eq 0 ] + rm -f $LOCK_FILE + echo + return $RETVAL + + fi +} + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + stop + start + ;; + condrestart) + if [ -f $LOCK_FILE ]; then + stop + start + RETVAL=$? + fi + ;; + status) + status -p $PIDFILE stunnel + RETVAL=$? + ;; + *) + echo $"Usage: $0 {start|stop|restart|condrestart|status}" + RETVAL=1 +esac + +exit $RETVAL -- cgit v1.2.3