Peter Palfrader [Sun, 7 Jun 2009 17:22:04 +0000 (19:22 +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: (26 commits)
Another file that may be changed by puppet to ignore
Maybe we don't need the sleep
eh, duh. Need sudo for this.
Try a longer wait?
wait a moment after running reconfig, so that the reload works
more accurate error message
Move reject of localonly users to predata. This allows callouts to
We push this with a Makefile for now
Correct the name to samhain ignore
Move the config file snippet to the top
Fix the posthooks
Revert "we should also samhain ignore that file"
Revert "And it's directory"
Change path to geo file
Add my key
Some tightening up
Rename the views so I don't have to make code changes
Well, there's only one way to figure out if this will work
And allow the postcommand
Also autogenerate bind config snippets
...
Peter Palfrader [Sun, 7 Jun 2009 17:21:55 +0000 (19:21 +0200)]
apache default config on senfl
Stephen Gran [Sun, 7 Jun 2009 11:43:27 +0000 (12:43 +0100)]
Another file that may be changed by puppet to ignore
Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sun, 7 Jun 2009 11:00:51 +0000 (12:00 +0100)]
Maybe we don't need the sleep
Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sun, 7 Jun 2009 10:59:38 +0000 (11:59 +0100)]
eh, duh. Need sudo for this.
Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sun, 7 Jun 2009 10:58:09 +0000 (11:58 +0100)]
Try a longer wait?
Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sun, 7 Jun 2009 10:52:56 +0000 (11:52 +0100)]
wait a moment after running reconfig, so that the reload works
Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sun, 7 Jun 2009 10:27:55 +0000 (11:27 +0100)]
more accurate error message
Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sun, 7 Jun 2009 10:25:10 +0000 (11:25 +0100)]
Move reject of localonly users to predata. This allows callouts to
work. This feels dishonest.
Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sun, 7 Jun 2009 01:13:30 +0000 (02:13 +0100)]
We push this with a Makefile for now
Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sun, 7 Jun 2009 01:09:21 +0000 (02:09 +0100)]
Correct the name to samhain ignore
Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sun, 7 Jun 2009 01:00:17 +0000 (02:00 +0100)]
Move the config file snippet to the top
Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sun, 7 Jun 2009 00:56:07 +0000 (01:56 +0100)]
Fix the posthooks
Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sun, 7 Jun 2009 00:46:21 +0000 (01:46 +0100)]
Revert "we should also samhain ignore that file"
This reverts commit
4abd7427e3d571770ec2693ea386d983c66a697e.
Stephen Gran [Sun, 7 Jun 2009 00:46:13 +0000 (01:46 +0100)]
Revert "And it's directory"
This reverts commit
3eecb3476b8529c3d0ffba4654fa4e68ef2e8073.
Stephen Gran [Sun, 7 Jun 2009 00:44:02 +0000 (01:44 +0100)]
Change path to geo file
Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sun, 7 Jun 2009 00:43:56 +0000 (01:43 +0100)]
Add my key
Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sat, 6 Jun 2009 23:36:29 +0000 (00:36 +0100)]
Some tightening up
Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sat, 6 Jun 2009 23:36:11 +0000 (00:36 +0100)]
Rename the views so I don't have to make code changes
Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sat, 6 Jun 2009 21:57:15 +0000 (22:57 +0100)]
Well, there's only one way to figure out if this will work
Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sat, 6 Jun 2009 21:22:20 +0000 (22:22 +0100)]
And allow the postcommand
Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sat, 6 Jun 2009 21:18:04 +0000 (22:18 +0100)]
Also autogenerate bind config snippets
Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sat, 6 Jun 2009 20:53:34 +0000 (21:53 +0100)]
And it's directory
Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sat, 6 Jun 2009 20:52:09 +0000 (21:52 +0100)]
we should also samhain ignore that file
Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sat, 6 Jun 2009 20:29:45 +0000 (21:29 +0100)]
Add default fstab for buildds per pkern
https://rt.debian.org/Ticket/Display.html?id=1456
Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Fri, 5 Jun 2009 00:12:07 +0000 (01:12 +0100)]
A few more composer lines
Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Thu, 4 Jun 2009 23:58:33 +0000 (00:58 +0100)]
Add valente composer info
Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sun, 31 May 2009 10:34:12 +0000 (11:34 +0100)]
Remove leader from callout-users (https://rt.debian.org/Ticket/Display.html?id=1437)
Signed-off-by: Stephen Gran <steve@lobefin.net>
Peter Palfrader [Thu, 28 May 2009 21:27:24 +0000 (23:27 +0200)]
Allow adm to run make -C /srv/db.debian.org/dns as geodnssync on draghi without pw prompt
Peter Palfrader [Wed, 27 May 2009 19:56:13 +0000 (21:56 +0200)]
Ignore some files on geoip hosts
Peter Palfrader [Wed, 27 May 2009 19:32:03 +0000 (21:32 +0200)]
Ignore /etc/bind/geodns directory attributes
Peter Palfrader [Wed, 27 May 2009 19:31:15 +0000 (21:31 +0200)]
Remove powerdns files from samhain ignore
Peter Palfrader [Wed, 27 May 2009 19:29:43 +0000 (21:29 +0200)]
ObPuppetHeaders
Peter Palfrader [Wed, 27 May 2009 19:29:27 +0000 (21:29 +0200)]
Make it work with set -u
Peter Palfrader [Wed, 27 May 2009 19:24:00 +0000 (21:24 +0200)]
Add recvconf, recvconf.files, and auth keys to manifest
Peter Palfrader [Wed, 27 May 2009 19:20:20 +0000 (21:20 +0200)]
Change formatting for geodns/manifest
Peter Palfrader [Wed, 27 May 2009 19:16:26 +0000 (21:16 +0200)]
Add authorized keys
Peter Palfrader [Wed, 27 May 2009 19:15:38 +0000 (21:15 +0200)]
Add recvconf.files config file for recvconf
Peter Palfrader [Wed, 27 May 2009 19:05:00 +0000 (21:05 +0200)]
Update (c) year
Peter Palfrader [Wed, 27 May 2009 19:04:50 +0000 (21:04 +0200)]
Add a umask 077 for good measure
Peter Palfrader [Wed, 27 May 2009 19:03:43 +0000 (21:03 +0200)]
Get filelist from the commandline instead of hardcoding it
Peter Palfrader [Wed, 27 May 2009 19:02:06 +0000 (21:02 +0200)]
Also try with set -u
Peter Palfrader [Wed, 27 May 2009 19:01:49 +0000 (21:01 +0200)]
Explicitly set -e instead of getting it from the shebang
Peter Palfrader [Wed, 27 May 2009 19:01:19 +0000 (21:01 +0200)]
Add recvconf from weaselutils r8
Peter Palfrader [Wed, 27 May 2009 18:59:57 +0000 (20:59 +0200)]
Allow geodnssync to reload bind9
Stephen Gran [Wed, 27 May 2009 18:22:26 +0000 (19:22 +0100)]
And fix the typo. Picky bind parser
Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Wed, 27 May 2009 18:19:51 +0000 (19:19 +0100)]
A slightly better solution
Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Wed, 27 May 2009 17:59:44 +0000 (18:59 +0100)]
Add acl for nagios so it doesn't complain constantly. We can come up
with something nicer later.
Signed-off-by: Stephen Gran <steve@lobefin.net>
Peter Palfrader [Tue, 26 May 2009 21:27:56 +0000 (23:27 +0200)]
mv templates/default-index.html modules/apache2/templates/
Peter Palfrader [Tue, 26 May 2009 21:23:57 +0000 (23:23 +0200)]
try with a shorter hostname
Peter Palfrader [Tue, 26 May 2009 21:21:58 +0000 (23:21 +0200)]
fix a html bug
Peter Palfrader [Tue, 26 May 2009 21:16:21 +0000 (23:16 +0200)]
I wonder if this works - try to modify the default apache index for one specific host
Peter Palfrader [Tue, 26 May 2009 18:42:35 +0000 (20:42 +0200)]
Maybe this fixes stuff
Peter Palfrader [Tue, 26 May 2009 18:31:17 +0000 (20:31 +0200)]
Move buildd thing to nodeinfo infrastructure
Peter Palfrader [Tue, 26 May 2009 18:24:33 +0000 (20:24 +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:
remove quotations
Peter Palfrader [Tue, 26 May 2009 18:24:31 +0000 (20:24 +0200)]
Try to refactor nodeinfo.rb - Hope this doesn't break too badly
Martin Zobel-Helas [Tue, 26 May 2009 18:23:28 +0000 (20:23 +0200)]
Merge branch 'master' of git+ssh://zobel@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet
Martin Zobel-Helas [Tue, 26 May 2009 18:23:13 +0000 (20:23 +0200)]
remove quotations
Peter Palfrader [Tue, 26 May 2009 18:15:44 +0000 (20:15 +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:
do not notify
remove quotations
those are ACLs, not views
fix typo
Peter Palfrader [Tue, 26 May 2009 18:15:31 +0000 (20:15 +0200)]
Allow the services array to contain hostlists in addition to single hostnames, and make the list of services dynamic
Peter Palfrader [Tue, 26 May 2009 18:12:24 +0000 (20:12 +0200)]
Something for weasel's vim
Martin Zobel-Helas [Tue, 26 May 2009 18:08:14 +0000 (20:08 +0200)]
do not notify
Martin Zobel-Helas [Tue, 26 May 2009 18:01:57 +0000 (20:01 +0200)]
remove quotations
Martin Zobel-Helas [Tue, 26 May 2009 17:56:12 +0000 (19:56 +0200)]
those are ACLs, not views
Martin Zobel-Helas [Tue, 26 May 2009 17:54:39 +0000 (19:54 +0200)]
fix typo
Martin Zobel-Helas [Tue, 26 May 2009 17:51:22 +0000 (19:51 +0200)]
Merge branch 'master' of git+ssh://zobel@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet
Martin Zobel-Helas [Tue, 26 May 2009 17:51:03 +0000 (19:51 +0200)]
add missing ;
Peter Palfrader [Tue, 26 May 2009 17:46:21 +0000 (19:46 +0200)]
We really want logrotated installed with apache
Peter Palfrader [Tue, 26 May 2009 17:45:40 +0000 (19:45 +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:
add missing include
Peter Palfrader [Tue, 26 May 2009 17:45:32 +0000 (19:45 +0200)]
saens gets apache default config
Peter Palfrader [Tue, 26 May 2009 17:45:07 +0000 (19:45 +0200)]
move info on whether to install apache2 default config from manifest to nodeinfo/local.yaml
Martin Zobel-Helas [Tue, 26 May 2009 17:43:58 +0000 (19:43 +0200)]
add missing include
Martin Zobel-Helas [Tue, 26 May 2009 17:41:03 +0000 (19:41 +0200)]
new geoip dns setup
Peter Palfrader [Tue, 26 May 2009 16:14:46 +0000 (18:14 +0200)]
Remove pointer to lists.debian.org/debian-devel-announce/2003/debian-devel-announce-200312/msg00001.html from motds
Peter Palfrader [Tue, 26 May 2009 16:14:27 +0000 (18:14 +0200)]
Add duarte to local.yaml
Martin Zobel-Helas [Mon, 25 May 2009 19:22:47 +0000 (21:22 +0200)]
remove geoip from puppet for now
Peter Palfrader [Mon, 25 May 2009 17:18:29 +0000 (19:18 +0200)]
ignore two powerdns related things in samhain
Martin Zobel-Helas [Mon, 25 May 2009 15:06:17 +0000 (17:06 +0200)]
Merge branch 'master' of git+ssh://zobel@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet
Martin Zobel-Helas [Mon, 25 May 2009 15:05:46 +0000 (17:05 +0200)]
update ip allocations
Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
Peter Palfrader [Mon, 25 May 2009 12:49:28 +0000 (14:49 +0200)]
Samhain ignore /etc/default/postgrey
Stephen Gran [Mon, 25 May 2009 11:08:45 +0000 (12:08 +0100)]
obligatory puppet headers
Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Mon, 25 May 2009 10:58:46 +0000 (11:58 +0100)]
Add minimal clamav and postgrey classes to the exim::mx class
Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sun, 24 May 2009 12:10:44 +0000 (13:10 +0100)]
Add packagesqamaster to the list that nodeinfo will return
Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sun, 24 May 2009 10:25:42 +0000 (11:25 +0100)]
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
Stephen Gran [Sun, 24 May 2009 10:25:26 +0000 (11:25 +0100)]
packages.qa is on master
Signed-off-by: Stephen Gran <steve@lobefin.net>
Martin Zobel-Helas [Sun, 24 May 2009 10:03:31 +0000 (12:03 +0200)]
Merge branch 'master' of git+ssh://zobel@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet
Luca Filipozzi [Sat, 23 May 2009 14:48:21 +0000 (07:48 -0700)]
gah. typo.
Luca Filipozzi [Sat, 23 May 2009 14:46:00 +0000 (07:46 -0700)]
use \N in preference to escaping escapes
Luca Filipozzi [Sat, 23 May 2009 14:39:34 +0000 (07:39 -0700)]
more escaping required
Stephen Gran [Sat, 23 May 2009 14:20:34 +0000 (15:20 +0100)]
ahem. Use the right key
Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sat, 23 May 2009 14:17:07 +0000 (15:17 +0100)]
samhain ignore the new files for the surbl stuff
Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sat, 23 May 2009 13:45:02 +0000 (14:45 +0100)]
Use new function. This lets us keep the list of 'heavy-exim' hosts in
just one place.
Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sat, 23 May 2009 13:38:15 +0000 (14:38 +0100)]
Add ability to extract keys from nodeinfo
Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sat, 23 May 2009 11:37:25 +0000 (12:37 +0100)]
And add explicit accept at end of mime acl
Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sat, 23 May 2009 11:36:57 +0000 (12:36 +0100)]
Revert "Revert "And another acl for exim"+1"
This reverts commit
4cb5fb5099d0c7177bce071920cecea8dcdda873.
Peter Palfrader [Sat, 23 May 2009 10:49:36 +0000 (12:49 +0200)]
Revert "And another acl for exim"+1
This reverts commits
3feb4c20b11b567a034e2ba06e45c066f380a4b9 and
b8fa816fa0c7ec2dc5d626b16ec4ef5f2afe1b6d.
These break some of our mail for now.
Stephen Gran [Sat, 23 May 2009 01:43:45 +0000 (02:43 +0100)]
Let people know why their mail is being rejected with the new check
Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sat, 23 May 2009 01:30:45 +0000 (02:30 +0100)]
Comment out the rbl.debian.net stuff while it's timing out all the time
Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sat, 23 May 2009 00:16:04 +0000 (01:16 +0100)]
Add the check to a few more hosts
Signed-off-by: Stephen Gran <steve@lobefin.net>
Stephen Gran [Sat, 23 May 2009 00:13:41 +0000 (01:13 +0100)]
This works better, even though it's a little more tedious
Signed-off-by: Stephen Gran <steve@lobefin.net>