mirror/dsa-puppet.git
15 years agoAdd bugs to geo zones
Peter Palfrader [Fri, 25 Sep 2009 09:03:51 +0000 (11:03 +0200)]
Add bugs to geo zones

15 years agosources cleanup
Peter Palfrader [Tue, 22 Sep 2009 23:19:06 +0000 (01:19 +0200)]
sources cleanup

15 years agoAlso do not volatile and backports on squeeze machines
Peter Palfrader [Tue, 22 Sep 2009 23:18:40 +0000 (01:18 +0200)]
Also do not volatile and backports on squeeze machines

15 years agowith templates it is content
Peter Palfrader [Tue, 22 Sep 2009 23:15:55 +0000 (01:15 +0200)]
with templates it is content

15 years agoMerge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
Stephen Gran [Tue, 22 Sep 2009 23:13:27 +0000 (00:13 +0100)]
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

15 years agono, really, path
Stephen Gran [Tue, 22 Sep 2009 23:13:24 +0000 (00:13 +0100)]
no, really, path

Signed-off-by: Stephen Gran <steve@lobefin.net>
15 years agoRevert "Revert "try some template magic""
Peter Palfrader [Tue, 22 Sep 2009 23:12:13 +0000 (01:12 +0200)]
Revert "Revert "try some template magic""

This reverts commit 22ff227cc4266957cb45c731f0e26339116877d2.

15 years agopath
Stephen Gran [Tue, 22 Sep 2009 23:11:58 +0000 (00:11 +0100)]
path

