]> git.donarmstrong.com Git - dsa-puppet.git/log
dsa-puppet.git
14 years agoMerge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
Peter Palfrader [Wed, 21 Oct 2009 06:04:56 +0000 (08:04 +0200)]
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet: (57 commits)
  make plugin-conf.d file match bind_views
  add bind_views plugin
  and again with the paths
  and clean up the paths
  some class reshuffling
  ignore bind plugin as well
  um, use the right syntax
  add group statement
  add bind munin-node
  arg, ruby strings
  not node, hostname
  not mx, mta
  and get the path right
  change plugin.conf to template
  liszt doesn't have Debian-exim
  correct group for mail.log
  and the samhain ignores for them
  a few more munin plugins, although I dislike the placement of the spamassassin one
  add spamd test
  and samhain ignore it
  ...

14 years agoNew IP address for ravel for backup
Peter Palfrader [Wed, 21 Oct 2009 06:04:50 +0000 (08:04 +0200)]
New IP address for ravel for backup

14 years agomake plugin-conf.d file match bind_views
Stephen Gran [Sun, 18 Oct 2009 01:01:18 +0000 (02:01 +0100)]
make plugin-conf.d file match bind_views

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoadd bind_views plugin
Stephen Gran [Sun, 18 Oct 2009 01:00:07 +0000 (02:00 +0100)]
add bind_views plugin

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoand again with the paths
Stephen Gran [Sun, 18 Oct 2009 00:16:02 +0000 (01:16 +0100)]
and again with the paths

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoand clean up the paths
Stephen Gran [Sun, 18 Oct 2009 00:13:01 +0000 (01:13 +0100)]
and clean up the paths

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agosome class reshuffling
Stephen Gran [Sun, 18 Oct 2009 00:10:12 +0000 (01:10 +0100)]
some class reshuffling

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoignore bind plugin as well
Stephen Gran [Sat, 17 Oct 2009 23:58:18 +0000 (00:58 +0100)]
ignore bind plugin as well

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoum, use the right syntax
Stephen Gran [Sat, 17 Oct 2009 23:54:07 +0000 (00:54 +0100)]
um, use the right syntax

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoadd group statement
Stephen Gran [Sat, 17 Oct 2009 23:34:48 +0000 (00:34 +0100)]
add group statement

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoadd bind munin-node
Stephen Gran [Sat, 17 Oct 2009 23:30:31 +0000 (00:30 +0100)]
add bind munin-node

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoarg, ruby strings
Stephen Gran [Sat, 17 Oct 2009 23:17:27 +0000 (00:17 +0100)]
arg, ruby strings

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agonot node, hostname
Stephen Gran [Sat, 17 Oct 2009 23:16:38 +0000 (00:16 +0100)]
not node, hostname

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agonot mx, mta
Stephen Gran [Sat, 17 Oct 2009 23:15:51 +0000 (00:15 +0100)]
not mx, mta

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoand get the path right
Stephen Gran [Sat, 17 Oct 2009 23:15:08 +0000 (00:15 +0100)]
and get the path right

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agochange plugin.conf to template
Stephen Gran [Sat, 17 Oct 2009 23:14:16 +0000 (00:14 +0100)]
change plugin.conf to template

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoliszt doesn't have Debian-exim
Stephen Gran [Sat, 17 Oct 2009 22:01:40 +0000 (23:01 +0100)]
liszt doesn't have Debian-exim

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agocorrect group for mail.log
Stephen Gran [Sat, 17 Oct 2009 21:59:08 +0000 (22:59 +0100)]
correct group for mail.log

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoand the samhain ignores for them
Stephen Gran [Sat, 17 Oct 2009 18:45:12 +0000 (19:45 +0100)]
and the samhain ignores for them

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoa few more munin plugins, although I dislike the placement of the spamassassin one
Stephen Gran [Sat, 17 Oct 2009 18:43:56 +0000 (19:43 +0100)]
a few more munin plugins, although I dislike the placement of the spamassassin one

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoadd spamd test
Stephen Gran [Sat, 17 Oct 2009 17:33:36 +0000 (18:33 +0100)]
add spamd test

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoand samhain ignore it
Stephen Gran [Sat, 17 Oct 2009 17:29:41 +0000 (18:29 +0100)]
and samhain ignore it

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoadd ntp_states plugin
Stephen Gran [Sat, 17 Oct 2009 17:28:56 +0000 (18:28 +0100)]
add ntp_states plugin

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoadd vsftpd module, even though no one uses it yet
Stephen Gran [Sat, 17 Oct 2009 16:47:23 +0000 (17:47 +0100)]
add vsftpd module, even though no one uses it yet

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoIt helps to get the file name right
Stephen Gran [Sat, 17 Oct 2009 16:39:07 +0000 (17:39 +0100)]
It helps to get the file name right
Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoapparently also needs to run as exim user
Stephen Gran [Sat, 17 Oct 2009 16:37:02 +0000 (17:37 +0100)]
apparently also needs to run as exim user

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agosyntax, sigh
Stephen Gran [Sat, 17 Oct 2009 16:26:02 +0000 (17:26 +0100)]
syntax, sigh

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoSome more munin hackery
Stephen Gran [Sat, 17 Oct 2009 16:24:54 +0000 (17:24 +0100)]
Some more munin hackery
Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoignore a few more plugin symlinks
Stephen Gran [Sat, 17 Oct 2009 16:10:15 +0000 (17:10 +0100)]
ignore a few more plugin symlinks

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agostupid puppet failing to take default values
Stephen Gran [Sat, 17 Oct 2009 16:04:32 +0000 (17:04 +0100)]
stupid puppet failing to take default values

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoadd uptime plugin
Stephen Gran [Sat, 17 Oct 2009 15:51:44 +0000 (16:51 +0100)]
add uptime plugin

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoadd some ps_ munin plugins
Stephen Gran [Sat, 17 Oct 2009 15:51:26 +0000 (16:51 +0100)]
add some ps_ munin plugins

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agook, so package relationships aren't working for me yet
Stephen Gran [Sat, 17 Oct 2009 15:04:44 +0000 (16:04 +0100)]
ok, so package relationships aren't working for me yet

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agomove module enable inside class definition?
Stephen Gran [Sat, 17 Oct 2009 14:55:41 +0000 (15:55 +0100)]
move module enable inside class definition?

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agooops, missing quote
Stephen Gran [Sat, 17 Oct 2009 14:54:06 +0000 (15:54 +0100)]
oops, missing quote

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoand remove the syntax error, hopefully
Stephen Gran [Sat, 17 Oct 2009 14:52:57 +0000 (15:52 +0100)]
and remove the syntax error, hopefully

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoredo apache2 exec statements
Stephen Gran [Sat, 17 Oct 2009 14:50:28 +0000 (15:50 +0100)]
redo apache2 exec statements

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoRework apache2 module enable command to allow for disabling modules and
Stephen Gran [Sat, 17 Oct 2009 14:49:42 +0000 (15:49 +0100)]
Rework apache2 module enable command to allow for disabling modules and
restarting apache on change
Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agofact about vsftpd
Stephen Gran [Sat, 17 Oct 2009 13:43:36 +0000 (14:43 +0100)]
fact about vsftpd

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoum, need to put it in the right place
Stephen Gran [Sat, 17 Oct 2009 11:07:02 +0000 (12:07 +0100)]
um, need to put it in the right place

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agonew apache2 default for spohr
Stephen Gran [Sat, 17 Oct 2009 11:01:51 +0000 (12:01 +0100)]
new apache2 default for spohr

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agooh, all right, add all the munin plugins we manage
Stephen Gran [Sat, 17 Oct 2009 10:29:46 +0000 (11:29 +0100)]
oh, all right, add all the munin plugins we manage

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agosome samhain addtions and tidy up
Stephen Gran [Sat, 17 Oct 2009 10:27:00 +0000 (11:27 +0100)]
some samhain addtions and tidy up

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoI like df_abs
Stephen Gran [Sat, 17 Oct 2009 00:42:20 +0000 (01:42 +0100)]
I like df_abs

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agolet's see how bad puppet's scoping is
Stephen Gran [Sat, 17 Oct 2009 00:14:29 +0000 (01:14 +0100)]
let's see how bad puppet's scoping is

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agosilly typo
Stephen Gran [Sat, 17 Oct 2009 00:08:58 +0000 (01:08 +0100)]
silly typo

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agomake the munin check allow for removals as well
Stephen Gran [Sat, 17 Oct 2009 00:07:55 +0000 (01:07 +0100)]
make the munin check allow for removals as well
Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agosome default munin plugins for everyone
Stephen Gran [Fri, 16 Oct 2009 21:58:25 +0000 (22:58 +0100)]
some default munin plugins for everyone

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoignore the plugins directory
Stephen Gran [Fri, 16 Oct 2009 21:47:20 +0000 (22:47 +0100)]
ignore the plugins directory

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agowe can shorten that
Stephen Gran [Fri, 16 Oct 2009 21:44:48 +0000 (22:44 +0100)]
we can shorten that

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoRT #1845
Stephen Gran [Fri, 16 Oct 2009 21:41:25 +0000 (22:41 +0100)]
RT #1845

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoignore the new apache files
Stephen Gran [Fri, 16 Oct 2009 21:39:46 +0000 (22:39 +0100)]
ignore the new apache files

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agothis might be more clever
Stephen Gran [Fri, 16 Oct 2009 20:53:57 +0000 (21:53 +0100)]
this might be more clever

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agothis might be more clever
Stephen Gran [Fri, 16 Oct 2009 20:50:52 +0000 (21:50 +0100)]
this might be more clever

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoRevert "not an array?"
Stephen Gran [Fri, 16 Oct 2009 20:44:49 +0000 (21:44 +0100)]
Revert "not an array?"

