contint: dupe /srv/org/wikimedia

With the renaming of /srv/org/mediawiki, we ended up with a duplicate
file defintion for /srv/org/wikimedia

Also fixed indentation in an apache_site call.

Change-Id: Ibce9608b302141fc943a4ed0d4bf7aa727a2d6ce