aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--files/etc/nagios-plugins/check_rbl.ini50
-rw-r--r--lib/puppet/parser/functions/hiera_resources.rb9
-rw-r--r--manifests/role/master.pp53
-rw-r--r--manifests/role/nas/desktop.pp2
4 files changed, 1 insertions, 113 deletions
diff --git a/files/etc/nagios-plugins/check_rbl.ini b/files/etc/nagios-plugins/check_rbl.ini
deleted file mode 100644
index ae6a208..0000000
--- a/files/etc/nagios-plugins/check_rbl.ini
+++ /dev/null
@@ -1,50 +0,0 @@
-[rbl]
-server=dnsbl.ahbl.org
-server=cbl.abuseat.org
-server=dnsbl.cyberlogic.net
-server=bl.deadbeef.com
-server=spamtrap.drbl.drand.net
-server=spamsources.fabel.dk
-server=0spam.fusionzero.com
-server=mail-abuse.blacklist.jippg.org
-server=korea.services.net
-server=spamguard.leadmon.net
-server=ix.dnsbl.manitu.net
-server=relays.nether.net
-server=dnsbl.njabl.org
-server=bhnc.njabl.org
-server=no-more-funn.moensted.dk
-server=rbl.orbitrbl.com
-server=psbl.surriel.com
-server=dyna.spamrats.com
-server=noptr.spamrats.com
-server=spam.spamrats.com
-; this keeps all zones of sorbs excl. spam
-server=dnsbl.sorbs.net
-server=spam.dnsbl.sorbs.net
-server=bl.spamcannibal.org
-server=bl.spamcop.net
-server=pbl.spamhaus.org
-server=sbl.spamhaus.org
-server=xbl.spamhaus.org
-server=ubl.unsubscore.com
-server=dnsbl-1.uceprotect.net
-server=dnsbl-2.uceprotect.net
-server=dnsbl-3.uceprotect.net
-server=db.wpbl.info
-server=access.redhawk.org
-server=blacklist.sci.kun.nl
-server=bl.technovision.dk
-server=dnsbl.kempt.net
-server=dnsbl.solid.net
-server=dul.ru
-server=forbidden.icm.edu.pl
-server=hil.habeas.com
-server=rbl.schulte.org
-server=sbl-xbl.spamhaus.org
-
-; these are rather slow
-;server=bl.csma.biz
-;server=sbl.csma.biz
-
-timeout=60
diff --git a/lib/puppet/parser/functions/hiera_resources.rb b/lib/puppet/parser/functions/hiera_resources.rb
deleted file mode 100644
index 1299314..0000000
--- a/lib/puppet/parser/functions/hiera_resources.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# Thanks to http://yo61.com/assigning-resources-to-nodes-with-hiera-in-puppet.html
-module Puppet::Parser::Functions
- newfunction(:hiera_resources, :type => :statement) do |args|
- raise Puppet::Error, "hiera_resources requires 1 argument; got #{args.length}" if args.length != 1
- res_name = args[0][0]
- apps = function_hiera_hash([res_name, {}])
- apps.each { | res_type, res_params | function_create_resources([res_type, res_params]) }
- end
-end
diff --git a/manifests/role/master.pp b/manifests/role/master.pp
deleted file mode 100644
index 64db626..0000000
--- a/manifests/role/master.pp
+++ /dev/null
@@ -1,53 +0,0 @@
-class nodo::role::master {
- $main = hiera('nodo::role::master::main', false)
- $db_password = hiera('nodo::role::master::db_password', '')
-
- case $db_password {
- '': { fail("Please set nodo::master::db_password in your config") }
- }
-
- if $main == true {
- # Puppetmaster should be included before nodo::virtual
- class { 'puppet::master':
- main => true,
- }
-
- # The main master has a host entry pointing to itself, other
- # masters still retrieve catalogs from the main master.
- #
- # For that we're relying just on DNS entries.
- host { "puppet":
- ensure => absent,
- ip => "127.0.0.1",
- host_aliases => ["puppet.${::domain}"],
- }
- } else {
- class { 'puppet::master':
- main => false,
- }
-
- host { "puppet":
- ensure => absent,
- }
- }
-
- # These should be included after puppetmaster
- include nodo::role::virtual
- include database
- include git::daemon
- include nodo::subsystem::monitor::master
- include websites
-
- # Update master's puppet.conf if you change here
- database::instance { "puppet":
- password => "${db_password}",
- }
-
- # Used for trac dependency graphs
- package { "graphviz":
- ensure => present,
- }
-
- # Check domain registration
- domain_check::instance { $::domain: }
-}
diff --git a/manifests/role/nas/desktop.pp b/manifests/role/nas/desktop.pp
index 5a14599..4de4cc0 100644
--- a/manifests/role/nas/desktop.pp
+++ b/manifests/role/nas/desktop.pp
@@ -1,4 +1,4 @@
-# A desktop action as a NAS
+# A desktop acting as a NAS
class nodo::role::nas::desktop inherits nodo::base::desktop {
include nodo::role::nas
}