This reverts commit b1c99adf73d03a61d580b989326d1c93f9d2da2f.

14 years agonot an array?
Stephen Gran [Fri, 16 Oct 2009 20:44:25 +0000 (21:44 +0100)]
not an array?

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoerm
Stephen Gran [Fri, 16 Oct 2009 20:42:15 +0000 (21:42 +0100)]
erm

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoan array? really?
Stephen Gran [Fri, 16 Oct 2009 20:40:19 +0000 (21:40 +0100)]
an array?  really?

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agomaybe?
Stephen Gran [Fri, 16 Oct 2009 20:39:06 +0000 (21:39 +0100)]
maybe?

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agostupid picky parser
Stephen Gran [Fri, 16 Oct 2009 20:32:58 +0000 (21:32 +0100)]
stupid picky parser

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agowhut?
Stephen Gran [Fri, 16 Oct 2009 20:31:58 +0000 (21:31 +0100)]
whut?

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agothis should work better
Stephen Gran [Fri, 16 Oct 2009 20:30:12 +0000 (21:30 +0100)]
this should work better

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoright. actually decalre inheritance
Stephen Gran [Fri, 16 Oct 2009 20:28:18 +0000 (21:28 +0100)]
right.  actually decalre inheritance

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoand the inevitable typo
Stephen Gran [Fri, 16 Oct 2009 20:27:09 +0000 (21:27 +0100)]
and the inevitable typo

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agomunin-node stuff for apache
Stephen Gran [Fri, 16 Oct 2009 20:26:31 +0000 (21:26 +0100)]
munin-node stuff for apache

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoand the inevitable typo
Stephen Gran [Fri, 16 Oct 2009 20:16:31 +0000 (21:16 +0100)]
and the inevitable typo

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoapache hosts load mod info and status, and serve it
Stephen Gran [Fri, 16 Oct 2009 20:15:25 +0000 (21:15 +0100)]
apache hosts load mod info and status, and serve it

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agothat was perhaps a bit too restrictive
Stephen Gran [Wed, 14 Oct 2009 07:49:32 +0000 (08:49 +0100)]
that was perhaps a bit too restrictive

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoI probably want to ignore ntp.conf now
Stephen Gran [Tue, 13 Oct 2009 23:07:29 +0000 (00:07 +0100)]
I probably want to ignore ntp.conf now

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoand bellini too
Stephen Gran [Tue, 13 Oct 2009 22:11:02 +0000 (23:11 +0100)]
and bellini too

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agocimarosa can ignore mcelog
Stephen Gran [Tue, 13 Oct 2009 21:39:30 +0000 (22:39 +0100)]
cimarosa can ignore mcelog

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agowhat could possibly go wrong
Stephen Gran [Tue, 13 Oct 2009 21:28:30 +0000 (22:28 +0100)]
what could possibly go wrong

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoturns out we've moved the geodns apt list to a template and never noticed
Stephen Gran [Tue, 13 Oct 2009 21:25:37 +0000 (22:25 +0100)]
turns out we've moved the geodns apt list to a template and never noticed

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoMerge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
Stephen Gran [Tue, 13 Oct 2009 21:20:42 +0000 (22:20 +0100)]
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

