+1, Is a good start (I am not very happy with the background colors for
the boxes, but this is something absolutely minor). I wanted to try my
hand with a mockup too, but a lot of other things got in the way.

If I don't get anything better I'll put this in place so at least our
page doesn't say 'this is a mockup'.

How about using "Google search for domain", and having a radio group to
search "web" or "*.fedoraproject.org"?