Commit Graph

580 Commits

Author SHA1 Message Date
Neale Pickett beefd8c2c2 Make P2 use its own www directory 2012-06-12 21:07:56 -06:00
Neale Pickett 006e9122f5 disable p2cli screen black (thanks slackish) 2012-06-12 19:48:19 -06:00
Neale Pickett 17901de534 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 7bb60f45f6 Working, tested p2 console 2012-06-11 14:37:39 -06:00
Neale Pickett 9df3a506c1 Start at p2 server package 2012-06-09 16:11:23 -06:00
Neale Pickett 81b27d8ba6 Make fire-ip accept v4 or v6 IPs 2012-06-09 15:55:02 -06:00
Neale Pickett 671747540e s/sbin/bin/ for fire-ip 2012-06-09 15:50:45 -06:00
Neale Pickett 94963d52df p2client package 2012-06-09 14:42:46 -06:00
Aaron J. McPhall 3c01edb403 Updated p2 scoreboard to include helpful text. will need some positioning later though 2012-06-08 16:08:07 -06:00
Neale Pickett a8e9629259 simplify duplicate line check in pointsd 2012-06-06 22:13:49 -06:00
Neale Pickett c40e36c78e working p2 scoreboard 2012-06-06 22:11:54 -06:00
Neale Pickett aecc5471d8 more p2 scoreboard work 2012-06-06 17:51:37 -06:00
Neale Pickett d2b1e404a5 work on p2 scoreboard 2012-06-06 14:55:09 -06:00
Neale Pickett 613506f779 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2012-06-06 11:36:20 -06:00
Neale Pickett 1161227268 ignore printf build warnings 2012-06-06 00:03:40 -06:00
Neale Pickett 889969cec1 merge backup into pointsd 2012-06-05 23:56:29 -06:00
Neale Pickett 09f361e887 avoid duplicates in points.log 2012-06-05 16:55:58 -06:00
Neale Pickett 8109440b82 Merge remote-tracking branch 'fozzie/master' 2012-06-01 10:58:32 -06:00
Neale Pickett 0d30360bbf Add TEA encryption tool 2012-05-31 23:09:01 -06:00
Neale Pickett 71774ce44f Tanks using new architectuer 2012-05-31 13:57:34 -06:00
Neale Pickett 5a4f81c68c Bring arc4 back in 2012-05-31 13:52:23 -06:00
Aaron McPhall 93c4061011 State of competition can now happen in the cloud 2012-05-31 00:29:36 -04:00
Aaron J. McPhall d3667d9999 Merge branch 'master' of woozle.org:~neale/projects/ctf 2012-05-30 18:28:38 -06:00
Neale Pickett cf70bb3097 Have claim.cgi look in $STATE/tokens.db again 2012-05-30 18:10:04 -06:00
Aaron J. McPhall 9e51d9ecc1 Fixed the build 2012-05-30 18:09:51 -06:00
Neale Pickett 363ceda336 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2012-05-30 18:04:32 -06:00
Neale Pickett 27efe1d8cc move mcp to new points architecture 2012-05-30 18:04:24 -06:00
Aaron J. McPhall 698c4486ae updates to parsing on puzzles.cgi 2012-05-30 13:51:40 -06:00
Aaron J. McPhall 2826a69900 Merge branch 'master' of woozle.org:~neale/projects/ctf 2012-05-30 12:21:11 -06:00
Aaron J. McPhall 9ed4dd3d52 puzzles.cgi now inspects map files 2012-05-30 12:19:07 -06:00
Neale Pickett 6a26744970 Lower probability of line noise 2012-05-30 11:17:35 -06:00
Neale Pickett fb03774655 Console work + modem.c 2012-05-29 22:45:20 -06:00
Neale Pickett 57cb1a4cdc debugged p2 console 2012-05-25 22:38:46 -06:00
Neale Pickett cafc0bf70a Remove more legacy junk 2012-05-25 21:39:59 -06:00
Neale Pickett 84a59868d5 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2012-05-25 12:27:05 -06:00
Neale Pickett bb5d8c02dd begin work on p2 scoreboard 2012-05-25 12:26:54 -06:00
Neale Pickett 32b8c929b5 Merge remote-tracking branch 'origin/master'
Conflicts:
	packages/mcp/www/credits.html
2012-05-24 20:35:19 -06:00
Neale Pickett 1c172ecd7d add people to credits 2012-05-24 20:34:31 -06:00
Neale Pickett 6183e24e95 add p2 static html 2012-05-24 16:27:24 -06:00
Neale Pickett 02456ac940 firm up p2 console, add new tank 2012-05-24 15:16:19 -06:00
Neale Pickett d6793b7c41 make wopr work again 2012-05-22 12:54:51 -06:00
Neale Pickett b6cf242700 Make OpenWRT work, save nonce in addteam 2012-05-18 22:03:53 -06:00
Neale Pickett 5afb9f8fd4 New OpenWRT configuration 2012-05-11 17:56:29 -06:00
Neale Pickett cdc5f01f42 Fix root account creation race condition 2012-05-11 11:15:42 -06:00
Neale Pickett c658e44334 Make octopus-redirect stop bringing down the address 2012-05-11 11:15:13 -06:00
Neale Pickett a885277a68 fixes for ARM build 2012-05-10 12:32:09 -06:00
Neale Pickett 171546aeff add DC20 ideas file 2012-05-03 14:01:16 -06:00
Neale Pickett 7189885b41 Merge branch 'master' of ssh://fozzie/home/neale/projects/ctf 2012-04-24 12:22:52 -06:00
Neale Pickett 765a533cc0 Project 2 console 2012-04-24 12:22:32 -06:00
Neale Pickett 7b1300378c last-minute fixes for ipv4 2012-04-24 10:03:14 -06:00