Move server config out of base config