Commit Graph

226 Commits

Author SHA1 Message Date
Neale Pickett 7f69a35a50 move p2 scoreboard into mcp 2013-01-31 16:54:05 -07:00
Neale Pickett fcb12e53e2 Possibly working directory auto-detection 2012-11-07 19:44:27 -07:00
Neale Pickett 1c5a3a8b53 make a stab at detecting fs layout 2012-10-31 16:01:36 -06:00
Neale Pickett 91dce4e90c Merge branch 'novar'
Conflicts:
	packages/p2/www/index.html
2012-08-16 19:48:06 -06:00
Neale Pickett e12fdcd027 Fail startup of points if packages are not online yet 2012-08-16 19:47:19 -06:00
Neale Pickett c7252bebe3 puzzles.cgi from novar branch 2012-07-26 19:28:29 -06:00
Neale Pickett 19e46c9b34 add bus. card puzzle, mention radio on index 2012-07-26 19:25:36 -06:00
Neale Pickett d29a0a058f Merge answers from novar for p2@dc20 2012-07-26 17:57:33 -06:00
Neale Pickett db98d384ec make radio answers 2012-07-26 17:54:53 -06:00
Neale Pickett e9ea181fd0 Merge remote-tracking branch 'fozzie/master' into novar 2012-07-26 17:38:48 -06:00
Neale Pickett 595810f444 nyancat part of DJ puzzle 2012-07-23 23:03:26 -06:00
Neale Pickett ffb3d728a5 Merge branch 'master' of fozzie:projects/ctf 2012-07-23 20:35:02 -06:00
Neale Pickett 688cadfe5c add answers for radio 2012-07-23 20:34:48 -06:00
Neale Pickett 16be290a20 better tanx 2012-07-23 16:33:40 -06:00
Neale Pickett 3d9fda6114 Move away from /var 2012-07-22 17:14:06 -06:00
Neale Pickett 46d5f98b67 add network disclaimer to p2 page 2012-07-20 15:35:20 -06:00
Neale Pickett 78641dc57b a few changes for HACK 2012-07-16 17:46:27 -06:00
Neale Pickett 9df8ae9ca5 lots of little fixups, caught up with todo after trail run in ACS 2012-07-12 17:15:43 -06:00
Neale Pickett 97f08e76d2 fix routing for p2 2012-07-12 16:55:36 -06:00
Neale Pickett 22fd1e84d6 add gs service, use new eris command-line option 2012-07-02 18:21:00 -06:00
Neale Pickett 7a6b36c810 add p2.xcf 2012-06-27 14:41:52 -06:00
Neale Pickett 524a8d1c94 Add generalstatics category 2012-06-27 14:40:51 -06:00
Neale Pickett 4d457b2b43 Add category to URL in puzzles.cgi 2012-06-13 11:37:13 -06:00
Aaron McPhall 519a4a3d33 Fixed my mistakes on puzzles.cgi.c 2012-06-13 13:31:14 -04:00
Neale Pickett b48b5924af Move var decl in puzzles.cgi.c to work with older C 2012-06-13 11:23:16 -06:00
Neale Pickett d3185488ea pointscli no longer fails on success 2012-06-13 11:11:26 -06:00
Neale Pickett ed71c577dd map handles to RL names for mcp 2012-06-13 10:48:55 -06:00
Neale Pickett 7bcac17894 Make P2 use its own www directory 2012-06-12 21:07:56 -06:00
Neale Pickett 1741948bd7 disable p2cli screen black (thanks slackish) 2012-06-12 19:48:19 -06:00
Neale Pickett f5d4ef25a7 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 575a4dc43d Working, tested p2 console 2012-06-11 14:37:39 -06:00
Neale Pickett f53296c611 Start at p2 server package 2012-06-09 16:11:23 -06:00
Neale Pickett 81184ae8cf Make fire-ip accept v4 or v6 IPs 2012-06-09 15:55:02 -06:00
Neale Pickett 279920e145 s/sbin/bin/ for fire-ip 2012-06-09 15:50:45 -06:00
Neale Pickett 31d2dabd93 p2client package 2012-06-09 14:42:46 -06:00
Aaron J. McPhall 6a840ce832 Updated p2 scoreboard to include helpful text. will need some positioning later though 2012-06-08 16:08:07 -06:00
Neale Pickett df59d23993 simplify duplicate line check in pointsd 2012-06-06 22:13:49 -06:00
Neale Pickett 33bff7c82e working p2 scoreboard 2012-06-06 22:11:54 -06:00
Neale Pickett 525f778ab5 more p2 scoreboard work 2012-06-06 17:51:37 -06:00
Neale Pickett 279edda1e8 work on p2 scoreboard 2012-06-06 14:55:09 -06:00
Neale Pickett 3a578ef725 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2012-06-06 11:36:20 -06:00
Neale Pickett ff476fbbbb ignore printf build warnings 2012-06-06 00:03:40 -06:00
Neale Pickett 103babad5a merge backup into pointsd 2012-06-05 23:56:29 -06:00
Neale Pickett 1f6975e791 avoid duplicates in points.log 2012-06-05 16:55:58 -06:00
Neale Pickett 50a010a9a7 Merge remote-tracking branch 'fozzie/master' 2012-06-01 10:58:32 -06:00
Neale Pickett 26360c1299 Add TEA encryption tool 2012-05-31 23:09:01 -06:00
Neale Pickett 3eab0272c6 Tanks using new architectuer 2012-05-31 13:57:34 -06:00
Neale Pickett 9333323003 Bring arc4 back in 2012-05-31 13:52:23 -06:00
Aaron McPhall 1dcc03cad2 State of competition can now happen in the cloud 2012-05-31 00:29:36 -04:00
Aaron J. McPhall efb4310e57 Merge branch 'master' of woozle.org:~neale/projects/ctf 2012-05-30 18:28:38 -06:00