Commit Graph

567 Commits

Author SHA1 Message Date
Neale Pickett 0e0333fa92 switched a course for someone 2013-01-28 15:33:30 -07:00
Neale Pickett 3ea9fe06a8 More supporting files for class assignment 2013-01-28 15:30:06 -07:00
Neale Pickett a10a93881e I assigned classes 2013-01-28 15:28:41 -07:00
Neale Pickett fd077393bd Add class registration script 2013-01-28 08:23:31 -07:00
Neale Pickett 1864c13941 Map updates 2013-01-16 11:32:53 -07:00
Neale Pickett df26ae2644 Map of participation 2013-01-11 09:33:04 -07:00
Neale Pickett 7a8f4730b7 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 770f4d387e Some p2 changes 2012-12-18 10:15:08 -07:00
Neale Pickett 68052e283c Make a poster 2012-12-17 16:27:35 -07:00
Neale Pickett d482f76cd9 Document netarch category 2012-11-14 17:56:06 -07:00
Neale Pickett 08bed422c2 Possibly working directory auto-detection 2012-11-07 19:44:27 -07:00
Neale Pickett e38d31210b make a stab at detecting fs layout 2012-10-31 16:01:36 -06:00
Neale Pickett f718b00405 Merge branch 'novar'
Conflicts:
	packages/p2/www/index.html
2012-08-16 19:48:06 -06:00
Neale Pickett 3c80183dab Fail startup of points if packages are not online yet 2012-08-16 19:47:19 -06:00
Neale Pickett 009578a3f6 puzzles.cgi from novar branch 2012-07-26 19:28:29 -06:00
Neale Pickett 5f133fe753 add bus. card puzzle, mention radio on index 2012-07-26 19:25:36 -06:00
Neale Pickett 6371952952 Merge answers from novar for p2@dc20 2012-07-26 17:57:33 -06:00
Neale Pickett 6a642fb946 make radio answers 2012-07-26 17:54:53 -06:00
Neale Pickett 79a7261df6 Merge remote-tracking branch 'fozzie/master' into novar 2012-07-26 17:38:48 -06:00
Neale Pickett 58d62f4427 nyancat part of DJ puzzle 2012-07-23 23:03:26 -06:00
Neale Pickett 0bbb8f670a Merge branch 'master' of fozzie:projects/ctf 2012-07-23 20:35:02 -06:00
Neale Pickett adbdb53836 add answers for radio 2012-07-23 20:34:48 -06:00
Neale Pickett 7dbff5baaa better tanx 2012-07-23 16:33:40 -06:00
Neale Pickett d9276c9a18 Move away from /var 2012-07-22 17:14:06 -06:00
Neale Pickett bec4c1e91e add network disclaimer to p2 page 2012-07-20 15:35:20 -06:00
Neale Pickett a522ba6df2 a few changes for HACK 2012-07-16 17:46:27 -06:00
Neale Pickett 0dae1980e7 lots of little fixups, caught up with todo after trail run in ACS 2012-07-12 17:15:43 -06:00
Neale Pickett ae7fe2a5d4 fix routing for p2 2012-07-12 16:55:36 -06:00
Neale Pickett d7a06cb0a6 add gs service, use new eris command-line option 2012-07-02 18:21:00 -06:00
Neale Pickett 170e63fa4f add p2.xcf 2012-06-27 14:41:52 -06:00
Neale Pickett 5f563787f6 Add generalstatics category 2012-06-27 14:40:51 -06:00
Neale Pickett b7f8578d62 add 2012 generalstatics.com site 2012-06-27 13:46:32 -06:00
Neale Pickett c82870e8d9 Add category to URL in puzzles.cgi 2012-06-13 11:37:13 -06:00
Aaron McPhall abe16d9d51 Fixed my mistakes on puzzles.cgi.c 2012-06-13 13:31:14 -04:00
Neale Pickett 67c631cdc1 Move var decl in puzzles.cgi.c to work with older C 2012-06-13 11:23:16 -06:00
Neale Pickett 86cc9c3524 pointscli no longer fails on success 2012-06-13 11:11:26 -06:00
Neale Pickett e174031d7d map handles to RL names for mcp 2012-06-13 10:48:55 -06:00
Neale Pickett 3281790c8e Make P2 use its own www directory 2012-06-12 21:07:56 -06:00
Neale Pickett 1e54e00e3a disable p2cli screen black (thanks slackish) 2012-06-12 19:48:19 -06:00
Neale Pickett eb77d971c5 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 76e7b5eb98 Working, tested p2 console 2012-06-11 14:37:39 -06:00
Neale Pickett 16c9dc94e5 Start at p2 server package 2012-06-09 16:11:23 -06:00
Neale Pickett 794356972d Make fire-ip accept v4 or v6 IPs 2012-06-09 15:55:02 -06:00
Neale Pickett d7a225dc51 s/sbin/bin/ for fire-ip 2012-06-09 15:50:45 -06:00
Neale Pickett 40acfe07cc p2client package 2012-06-09 14:42:46 -06:00
Aaron J. McPhall 0709e6b939 Updated p2 scoreboard to include helpful text. will need some positioning later though 2012-06-08 16:08:07 -06:00
Neale Pickett af5a377b50 simplify duplicate line check in pointsd 2012-06-06 22:13:49 -06:00
Neale Pickett 13424b02b1 working p2 scoreboard 2012-06-06 22:11:54 -06:00
Neale Pickett d1dff5328e more p2 scoreboard work 2012-06-06 17:51:37 -06:00
Neale Pickett d078929c55 work on p2 scoreboard 2012-06-06 14:55:09 -06:00