Re-add nginx-sites and apache-sites, and merge it in before shared_config

This is to stop the default configuration overriding the shared_config