Merge branch 'develop'

2 files changed, 23 insertions, 0 deletions

diff --git a/puppet/modules/stunnel b/puppet/modules/stunnel
deleted file mode 160000
-Subproject 523612fb6daff51837423619f5014e62dc83555
diff --git a/puppet/modules/stunnel/manifests/debian.pp b/puppet/modules/stunnel/manifests/debian.pp
new file mode 100644
index 00000000..1135b98d
--- /dev/null
+++ b/puppet/modules/stunnel/manifests/debian.pp
@@ -0,0 +1,23 @@
+class stunnel::debian inherits stunnel::linux {
+
+  Package['stunnel'] {
+    name => 'stunnel4',
+  }
+
+  Service['stunnel'] {
+    name      => 'stunnel4',
+    pattern   => '/usr/bin/stunnel4',
+    subscribe => File['/etc/default/stunnel4'],
+    require   => Package['stunnel4']
+  }
+
+  file { '/etc/default/stunnel4':
+    content => template('stunnel/Debian/default'),
+    before  => Package['stunnel4'],
+    notify  => Service['stunnel4'],
+    owner   => root,
+    group   => 0,
+    mode    => '0644';
+  }
+}
+