Neale Pickett
2a97849d12
Map of participation
2013-01-11 09:33:04 -07:00
Neale Pickett
dc4f1a658e
Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf
...
Conflicts:
packages/p2/bin/p2console
2012-12-18 10:16:42 -07:00
Neale Pickett
cd7e9bce63
Some p2 changes
2012-12-18 10:15:08 -07:00
Neale Pickett
0e482ff73b
Make a poster
2012-12-17 16:27:35 -07:00
Neale Pickett
b51eadcbc6
Document netarch category
2012-11-14 17:56:06 -07:00
Neale Pickett
31493774a3
Possibly working directory auto-detection
2012-11-07 19:44:27 -07:00
Neale Pickett
45a3c84144
make a stab at detecting fs layout
2012-10-31 16:01:36 -06:00
Neale Pickett
05b747620c
Merge branch 'novar'
...
Conflicts:
packages/p2/www/index.html
2012-08-16 19:48:06 -06:00
Neale Pickett
7ec065dc09
Fail startup of points if packages are not online yet
2012-08-16 19:47:19 -06:00
Neale Pickett
84b5a8f76c
puzzles.cgi from novar branch
2012-07-26 19:28:29 -06:00
Neale Pickett
2ae4a6011d
add bus. card puzzle, mention radio on index
2012-07-26 19:25:36 -06:00
Neale Pickett
de6edf75f5
Merge answers from novar for p2@dc20
2012-07-26 17:57:33 -06:00
Neale Pickett
3024ff284d
make radio answers
2012-07-26 17:54:53 -06:00
Neale Pickett
949cabcff3
Merge remote-tracking branch 'fozzie/master' into novar
2012-07-26 17:38:48 -06:00
Neale Pickett
7e1a8b394a
nyancat part of DJ puzzle
2012-07-23 23:03:26 -06:00
Neale Pickett
bc059b9f8d
Merge branch 'master' of fozzie:projects/ctf
2012-07-23 20:35:02 -06:00
Neale Pickett
3c31dbd379
add answers for radio
2012-07-23 20:34:48 -06:00
Neale Pickett
1225ddac81
better tanx
2012-07-23 16:33:40 -06:00
Neale Pickett
64e3753e51
Move away from /var
2012-07-22 17:14:06 -06:00
Neale Pickett
7f81b07b49
add network disclaimer to p2 page
2012-07-20 15:35:20 -06:00
Neale Pickett
361a331a86
a few changes for HACK
2012-07-16 17:46:27 -06:00
Neale Pickett
10718c882c
lots of little fixups, caught up with todo after trail run in ACS
2012-07-12 17:15:43 -06:00
Neale Pickett
87f0975f44
fix routing for p2
2012-07-12 16:55:36 -06:00
Neale Pickett
0c21efb96c
add gs service, use new eris command-line option
2012-07-02 18:21:00 -06:00
Neale Pickett
db2eea8c7f
add p2.xcf
2012-06-27 14:41:52 -06:00
Neale Pickett
af4788b541
Add generalstatics category
2012-06-27 14:40:51 -06:00
Neale Pickett
febb10e92f
add 2012 generalstatics.com site
2012-06-27 13:46:32 -06:00
Neale Pickett
d18ad8238f
Add category to URL in puzzles.cgi
2012-06-13 11:37:13 -06:00
Aaron McPhall
0ac533c2cf
Fixed my mistakes on puzzles.cgi.c
2012-06-13 13:31:14 -04:00
Neale Pickett
b0bb5b56ca
Move var decl in puzzles.cgi.c to work with older C
2012-06-13 11:23:16 -06:00
Neale Pickett
0bcfe50137
pointscli no longer fails on success
2012-06-13 11:11:26 -06:00
Neale Pickett
b8296a5414
map handles to RL names for mcp
2012-06-13 10:48:55 -06:00
Neale Pickett
290bfced19
Make P2 use its own www directory
2012-06-12 21:07:56 -06:00
Neale Pickett
f5d1035ee1
disable p2cli screen black (thanks slackish)
2012-06-12 19:48:19 -06:00
Neale Pickett
f996c1921b
Working p2, eliminate 00admin
...
This required a fair amount of shuffling stuff around, as can be seen.
Fortunately, now things ought to be able to run more or less standalone
again.
I also figured out a way to have the build system be a tad smarter about
not rebuilding shared stuff, although you still install the exact same eris
binary and /service subdirs for mcp and p2. But at least you only have to
change one place in the source code now.
2012-06-12 18:25:32 -06:00
Neale Pickett
665a052c8c
Working, tested p2 console
2012-06-11 14:37:39 -06:00
Neale Pickett
fa12219e3a
Start at p2 server package
2012-06-09 16:11:23 -06:00
Neale Pickett
3d87e538ec
Make fire-ip accept v4 or v6 IPs
2012-06-09 15:55:02 -06:00
Neale Pickett
3d32295d0b
s/sbin/bin/ for fire-ip
2012-06-09 15:50:45 -06:00
Neale Pickett
651778bee9
p2client package
2012-06-09 14:42:46 -06:00
Aaron J. McPhall
ae563a071a
Updated p2 scoreboard to include helpful text. will need some positioning later though
2012-06-08 16:08:07 -06:00
Neale Pickett
dbad7a6c81
simplify duplicate line check in pointsd
2012-06-06 22:13:49 -06:00
Neale Pickett
07bcdb95c9
working p2 scoreboard
2012-06-06 22:11:54 -06:00
Neale Pickett
3182a58a40
more p2 scoreboard work
2012-06-06 17:51:37 -06:00
Neale Pickett
1c1b1ab22b
work on p2 scoreboard
2012-06-06 14:55:09 -06:00
Neale Pickett
fa0324dbf8
Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf
2012-06-06 11:36:20 -06:00
Neale Pickett
cdd2198713
ignore printf build warnings
2012-06-06 00:03:40 -06:00
Neale Pickett
1865566a0c
merge backup into pointsd
2012-06-05 23:56:29 -06:00
Neale Pickett
fd742b8af8
avoid duplicates in points.log
2012-06-05 16:55:58 -06:00
Neale Pickett
a5ec70a6d7
Merge remote-tracking branch 'fozzie/master'
2012-06-01 10:58:32 -06:00