tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of bitbucket.org:tmakinen/puppet

Browse source
This commit is contained in:
Ossi Salmi 2015-12-01 21:24:37 +02:00
commit d4a487cfe3
4 changed files with 34 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
abusehelper/Makefile
View file

@ -1,11 +1,11 @@
include $(CURDIR)/../Makefile.inc include $(CURDIR)/../Makefile.inc
AHBRANCH = master 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 AHTARGET = abusehelper-$(AHBRANCH)-$(TIMESTAMP).tar.gz
IKBRANCH = master 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 IKTARGET = idiokit-$(IKBRANCH)-$(TIMESTAMP).tar.gz
all: tarball manifest all: tarball manifest
@ -14,11 +14,11 @@ manifest: $(MANIFESTS)/abusehelper.pp
$(PACKAGES)/$(AHTARGET): $(PACKAGES)/$(AHTARGET):
@umask 022; echo $@; \ @umask 022; echo $@; \
test -f $@ || curl -f -o $@ $(AHSOURCE) test -f $@ || curl -L -f -o $@ $(AHSOURCE)
$(PACKAGES)/$(IKTARGET): $(PACKAGES)/$(IKTARGET):
@umask 022; echo $@; \ @umask 022; echo $@; \
test -f $@ || curl -f -o $@ $(IKSOURCE) test -f $@ || curl -L -f -o $@ $(IKSOURCE)
$(MANIFESTS)/abusehelper.pp: $(PACKAGES)/$(AHTARGET) $(PACKAGES)/$(IKTARGET) $(MANIFESTS)/abusehelper.pp: $(PACKAGES)/$(AHTARGET) $(PACKAGES)/$(IKTARGET)
@umask 022; echo $@; \ @umask 022; echo $@; \

20
denyhosts/manifests/init.pp
View file

@ -1,12 +1,30 @@
# Install DenyHosts # 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": package { "denyhosts":
ensure => installed, 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": service { "denyhosts":
ensure => running, ensure => running,
enable => true, enable => true,

3
ifstated/manifests/init.pp
View file

@ -17,8 +17,7 @@ class ifstated {
service { "ifstated": service { "ifstated":
ensure => running, ensure => running,
enable => true, enable => true,
binary => "ifstated", binary => "/usr/sbin/ifstated",
start => "/usr/sbin/ifstated",
} }
} }

15
samba/manifests/init.pp
View file

@ -3,7 +3,11 @@
# #
class samba::client { class samba::client {
package { "samba-client": case $::operatingsystem {
"openbsd": { $package = "samba" }
default: { $package = "samba-client" }
}
package { $package:
ensure => installed, ensure => installed,
} }
@ -112,10 +116,13 @@ class samba::server(
$localconf=undef, $localconf=undef,
) { ) {
require samba::client
include samba::server::configs include samba::server::configs
package { "samba": if $::operatingsystem != "OpenBSD" {
ensure => installed, package { "samba":
ensure => installed,
}
} }
file { "/etc/samba/smb.conf": file { "/etc/samba/smb.conf":
@ -308,8 +315,6 @@ class samba::server::pdc($datadir="/srv/netlogon") inherits samba::server::confi
# #
class samba::server::bdc inherits samba::server::pdc { class samba::server::bdc inherits samba::server::pdc {
require samba::client
file { "/usr/local/sbin/sync-netlogon": file { "/usr/local/sbin/sync-netlogon":
ensure => present, ensure => present,
source => "puppet:///modules/samba/sync-netlogon", source => "puppet:///modules/samba/sync-netlogon",