14 years agoadd ntp module
Stephen Gran [Tue, 13 Oct 2009 21:20:38 +0000 (22:20 +0100)]
add ntp module

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoMove TR to EU
Peter Palfrader [Tue, 13 Oct 2009 10:17:57 +0000 (12:17 +0200)]
Move TR to EU

14 years agosync puppet with dsa-misc/config
Peter Palfrader [Wed, 7 Oct 2009 07:11:19 +0000 (09:11 +0200)]
sync puppet with dsa-misc/config

14 years agoAdd geissert to the list of people being able to sudo to qa (RT#1827)
Peter Palfrader [Tue, 6 Oct 2009 21:17:34 +0000 (23:17 +0200)]
Add geissert to the list of people being able to sudo to qa (RT#1827)

14 years agokvm and libvirt are in bpo now
Peter Palfrader [Tue, 6 Oct 2009 06:35:20 +0000 (08:35 +0200)]
kvm and libvirt are in bpo now

14 years agomake porterboxen smarthost on the way out too
Stephen Gran [Mon, 5 Oct 2009 17:12:47 +0000 (18:12 +0100)]
make porterboxen smarthost on the way out too

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoadd porterboxen to relay setup
Stephen Gran [Mon, 5 Oct 2009 17:09:40 +0000 (18:09 +0100)]
add porterboxen to relay setup

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoverdi no longer with us
Stephen Gran [Mon, 5 Oct 2009 01:10:35 +0000 (02:10 +0100)]
verdi no longer with us

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agomanualroute is now a template
Stephen Gran [Mon, 5 Oct 2009 00:38:38 +0000 (01:38 +0100)]
manualroute is now a template
Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agodraghi to relay
Stephen Gran [Mon, 5 Oct 2009 00:26:28 +0000 (01:26 +0100)]
draghi to relay

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agotry single quotes?
Stephen Gran [Mon, 5 Oct 2009 00:19:01 +0000 (01:19 +0100)]
try single quotes?

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agodraghi to be the second mailout.d.o
Stephen Gran [Mon, 5 Oct 2009 00:11:25 +0000 (01:11 +0100)]
draghi to be the second mailout.d.o

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agolocal-settins.conf is gone away - use local.yaml instead
Stephen Gran [Mon, 5 Oct 2009 00:09:41 +0000 (01:09 +0100)]
local-settins.conf is gone away - use local.yaml instead

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agosome more
Stephen Gran [Sun, 4 Oct 2009 23:30:23 +0000 (00:30 +0100)]
some more

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoand the inevitable syntax error
Stephen Gran [Sun, 4 Oct 2009 23:25:02 +0000 (00:25 +0100)]
and the inevitable syntax error

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoeliminate lots of spam stuff for smarthosting machines
Stephen Gran [Sun, 4 Oct 2009 23:23:34 +0000 (00:23 +0100)]
eliminate lots of spam stuff for smarthosting machines

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agosmarthost to mailout is by mx
Stephen Gran [Sun, 4 Oct 2009 23:08:10 +0000 (00:08 +0100)]
smarthost to mailout is by mx

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agobuildds use a smarthost now
Stephen Gran [Sun, 4 Oct 2009 22:55:16 +0000 (23:55 +0100)]
buildds use a smarthost now

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoAdd architecture test for FreeBSD boxen. Lets see how much this breaks
Stephen Gran [Sun, 4 Oct 2009 21:10:06 +0000 (22:10 +0100)]
Add architecture test for FreeBSD boxen.  Lets see how much this breaks
Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoluchesi is now a relay
Stephen Gran [Sun, 4 Oct 2009 20:26:29 +0000 (21:26 +0100)]
luchesi is now a relay
Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agofinzi and fano now samrthost to luchesi
Stephen Gran [Sun, 4 Oct 2009 20:17:41 +0000 (21:17 +0100)]
finzi and fano now samrthost to luchesi
Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoLuchesi has a custom kvm
Stephen Gran [Sun, 4 Oct 2009 19:12:00 +0000 (20:12 +0100)]
Luchesi has a custom kvm
Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agomake it happier with error messages
Stephen Gran [Sun, 4 Oct 2009 11:25:24 +0000 (12:25 +0100)]
make it happier with error messages

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoturn off a bit more for popcon.d.o
Stephen Gran [Sun, 4 Oct 2009 11:20:26 +0000 (12:20 +0100)]
turn off a bit more for popcon.d.o

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoremove almost all filtering for popcon.d.o
Stephen Gran [Sun, 4 Oct 2009 11:14:55 +0000 (12:14 +0100)]
remove almost all filtering for popcon.d.o

Signed-off-by: Stephen Gran <steve@lobefin.net>
14 years agoadd bellini to busy-exim
Stephen Gran [Sun, 4 Oct 2009 10:46:33 +0000 (11:46 +0100)]
add bellini to busy-exim

Signed-off-by: Stephen Gran <steve@lobefin.net>