Commit Graph

562 Commits

Author SHA1 Message Date
Neale Pickett 4589b0d189 Map of participation 2013-01-11 09:33:04 -07:00
Neale Pickett 5203a2c45d 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 6d21e999b2 Some p2 changes 2012-12-18 10:15:08 -07:00
Neale Pickett f2f8ccb895 Make a poster 2012-12-17 16:27:35 -07:00
Neale Pickett c3efbbb0e5 Document netarch category 2012-11-14 17:56:06 -07:00
Neale Pickett 91e946bc05 Possibly working directory auto-detection 2012-11-07 19:44:27 -07:00
Neale Pickett 44e41c48e5 make a stab at detecting fs layout 2012-10-31 16:01:36 -06:00
Neale Pickett 16a4a0b4d8 Merge branch 'novar'
Conflicts:
	packages/p2/www/index.html
2012-08-16 19:48:06 -06:00
Neale Pickett f95605f3e6 Fail startup of points if packages are not online yet 2012-08-16 19:47:19 -06:00
Neale Pickett 151648c6f2 puzzles.cgi from novar branch 2012-07-26 19:28:29 -06:00
Neale Pickett 8785008932 add bus. card puzzle, mention radio on index 2012-07-26 19:25:36 -06:00
Neale Pickett c703ab3aa2 Merge answers from novar for p2@dc20 2012-07-26 17:57:33 -06:00
Neale Pickett a73127840d make radio answers 2012-07-26 17:54:53 -06:00
Neale Pickett adb68f0b46 Merge remote-tracking branch 'fozzie/master' into novar 2012-07-26 17:38:48 -06:00
Neale Pickett dd838168fa nyancat part of DJ puzzle 2012-07-23 23:03:26 -06:00
Neale Pickett 31342d615c Merge branch 'master' of fozzie:projects/ctf 2012-07-23 20:35:02 -06:00
Neale Pickett 8df8797bb6 add answers for radio 2012-07-23 20:34:48 -06:00
Neale Pickett f51d21bd67 better tanx 2012-07-23 16:33:40 -06:00
Neale Pickett 2824aad4ec Move away from /var 2012-07-22 17:14:06 -06:00
Neale Pickett 783a07d234 add network disclaimer to p2 page 2012-07-20 15:35:20 -06:00
Neale Pickett 1ee6beda0b a few changes for HACK 2012-07-16 17:46:27 -06:00
Neale Pickett bba4851995 lots of little fixups, caught up with todo after trail run in ACS 2012-07-12 17:15:43 -06:00
Neale Pickett d401cdee45 fix routing for p2 2012-07-12 16:55:36 -06:00
Neale Pickett 642e1df68e add gs service, use new eris command-line option 2012-07-02 18:21:00 -06:00
Neale Pickett a4b24249fe add p2.xcf 2012-06-27 14:41:52 -06:00
Neale Pickett 18fc122c8e Add generalstatics category 2012-06-27 14:40:51 -06:00
Neale Pickett c49cf0c03e add 2012 generalstatics.com site 2012-06-27 13:46:32 -06:00
Neale Pickett 2b71173ca8 Add category to URL in puzzles.cgi 2012-06-13 11:37:13 -06:00
Aaron McPhall f73ab8d01d Fixed my mistakes on puzzles.cgi.c 2012-06-13 13:31:14 -04:00
Neale Pickett 941dd5fd9b Move var decl in puzzles.cgi.c to work with older C 2012-06-13 11:23:16 -06:00
Neale Pickett ac038ac3f1 pointscli no longer fails on success 2012-06-13 11:11:26 -06:00
Neale Pickett 77c940437c map handles to RL names for mcp 2012-06-13 10:48:55 -06:00
Neale Pickett 9de96c1ca2 Make P2 use its own www directory 2012-06-12 21:07:56 -06:00
Neale Pickett 02e540123a disable p2cli screen black (thanks slackish) 2012-06-12 19:48:19 -06:00
Neale Pickett f3c31e2d65 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 81d52e3bdf Working, tested p2 console 2012-06-11 14:37:39 -06:00
Neale Pickett a7753f712c Start at p2 server package 2012-06-09 16:11:23 -06:00
Neale Pickett 2617552974 Make fire-ip accept v4 or v6 IPs 2012-06-09 15:55:02 -06:00
Neale Pickett 08ed30cf3e s/sbin/bin/ for fire-ip 2012-06-09 15:50:45 -06:00
Neale Pickett ccb2165966 p2client package 2012-06-09 14:42:46 -06:00
Aaron J. McPhall 6520f7dac6 Updated p2 scoreboard to include helpful text. will need some positioning later though 2012-06-08 16:08:07 -06:00
Neale Pickett 2ba0d2ecec simplify duplicate line check in pointsd 2012-06-06 22:13:49 -06:00
Neale Pickett 743099a57b working p2 scoreboard 2012-06-06 22:11:54 -06:00
Neale Pickett bb923abc6b more p2 scoreboard work 2012-06-06 17:51:37 -06:00
Neale Pickett e3cf808e79 work on p2 scoreboard 2012-06-06 14:55:09 -06:00
Neale Pickett 0163c4e636 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2012-06-06 11:36:20 -06:00
Neale Pickett d4568c4143 ignore printf build warnings 2012-06-06 00:03:40 -06:00
Neale Pickett b43c76c839 merge backup into pointsd 2012-06-05 23:56:29 -06:00
Neale Pickett bbb17c787e avoid duplicates in points.log 2012-06-05 16:55:58 -06:00
Neale Pickett 0225cc740c Merge remote-tracking branch 'fozzie/master' 2012-06-01 10:58:32 -06:00