Signed-off-by: Stephen Gran <steve@lobefin.net>
15 years agoMerge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
Peter Palfrader [Tue, 22 Sep 2009 23:11:52 +0000 (01:11 +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:
  path

15 years agoInclude nodeinfo first thing
Peter Palfrader [Tue, 22 Sep 2009 23:11:46 +0000 (01:11 +0200)]
Include nodeinfo first thing

15 years agoRevert "try some template magic"
Peter Palfrader [Tue, 22 Sep 2009 23:07:08 +0000 (01:07 +0200)]
Revert "try some template magic"

This reverts commit 60d7aa2172197ae09aeab97295330f3281f8b282.

15 years agotry some template magic
Peter Palfrader [Tue, 22 Sep 2009 23:03:42 +0000 (01:03 +0200)]
try some template magic

15 years agoand move buildd list to its module
Stephen Gran [Tue, 22 Sep 2009 23:01:16 +0000 (00:01 +0100)]
and move buildd list to its module

Signed-off-by: Stephen Gran <steve@lobefin.net>
15 years agoMerge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
Peter Palfrader [Tue, 22 Sep 2009 22:56:28 +0000 (00:56 +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:
  oops, dependency loop

15 years agosilly git
Peter Palfrader [Tue, 22 Sep 2009 22:56:25 +0000 (00:56 +0200)]
silly git

15 years agoMerge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
Stephen Gran [Tue, 22 Sep 2009 22:52:36 +0000 (23:52 +0100)]
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

15 years agooops, dependency loop
Stephen Gran [Tue, 22 Sep 2009 22:52:28 +0000 (23:52 +0100)]
oops, dependency loop

Signed-off-by: Stephen Gran <steve@lobefin.net>
15 years agoMake sources.list.d entries into templates
Peter Palfrader [Tue, 22 Sep 2009 22:50:58 +0000 (00:50 +0200)]
Make sources.list.d entries into templates

15 years agoand fano and finzi are on squeeze
Peter Palfrader [Tue, 22 Sep 2009 22:44:52 +0000 (00:44 +0200)]
and fano and finzi are on squeeze

15 years agofano and finzi are buildds
Peter Palfrader [Tue, 22 Sep 2009 22:44:05 +0000 (00:44 +0200)]
fano and finzi are buildds

15 years agoLet fano and finzi relay via dijkstra
Peter Palfrader [Tue, 22 Sep 2009 22:43:43 +0000 (00:43 +0200)]
Let fano and finzi relay via dijkstra

15 years agoAdd fano and finzi to dedications
Peter Palfrader [Tue, 22 Sep 2009 22:43:04 +0000 (00:43 +0200)]
Add fano and finzi to dedications

15 years agothe correct IP address can only help
Peter Palfrader [Tue, 22 Sep 2009 22:26:16 +0000 (00:26 +0200)]
the correct IP address can only help

15 years agoMake dijkstra relay for finzi - I wonder if that works
Peter Palfrader [Tue, 22 Sep 2009 22:25:29 +0000 (00:25 +0200)]
Make dijkstra relay for finzi - I wonder if that works

15 years agoa few more bsd exclusions
Stephen Gran [Tue, 22 Sep 2009 22:15:48 +0000 (23:15 +0100)]
a few more bsd exclusions

Signed-off-by: Stephen Gran <steve@lobefin.net>
15 years agovariable fixup
Stephen Gran [Tue, 22 Sep 2009 22:13:43 +0000 (23:13 +0100)]
variable fixup

Signed-off-by: Stephen Gran <steve@lobefin.net>
15 years agopath fix
Stephen Gran [Tue, 22 Sep 2009 22:10:42 +0000 (23:10 +0100)]
path fix

Signed-off-by: Stephen Gran <steve@lobefin.net>
15 years agomove syslog-ng.conf to a template for bsd
Stephen Gran [Tue, 22 Sep 2009 22:06:35 +0000 (23:06 +0100)]
move syslog-ng.conf to a template for bsd

Signed-off-by: Stephen Gran <steve@lobefin.net>
15 years agounnecessary to constrain this to a linux kernel
Stephen Gran [Tue, 22 Sep 2009 20:22:16 +0000 (21:22 +0100)]
unnecessary to constrain this to a linux kernel

Signed-off-by: Stephen Gran <steve@lobefin.net>
15 years agoanother missing dependency
Stephen Gran [Sun, 20 Sep 2009 11:44:16 +0000 (12:44 +0100)]
another missing dependency

Signed-off-by: Stephen Gran <steve@lobefin.net>
15 years agomaybe this will be nicer
Stephen Gran [Sun, 20 Sep 2009 11:37:17 +0000 (12:37 +0100)]
maybe this will be nicer

Signed-off-by: Stephen Gran <steve@lobefin.net>
15 years agoMerge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
Stephen Gran [Sun, 20 Sep 2009 11:31:33 +0000 (12:31 +0100)]
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

15 years agoget a few more file => package dependencies right
Stephen Gran [Sun, 20 Sep 2009 11:31:30 +0000 (12:31 +0100)]
get a few more file => package dependencies right

Signed-off-by: Stephen Gran <steve@lobefin.net>
15 years agoRemove allegri from spohr's manualroute
Peter Palfrader [Sun, 20 Sep 2009 10:47:18 +0000 (12:47 +0200)]
Remove allegri from spohr's manualroute

15 years agosome pretty printing
Stephen Gran [Sat, 19 Sep 2009 16:38:12 +0000 (17:38 +0100)]
some pretty printing

Signed-off-by: Stephen Gran <steve@lobefin.net>
15 years agoTry to ignore all of /etc/bind/geodns
Peter Palfrader [Thu, 17 Sep 2009 21:46:05 +0000 (23:46 +0200)]
Try to ignore all of /etc/bind/geodns

15 years agoAdd packages.d.o to geo
Peter Palfrader [Thu, 17 Sep 2009 12:07:31 +0000 (14:07 +0200)]
Add packages.d.o to geo

15 years agoUse autogenerated recvconf and named config
Peter Palfrader [Thu, 17 Sep 2009 12:01:11 +0000 (14:01 +0200)]
Use autogenerated recvconf and named config

15 years agoWe do not ship a named.conf.geo.$zone file using recvfiles
Peter Palfrader [Thu, 17 Sep 2009 10:39:52 +0000 (12:39 +0200)]
We do not ship a named.conf.geo.$zone file using recvfiles

15 years agoGet rid of video
Peter Palfrader [Wed, 16 Sep 2009 16:42:57 +0000 (18:42 +0200)]
Get rid of video

15 years agoMerge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
Peter Palfrader [Tue, 15 Sep 2009 21:33:32 +0000 (23:33 +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:
  reverse zone on slaves
  another blacklist entry
  blacklist *@piekmarketing.eu for spam

15 years agoipv6 address for schumann
Peter Palfrader [Tue, 15 Sep 2009 21:33:27 +0000 (23:33 +0200)]
ipv6 address for schumann

15 years agoreverse zone on slaves
Stephen Gran [Tue, 15 Sep 2009 19:12:36 +0000 (20:12 +0100)]
reverse zone on slaves

Signed-off-by: Stephen Gran <steve@lobefin.net>
15 years agoanother blacklist entry
Stephen Gran [Mon, 14 Sep 2009 20:41:29 +0000 (21:41 +0100)]
another blacklist entry

Signed-off-by: Stephen Gran <steve@lobefin.net>
15 years agoblacklist *@piekmarketing.eu for spam
Stephen Gran [Thu, 10 Sep 2009 19:31:57 +0000 (20:31 +0100)]
blacklist *@piekmarketing.eu for spam

Signed-off-by: Stephen Gran <steve@lobefin.net>
15 years agoraff no longer is buildd, w-b and keyring - remove from backup ssh keys
Peter Palfrader [Sun, 6 Sep 2009 22:55:00 +0000 (00:55 +0200)]
raff no longer is buildd, w-b and keyring - remove from backup ssh keys

15 years agoAdd cimarosa with /etc and w-b and buildd
Peter Palfrader [Sun, 6 Sep 2009 22:52:34 +0000 (00:52 +0200)]
Add cimarosa with /etc and w-b and buildd

15 years agoAdd respighi with /etc and patch-tracker
Peter Palfrader [Sun, 6 Sep 2009 22:36:14 +0000 (00:36 +0200)]
Add respighi with /etc and patch-tracker

15 years agoMerge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
Peter Palfrader [Sun, 6 Sep 2009 18:11:03 +0000 (20:11 +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:
  apache is weird
  Oh puppet, you are so picky
  Make rlimitmem host dependent
  Make ressource-limits a template

15 years agoset /etc/mailname
Peter Palfrader [Sun, 6 Sep 2009 18:10:41 +0000 (20:10 +0200)]
set /etc/mailname

15 years agoapache is weird
Peter Palfrader [Sat, 5 Sep 2009 16:31:02 +0000 (18:31 +0200)]
apache is weird

15 years agoOh puppet, you are so picky
Peter Palfrader [Sat, 5 Sep 2009 15:34:19 +0000 (17:34 +0200)]
Oh puppet, you are so picky

15 years agoMake rlimitmem host dependent
Peter Palfrader [Sat, 5 Sep 2009 15:33:19 +0000 (17:33 +0200)]
Make rlimitmem host dependent

15 years agoMake ressource-limits a template
Peter Palfrader [Sat, 5 Sep 2009 15:32:20 +0000 (17:32 +0200)]
Make ressource-limits a template

15 years agodouble RLimitMEM to 64m
Peter Palfrader [Sat, 5 Sep 2009 14:24:24 +0000 (16:24 +0200)]
double RLimitMEM to 64m

15 years agodisable buildd related vdomains on raff. remove logs.buildd vdomain on cimarosa
Peter Palfrader [Sat, 5 Sep 2009 14:09:52 +0000 (16:09 +0200)]
disable buildd related vdomains on raff.  remove logs.buildd vdomain on cimarosa

15 years agopatch-tracker sudo to patch-tracker
Peter Palfrader [Wed, 2 Sep 2009 08:44:40 +0000 (10:44 +0200)]
patch-tracker sudo to patch-tracker

15 years agoAdd respighi to apache stuff
Peter Palfrader [Tue, 1 Sep 2009 14:04:02 +0000 (16:04 +0200)]
Add respighi to apache stuff

15 years agoremove edit artefact
Peter Palfrader [Sat, 29 Aug 2009 07:23:09 +0000 (09:23 +0200)]
remove edit artefact

15 years agodannf installed newer udev on peri and penalosa
Peter Palfrader [Sat, 29 Aug 2009 07:18:56 +0000 (09:18 +0200)]
dannf installed newer udev on peri and penalosa

15 years agoInstall zivit's new zabbix-agent and rrdcollect on zelenka
Peter Palfrader [Sat, 29 Aug 2009 07:12:59 +0000 (09:12 +0200)]
Install zivit's new zabbix-agent and rrdcollect on zelenka

15 years agonagios sudo arcconf on paganini,respighi,vivaldi
Peter Palfrader [Sat, 29 Aug 2009 07:00:50 +0000 (09:00 +0200)]
nagios sudo arcconf on paganini,respighi,vivaldi

15 years agoOh ssh, why are you /that/ picky
Peter Palfrader [Fri, 28 Aug 2009 21:15:42 +0000 (23:15 +0200)]
Oh ssh, why are you /that/ picky

15 years agoAdd dedications for paganini, respighi, vivaldi
Peter Palfrader [Fri, 28 Aug 2009 20:44:00 +0000 (22:44 +0200)]
Add dedications for paganini, respighi, vivaldi

15 years agoDanger, Will Robinson. We need to create etc/ssh/userkeys - else we lock ourselves...
Peter Palfrader [Fri, 28 Aug 2009 20:29:06 +0000 (22:29 +0200)]
Danger, Will Robinson.  We need to create etc/ssh/userkeys - else we lock ourselves out nicely

15 years agoSet alternatives for editor
Peter Palfrader [Thu, 27 Aug 2009 14:44:46 +0000 (16:44 +0200)]
Set alternatives for editor

15 years agoMerge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
Peter Palfrader [Wed, 26 Aug 2009 09:50:50 +0000 (11:50 +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:
  Ignore /etc/apache2/conf.d/ressource-limits
  set apache ressource limits (RT#1481)
  more hosts use default buildd software
  lebrun becomes standard buildd

15 years agoRun puppet sync with timeout(1) if it's installed
Peter Palfrader [Wed, 26 Aug 2009 08:43:23 +0000 (10:43 +0200)]
Run puppet sync with timeout(1) if it's installed

15 years agoIgnore /etc/apache2/conf.d/ressource-limits
Peter Palfrader [Sun, 23 Aug 2009 13:06:10 +0000 (15:06 +0200)]
Ignore /etc/apache2/conf.d/ressource-limits

15 years agoset apache ressource limits (RT#1481)
Peter Palfrader [Sun, 23 Aug 2009 08:31:00 +0000 (10:31 +0200)]
set apache ressource limits (RT#1481)

15 years agomore hosts use default buildd software
Martin Zobel-Helas [Thu, 20 Aug 2009 11:43:42 +0000 (13:43 +0200)]
more hosts use default buildd software

15 years agolebrun becomes standard buildd
Martin Zobel-Helas [Wed, 19 Aug 2009 15:50:00 +0000 (17:50 +0200)]
lebrun becomes standard buildd

15 years agoa dir and a file to ignore
Peter Palfrader [Tue, 18 Aug 2009 21:25:11 +0000 (23:25 +0200)]
a dir and a file to ignore

15 years agoset /proc/sys/vm/mmap_min_addr to 4096
Faidon Liambotis [Fri, 14 Aug 2009 01:24:39 +0000 (04:24 +0300)]
set /proc/sys/vm/mmap_min_addr to 4096

This prohibits userland to mmap() page 0 and therefore mitigates
exploits that use NULL-pointer dereference vulnerabilities in the
kernel.

Introduce a sysctl puppet definition for this that can be used to set
other sysctl knobs as well.

Signed-off-by: Peter Palfrader <peter@palfrader.org>
15 years agoAlso do not ignore this
Peter Palfrader [Sun, 16 Aug 2009 09:43:04 +0000 (11:43 +0200)]
Also do not ignore this

15 years agoRevert "samhain ignore /etc/ssh/userkeys since we now ship a file under it. Sigh"
Peter Palfrader [Sun, 16 Aug 2009 01:04:44 +0000 (03:04 +0200)]
Revert "samhain ignore /etc/ssh/userkeys since we now ship a file under it.  Sigh"

Let's not do this.

This reverts commit 7f521b2d1ef66a10c884e46613c8dacc40235640.

15 years agosamhain ignore /etc/ssh/userkeys since we now ship a file under it. Sigh
Stephen Gran [Sun, 16 Aug 2009 00:26:17 +0000 (01:26 +0100)]
samhain ignore /etc/ssh/userkeys since we now ship a file under it.  Sigh
Signed-off-by: Stephen Gran <steve@lobefin.net>
15 years agoum, we probably want all those extra keys on bartok
Stephen Gran [Sun, 16 Aug 2009 00:14:48 +0000 (01:14 +0100)]
um, we probably want all those extra keys on bartok

Signed-off-by: Stephen Gran <steve@lobefin.net>
15 years agosyntax error
Stephen Gran [Sat, 15 Aug 2009 19:24:22 +0000 (20:24 +0100)]
syntax error

Signed-off-by: Stephen Gran <steve@lobefin.net>
15 years agowhat can possibly go wrong
Stephen Gran [Sat, 15 Aug 2009 10:30:35 +0000 (11:30 +0100)]
what can possibly go wrong
Signed-off-by: Stephen Gran <steve@lobefin.net>
15 years agoI suspect this wants an end
Peter Palfrader [Wed, 12 Aug 2009 13:59:12 +0000 (15:59 +0200)]
I suspect this wants an end

15 years agoAnd deploy default apache config to widor
Peter Palfrader [Wed, 12 Aug 2009 10:02:24 +0000 (12:02 +0200)]
And deploy default apache config to widor

15 years agoMerge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
Peter Palfrader [Wed, 12 Aug 2009 08:30:00 +0000 (10:30 +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:
  ignore /etc/bind as well
  Make bind write to a subdirectory of /var/log

15 years agoAnd deploy default apache config to liszt
Peter Palfrader [Wed, 12 Aug 2009 08:29:47 +0000 (10:29 +0200)]
And deploy default apache config to liszt

15 years agoignore /etc/bind as well
Stephen Gran [Tue, 11 Aug 2009 09:15:20 +0000 (10:15 +0100)]
ignore /etc/bind as well
Signed-off-by: Stephen Gran <steve@lobefin.net>
15 years agoMake bind write to a subdirectory of /var/log
Stephen Gran [Tue, 11 Aug 2009 08:08:21 +0000 (09:08 +0100)]
Make bind write to a subdirectory of /var/log
Signed-off-by: Stephen Gran <steve@lobefin.net>
15 years ago(over?)simplify the test for a smartarray controller
Stephen Gran [Wed, 5 Aug 2009 21:51:33 +0000 (22:51 +0100)]
(over?)simplify the test for a smartarray controller
Signed-off-by: Stephen Gran <steve@lobefin.net>
15 years agoWe know where lspci wil be
Stephen Gran [Wed, 5 Aug 2009 07:54:20 +0000 (08:54 +0100)]
We know where lspci wil be
Signed-off-by: Stephen Gran <steve@lobefin.net>
15 years agooops: /usr/lib/ruby/1.8/facter/util/loader.rb:72:in `load': /var/lib/puppet/facts...
Stephen Gran [Tue, 4 Aug 2009 20:40:18 +0000 (21:40 +0100)]
oops: /usr/lib/ruby/1.8/facter/util/loader.rb:72:in `load': /var/lib/puppet/facts/raidarray.rb:11: syntax error, unexpected kEND, expecting ')' (SyntaxError)

Signed-off-by: Stephen Gran <steve@lobefin.net>
15 years agoOh what the hell, one more try to make it shut up
Stephen Gran [Tue, 4 Aug 2009 19:02:13 +0000 (20:02 +0100)]
Oh what the hell, one more try to make it shut up
Signed-off-by: Stephen Gran <steve@lobefin.net>
15 years agoMerge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
Stephen Gran [Sun, 2 Aug 2009 22:02:01 +0000 (23:02 +0100)]
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

15 years agowe probably don't need to ignore /etc/ssh twice, samhain probably understood the...
Stephen Gran [Sun, 2 Aug 2009 22:01:53 +0000 (23:01 +0100)]
we probably don't need to ignore /etc/ssh twice, samhain probably understood the first time

Signed-off-by: Stephen Gran <steve@lobefin.net>
15 years agoI think keys for root's auth keys should not be our every-day ssh key. they should...
Peter Palfrader [Sun, 2 Aug 2009 13:32:11 +0000 (15:32 +0200)]
I think keys for root's auth keys should not be our every-day ssh key.  they should be specially protected keys, not usually loaded into an agent.  Start by removing my daily use keys

15 years agomode and whitespace for /etc/ssh/userkeys/root
Stephen Gran [Sun, 2 Aug 2009 13:21:07 +0000 (14:21 +0100)]
mode and whitespace for /etc/ssh/userkeys/root

Signed-off-by: Stephen Gran <steve@lobefin.net>
15 years agoignore /etc/ssh/userkeys/root
Stephen Gran [Sun, 2 Aug 2009 13:19:39 +0000 (14:19 +0100)]
ignore /etc/ssh/userkeys/root

Signed-off-by: Stephen Gran <steve@lobefin.net>
15 years agoFirst check in of authoized_keys - no functional difference yet, just
Stephen Gran [Sun, 2 Aug 2009 13:13:33 +0000 (14:13 +0100)]
First check in of authoized_keys - no functional difference yet, just
replacing existing manual method.  let's clean this up a bit.
Signed-off-by: Stephen Gran <steve@lobefin.net>
15 years agolet's see if we can make the lspci test quiet
Stephen Gran [Sun, 2 Aug 2009 01:21:30 +0000 (02:21 +0100)]
let's see if we can make the lspci test quiet

Signed-off-by: Stephen Gran <steve@lobefin.net>
15 years agoMerge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
Stephen Gran [Sun, 2 Aug 2009 00:36:04 +0000 (01:36 +0100)]
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

15 years agoGrumble grumble - erb strikes again
Stephen Gran [Sun, 2 Aug 2009 00:35:45 +0000 (01:35 +0100)]
Grumble grumble - erb strikes again
Signed-off-by: Stephen Gran <steve@lobefin.net>
15 years agogluck does not need to listen on 443 anymore - that was just for when it was people.do
Peter Palfrader [Sun, 2 Aug 2009 00:35:29 +0000 (02:35 +0200)]
gluck does not need to listen on 443 anymore - that was just for when it was people.do