Move server_rip to just server, as we now have a copy in server_mysql