X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fstunnel4%2Fmanifests%2Finit.pp;h=fc6c9af0a8b0e1efeff7d638126852a569c558f6;hb=3324b4ae702172197fe7ad725a36f052f1e67c71;hp=58d0891a9c59e87f61598f8b9c11b07d4cbf1a3e;hpb=fec3645d1cdb5298ede4f32c591e8aade24cfd28;p=mirror%2Fdsa-puppet.git

diff --git a/modules/stunnel4/manifests/init.pp b/modules/stunnel4/manifests/init.pp
index 58d0891a9..fc6c9af0a 100644
--- a/modules/stunnel4/manifests/init.pp
+++ b/modules/stunnel4/manifests/init.pp
@@ -1,39 +1,31 @@
 class stunnel4 {
-    # define an stunnel listener, listening for SSL connections on $accept,
-    # connecting to plaintext service $connect using local source address $local
-    define stunnel_server($accept, $connect, $local = "127.0.0.1") {
-        file {
-            "/etc/stunnel/puppet-${name}.conf":
-                content => template("stunnel4/server.conf.erb"),
-                notify  => Exec['restart_stunnel'],
-                ;
-        }
-    }
 
+	package { 'stunnel4':
+		ensure => installed
+	}
 
-    package {
-        "stunnel4": ensure => installed;
-    }
+	file { '/etc/stunnel':
+		ensure  => directory,
+		mode    => '0755',
+	}
+	file { '/etc/init.d/stunnel4':
+		source => 'puppet:///modules/stunnel4/etc-init.d-stunnel4',
+		mode   => '0555',
+		notify => Exec['systemctl daemon-reload'],
+	}
+	file { '/etc/stunnel/stunnel.conf':
+		ensure  => absent,
+		require => Package['stunnel4'],
+	}
 
-    file {
-        "/etc/stunnel/stunnel.conf":
-            ensure => absent,
-            ;
-    }
-
-    exec {
-        "enable_stunnel4":
-                command => "sed -i -e 's/^ENABLED=/#&/; \$a ENABLED=1 # added by puppet' /etc/default/stunnel4",
-                unless => "grep -q '^ENABLED=1' /etc/default/stunnel4",
-                require => [ Package['stunnel4'] ],
-                ;
-        "restart_stunnel":
-                command => "env -i /etc/init.d/stunnel4 restart",
-                require => [ File['/etc/stunnel/stunnel.conf'], Exec['enable_stunnel4'], Package['stunnel4'] ],
-                ;
-    }
+	exec { 'enable_stunnel4':
+		command => 'sed -i -e \'s/^ENABLED=/#&/; $a ENABLED=1 # added by puppet\' /etc/default/stunnel4',
+		unless  => 'grep -q \'^ENABLED=1\' /etc/default/stunnel4',
+		require => Package['stunnel4'],
+	}
+	exec { 'kill_file_override':
+		command => 'sed -i -e \'s/^FILES=/#&/\' /etc/default/stunnel4',
+		onlyif  => 'grep -q \'^FILES=\' /etc/default/stunnel4',
+		require => Package['stunnel4'],
+	}
 }
-
-# vim:set et:
-# vim:set sts=4 ts=4:
-# vim:set shiftwidth=4: