]>
git.donarmstrong.com Git - dsa-puppet.git/log
Peter Palfrader [Wed, 24 Feb 2010 15:40:24 +0000 (16:40 +0100)]
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
Peter Palfrader [Wed, 24 Feb 2010 15:39:48 +0000 (16:39 +0100)]
Let archvsync trigger snapshot (2nd snapshot instance) on sibelius
Stephen Gran [Wed, 24 Feb 2010 09:20:15 +0000 (09:20 +0000)]
stop doubling up an entrySigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Wed, 24 Feb 2010 09:16:08 +0000 (09:16 +0000)]
add puppetmaster roleSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Wed, 24 Feb 2010 00:37:51 +0000 (00:37 +0000)]
be a little more liberal about throwing away MS trafficSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Wed, 24 Feb 2010 00:25:30 +0000 (00:25 +0000)]
this should be empty for those hostersSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Wed, 24 Feb 2010 00:21:10 +0000 (00:21 +0000)]
use the right list of hostsSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Tue, 23 Feb 2010 23:33:15 +0000 (23:33 +0000)]
move inclusion of samhain to the end of the block, so it knows about all other classes includedSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Tue, 23 Feb 2010 23:32:54 +0000 (23:32 +0000)]
clean up samhain template by role instead of by hostnameSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Tue, 23 Feb 2010 19:46:07 +0000 (19:46 +0000)]
and even more carefully this timeSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Tue, 23 Feb 2010 19:45:13 +0000 (19:45 +0000)]
skip hosts without ip addresses in ldapSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Tue, 23 Feb 2010 19:38:49 +0000 (19:38 +0000)]
bartok gets fermSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Tue, 23 Feb 2010 19:36:55 +0000 (19:36 +0000)]
add debian hosts to the listSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Tue, 23 Feb 2010 19:33:03 +0000 (19:33 +0000)]
and recursors should allow localnets ...Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Tue, 23 Feb 2010 19:31:52 +0000 (19:31 +0000)]
name new class correctlySigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Tue, 23 Feb 2010 19:31:08 +0000 (19:31 +0000)]
add bartok as recursor for mandaSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Tue, 23 Feb 2010 19:30:34 +0000 (19:30 +0000)]
add bartok as a recursorSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Tue, 23 Feb 2010 19:29:54 +0000 (19:29 +0000)]
add local DNS recursor classSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Tue, 23 Feb 2010 19:20:42 +0000 (19:20 +0000)]
/etc/ferm is now also (kind of, almost) under puppet controlSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Tue, 23 Feb 2010 19:19:10 +0000 (19:19 +0000)]
ferm.conf is now (kind of, almost) under puppet controlSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Tue, 23 Feb 2010 19:11:19 +0000 (19:11 +0000)]
and name them usefullySigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Tue, 23 Feb 2010 19:10:37 +0000 (19:10 +0000)]
use v4 for iptables and v6 for ip6tablesSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Tue, 23 Feb 2010 19:05:34 +0000 (19:05 +0000)]
make MS ports quietSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Tue, 23 Feb 2010 18:50:54 +0000 (18:50 +0000)]
add draghi as nagios host, as it needs to connect to nrpeSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Tue, 23 Feb 2010 18:31:49 +0000 (18:31 +0000)]
try to make samhain quiet about fermSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Tue, 23 Feb 2010 18:31:37 +0000 (18:31 +0000)]
zobel!Signed-off-by: Stephen Gran <steve@lobefin.net>
Peter Palfrader [Tue, 23 Feb 2010 00:55:19 +0000 (01:55 +0100)]
aacraid stuff on pettersson
Peter Palfrader [Mon, 22 Feb 2010 21:14:48 +0000 (22:14 +0100)]
Add pettersson
Martin Zobel-Helas [Mon, 22 Feb 2010 09:27:34 +0000 (10:27 +0100)]
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet
Martin Zobel-Helas [Mon, 22 Feb 2010 09:27:00 +0000 (10:27 +0100)]
add zobel's IPs fro $DSA_IPS and $DSA_V6_IPS
Stephen Gran [Mon, 22 Feb 2010 08:55:56 +0000 (08:55 +0000)]
quiet down, youSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Mon, 22 Feb 2010 08:49:32 +0000 (08:49 +0000)]
Revert "unrestrict geo2,3"
This reverts commit
9dc4b5046bff9c6356ebe06fa3785b0cfceb2688 .
Stephen Gran [Mon, 22 Feb 2010 08:49:24 +0000 (08:49 +0000)]
Revert "unrestrict geo2,3, take 2"
This reverts commit
4502d26636291d26e439b42efc277970c263b5b2 .
Stephen Gran [Mon, 22 Feb 2010 08:48:15 +0000 (08:48 +0000)]
unrestrict geo2,3, take 2Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Mon, 22 Feb 2010 08:47:41 +0000 (08:47 +0000)]
unrestrict geo2,3Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Mon, 22 Feb 2010 01:32:21 +0000 (01:32 +0000)]
spot the typoSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Mon, 22 Feb 2010 01:26:58 +0000 (01:26 +0000)]
restricted ssh access to geo machines as wellSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Mon, 22 Feb 2010 01:22:16 +0000 (01:22 +0000)]
oopsSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Mon, 22 Feb 2010 01:19:32 +0000 (01:19 +0000)]
add the rest of the geo hosts to ferm classSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Mon, 22 Feb 2010 01:17:42 +0000 (01:17 +0000)]
more down hostsSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Mon, 22 Feb 2010 01:14:13 +0000 (01:14 +0000)]
logtest01 spends much of it's time downSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Mon, 22 Feb 2010 01:08:50 +0000 (01:08 +0000)]
ok, so now extractnodeinfo comes back with the value true, rather than the string "true". I wonder how long this has been silently brokenSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Mon, 22 Feb 2010 01:08:03 +0000 (01:08 +0000)]
Revert "test classes"
This reverts commit
9698ac16e7c372a59158f21f25aa2bbf8db0f020 .
Stephen Gran [Mon, 22 Feb 2010 00:35:02 +0000 (00:35 +0000)]
test classesSigned-off-by: Stephen Gran <steve@lobefin.net>
Peter Palfrader [Sun, 21 Feb 2010 18:53:28 +0000 (19:53 +0100)]
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
Peter Palfrader [Sun, 21 Feb 2010 18:53:21 +0000 (19:53 +0100)]
samosa->cimarosa
Stephen Gran [Sun, 21 Feb 2010 16:51:41 +0000 (16:51 +0000)]
nagios is also allowed to check if munin is listeningSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sun, 21 Feb 2010 16:50:16 +0000 (16:50 +0000)]
typoSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sun, 21 Feb 2010 16:49:32 +0000 (16:49 +0000)]
will ferm do the right thing?Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sun, 21 Feb 2010 16:48:28 +0000 (16:48 +0000)]
Revert "will ferm do the right thing?"
This reverts commit
a47c22e58d6502bb314e9fca3814fae1cadc62e5 .
Stephen Gran [Sun, 21 Feb 2010 16:47:47 +0000 (16:47 +0000)]
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
Stephen Gran [Sun, 21 Feb 2010 16:47:42 +0000 (16:47 +0000)]
will ferm do the right thing?Signed-off-by: Stephen Gran <steve@lobefin.net>
Peter Palfrader [Sun, 21 Feb 2010 16:11:23 +0000 (17:11 +0100)]
Forward merkel:5441 to samosa:5441
Stephen Gran [Sun, 21 Feb 2010 16:07:24 +0000 (16:07 +0000)]
add geo1Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sun, 21 Feb 2010 16:04:51 +0000 (16:04 +0000)]
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
Stephen Gran [Sun, 21 Feb 2010 16:04:47 +0000 (16:04 +0000)]
use new split v4/v6 defs in templateSigned-off-by: Stephen Gran <steve@lobefin.net>
Peter Palfrader [Sun, 21 Feb 2010 16:04:32 +0000 (17:04 +0100)]
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
Peter Palfrader [Sun, 21 Feb 2010 16:04:04 +0000 (17:04 +0100)]
And support many forward ports from a single host
Stephen Gran [Sun, 21 Feb 2010 16:03:08 +0000 (16:03 +0000)]
add draghi as dbmasterSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sun, 21 Feb 2010 16:01:44 +0000 (16:01 +0000)]
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
Stephen Gran [Sun, 21 Feb 2010 16:01:41 +0000 (16:01 +0000)]
split nagios, munin, and db hosts into seperate v4 and v6 defs, and provide the superset as wellSigned-off-by: Stephen Gran <steve@lobefin.net>
Peter Palfrader [Sun, 21 Feb 2010 15:57:20 +0000 (16:57 +0100)]
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
Peter Palfrader [Sun, 21 Feb 2010 15:57:18 +0000 (16:57 +0100)]
Specify which target port we want in our ssh call
Stephen Gran [Sun, 21 Feb 2010 15:36:12 +0000 (15:36 +0000)]
nagios is also allowed to connect to sshSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sun, 21 Feb 2010 15:12:29 +0000 (15:12 +0000)]
anchor start of lineSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sun, 21 Feb 2010 15:11:33 +0000 (15:11 +0000)]
template the munin master as wellSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sun, 21 Feb 2010 15:01:00 +0000 (15:01 +0000)]
erb, I hate youSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sun, 21 Feb 2010 14:52:26 +0000 (14:52 +0000)]
reshuffle bind configurationSigned-off-by: Stephen Gran <steve@lobefin.net>
Peter Palfrader [Sun, 21 Feb 2010 14:33:17 +0000 (15:33 +0100)]
Add a comment
Peter Palfrader [Sun, 21 Feb 2010 14:31:52 +0000 (15:31 +0100)]
Replace stunnel on master with this
Peter Palfrader [Sun, 21 Feb 2010 14:29:10 +0000 (15:29 +0100)]
Try to get sshkey
Peter Palfrader [Sun, 21 Feb 2010 14:21:07 +0000 (15:21 +0100)]
Typo
Peter Palfrader [Sun, 21 Feb 2010 14:19:14 +0000 (15:19 +0100)]
Manually cast more
Peter Palfrader [Sun, 21 Feb 2010 14:18:19 +0000 (15:18 +0100)]
Manually cast
Peter Palfrader [Sun, 21 Feb 2010 14:17:25 +0000 (15:17 +0100)]
Update comment
Peter Palfrader [Sun, 21 Feb 2010 14:16:29 +0000 (15:16 +0100)]
Typo
Peter Palfrader [Sun, 21 Feb 2010 14:15:28 +0000 (15:15 +0100)]
And produce an xinetd snippet
Peter Palfrader [Sun, 21 Feb 2010 14:14:53 +0000 (15:14 +0100)]
Comment out debugging info
Peter Palfrader [Sun, 21 Feb 2010 14:08:35 +0000 (15:08 +0100)]
fqdn instead of hostname
Peter Palfrader [Sun, 21 Feb 2010 14:07:21 +0000 (15:07 +0100)]
I wonder how one debugs these things properly
Peter Palfrader [Sun, 21 Feb 2010 14:05:16 +0000 (15:05 +0100)]
yeah, that too
Peter Palfrader [Sun, 21 Feb 2010 14:03:22 +0000 (15:03 +0100)]
start by quoting strings
Peter Palfrader [Sun, 21 Feb 2010 14:02:15 +0000 (15:02 +0100)]
I wonder in how many ways this will blow up
Peter Palfrader [Sun, 21 Feb 2010 14:01:19 +0000 (15:01 +0100)]
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
Peter Palfrader [Sun, 21 Feb 2010 14:01:15 +0000 (15:01 +0100)]
Use _ instead of -
Stephen Gran [Sun, 21 Feb 2010 13:28:34 +0000 (13:28 +0000)]
Revert "test template"
This reverts commit
95fe5adaaca52ca56e246c545169ab68fd62d8e4 .
Peter Palfrader [Sun, 21 Feb 2010 13:26:33 +0000 (14:26 +0100)]
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
Peter Palfrader [Sun, 21 Feb 2010 13:26:27 +0000 (14:26 +0100)]
Rename portforwarder to portforwarder-key; Add portforwarder-user-exists fact
Stephen Gran [Sun, 21 Feb 2010 13:26:10 +0000 (13:26 +0000)]
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
Stephen Gran [Sun, 21 Feb 2010 13:26:05 +0000 (13:26 +0000)]
test templateSigned-off-by: Stephen Gran <steve@lobefin.net>
Peter Palfrader [Sun, 21 Feb 2010 12:52:00 +0000 (13:52 +0100)]
Add a facter that collects ssh keys of the portforwarder user
Stephen Gran [Sun, 21 Feb 2010 03:52:51 +0000 (03:52 +0000)]
clean up some formattingSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sun, 21 Feb 2010 03:50:22 +0000 (03:50 +0000)]
right, this is an arraySigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sun, 21 Feb 2010 03:47:26 +0000 (03:47 +0000)]
we don't actually need to build an array and take it back apartSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sun, 21 Feb 2010 03:44:54 +0000 (03:44 +0000)]
we don't need to append to the string nowSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sun, 21 Feb 2010 03:43:31 +0000 (03:43 +0000)]
force into a stringSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sun, 21 Feb 2010 03:41:34 +0000 (03:41 +0000)]
let's use consistent variablesSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sun, 21 Feb 2010 03:39:54 +0000 (03:39 +0000)]
correct template nameSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sun, 21 Feb 2010 03:37:15 +0000 (03:37 +0000)]
automate named.conf.aclSigned-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sun, 21 Feb 2010 03:27:49 +0000 (03:27 +0000)]
fix up some usage of keyinfoSigned-off-by: Stephen Gran <steve@lobefin.net>
projects / dsa-puppet.git / log