From 4f9af8deb6f5487b1e36d16c7c2a20a049eef526 Mon Sep 17 00:00:00 2001
From: Timo Makinen <tmakinen@foo.sh>
Date: Wed, 25 Nov 2015 17:03:36 +0200
Subject: [PATCH 1/5] denyhosts: Add support for whitelisting hosts.

---
 denyhosts/manifests/init.pp | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/denyhosts/manifests/init.pp b/denyhosts/manifests/init.pp
index 4639990..1ffd9f0 100644
--- a/denyhosts/manifests/init.pp
+++ b/denyhosts/manifests/init.pp
@@ -1,12 +1,30 @@
 
 # Install DenyHosts
 #
-class denyhosts {
+# === Parameters
+#
+#   $whitelist:
+#       Source to file containing whitelisted IP addresses. See
+#       http://denyhosts.sourceforge.net/faq.html#allowed
+#
+class denyhosts($whitelist = undef) {
 
     package { "denyhosts":
         ensure => installed,
     }
 
+    if $whitelist {
+        file { "/var/lib/denyhosts/allowed-hosts":
+            ensure  => present,
+            source  => $whitelist,
+            mode    => "0644",
+            owner   => "root",
+            group   => "root",
+            require => Package["denyhosts"],
+            notify  => Service["denyhosts"],
+        }
+    }
+
     service { "denyhosts":
         ensure  => running,
         enable  => true,

From 77059316384ac1b37bff3faec6cd93bbbd439a8a Mon Sep 17 00:00:00 2001
From: Timo Makinen <tmakinen@foo.sh>
Date: Wed, 25 Nov 2015 17:04:17 +0200
Subject: [PATCH 2/5] ifstated: Add full path to ifstated binary and remove
 unneeded start command.

---
 ifstated/manifests/init.pp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ifstated/manifests/init.pp b/ifstated/manifests/init.pp
index 3401fb0..5142320 100644
--- a/ifstated/manifests/init.pp
+++ b/ifstated/manifests/init.pp
@@ -17,8 +17,7 @@ class ifstated {
     service { "ifstated":
         ensure => running,
         enable => true,
-        binary => "ifstated",
-        start  => "/usr/sbin/ifstated",
+        binary => "/usr/sbin/ifstated",
     }
 
 }

From dbb345c26d54a8e919633627c39da1fcafc2d7cf Mon Sep 17 00:00:00 2001
From: Timo Makinen <tmakinen@foo.sh>
Date: Thu, 26 Nov 2015 15:17:50 +0200
Subject: [PATCH 3/5] samba: Always install samba client tools with samba
 server.

---
 samba/manifests/init.pp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/samba/manifests/init.pp b/samba/manifests/init.pp
index c940f6b..743bd6f 100644
--- a/samba/manifests/init.pp
+++ b/samba/manifests/init.pp
@@ -112,6 +112,7 @@ class samba::server(
     $localconf=undef,
 ) {
 
+    require samba::client
     include samba::server::configs
 
     package { "samba":
@@ -308,8 +309,6 @@ class samba::server::pdc($datadir="/srv/netlogon") inherits samba::server::confi
 #
 class samba::server::bdc inherits samba::server::pdc {
 
-    require samba::client
-
     file { "/usr/local/sbin/sync-netlogon":
         ensure => present,
         source => "puppet:///modules/samba/sync-netlogon",

From f6820af0a6ccea9999fcda76f97c5943bc7dbee0 Mon Sep 17 00:00:00 2001
From: Timo Makinen <tmakinen@foo.sh>
Date: Thu, 26 Nov 2015 15:35:49 +0200
Subject: [PATCH 4/5] samba: Fix samba::client for OpenBSD.

---
 samba/manifests/init.pp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/samba/manifests/init.pp b/samba/manifests/init.pp
index 743bd6f..43e3747 100644
--- a/samba/manifests/init.pp
+++ b/samba/manifests/init.pp
@@ -3,7 +3,11 @@
 #
 class samba::client {
 
-    package { "samba-client":
+    case $::operatingsystem {
+        "openbsd": { $package = "samba" }
+        default:   { $package = "samba-client" }
+    }
+    package { $package:
         ensure => installed,
     }
 
@@ -115,8 +119,10 @@ class samba::server(
     require samba::client
     include samba::server::configs
 
-    package { "samba":
-        ensure => installed,
+    if $::operatingsystem != "OpenBSD" {
+        package { "samba":
+            ensure => installed,
+        }
     }
 
     file { "/etc/samba/smb.conf":

From ad5e9fe473e03268718a0afeb26959aec5221c3e Mon Sep 17 00:00:00 2001
From: Ossi Herrala <ossi.herrala@codenomicon.com>
Date: Fri, 27 Nov 2015 08:29:59 +0000
Subject: [PATCH 5/5] abusehelper: Repositories moved into GitHub. Curl needs
 to follow redirect.

---
 abusehelper/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/abusehelper/Makefile b/abusehelper/Makefile
index f496582..ceb4777 100644
--- a/abusehelper/Makefile
+++ b/abusehelper/Makefile
@@ -1,11 +1,11 @@
 include $(CURDIR)/../Makefile.inc
 
 AHBRANCH = master
-AHSOURCE = https://bitbucket.org/clarifiednetworks/abusehelper/get/$(AHBRANCH).tar.gz
+AHSOURCE = https://github.com/abusesa/abusehelper/archive/$(AHBRANCH).tar.gz
 AHTARGET = abusehelper-$(AHBRANCH)-$(TIMESTAMP).tar.gz
 
 IKBRANCH = master
-IKSOURCE = https://bitbucket.org/clarifiednetworks/idiokit/get/$(IKBRANCH).tar.gz
+IKSOURCE = https://github.com/abusesa/idiokit/archive/$(IKBRANCH).tar.gz
 IKTARGET = idiokit-$(IKBRANCH)-$(TIMESTAMP).tar.gz
 
 all:      tarball manifest
@@ -14,11 +14,11 @@ manifest: $(MANIFESTS)/abusehelper.pp
 
 $(PACKAGES)/$(AHTARGET):
 	@umask 022; echo $@; \
-	test -f $@ || curl -f -o $@ $(AHSOURCE)
+	test -f $@ || curl -L -f -o $@ $(AHSOURCE)
 
 $(PACKAGES)/$(IKTARGET):
 	@umask 022; echo $@; \
-	test -f $@ || curl -f -o $@ $(IKSOURCE)
+	test -f $@ || curl -L -f -o $@ $(IKSOURCE)
 
 $(MANIFESTS)/abusehelper.pp: $(PACKAGES)/$(AHTARGET) $(PACKAGES)/$(IKTARGET)
 	@umask 022; echo $@; \