From: Samual Lenks Date: Thu, 19 Dec 2013 09:02:15 +0000 (-0500) Subject: Now make launcher match again X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=83e643b1f0a2fd5351a631b8980ff55a9ad95353;p=xonotic%2Fxonotic.git Now make launcher match again --- diff --git a/server/hub/hub-launcher.sh b/server/hub/hub-launcher.sh index e38ee23b..7585562b 100644 --- a/server/hub/hub-launcher.sh +++ b/server/hub/hub-launcher.sh @@ -7,8 +7,6 @@ alias stopxonotic='killall darkplaces-dedicated -s SIGKILL' alias start-xon-all='xon-ctf-mh && xon-ctf-wa && xon-ka-mh && xon-ka-wa && xon-priv-1 && xon-priv-2 && xon-tourney &&xon-votable' alias start-xon-bitmissile='xon-ctf-mh && xon-ctf-wa && xon-priv-1' -alias start-xon-godzilla='xon-ctf-mh && xon-votable && xon-priv-1 && xon-tourney' -alias start-xon-srv02='xon-ctf-wa && xon-priv-1' alias xon-ctf-mh='$XON_DIR && screen -dmS xon-ctf-mh $XON_COMMON sv-dedicated.cfg -sessionid ctf-mh +set \_dedimode \"ctf\" +set \_dedimutator \"minstahook\" +set \_dedidescription \"CTF Instagib+Hook\"' alias xon-ctf-wa='$XON_DIR && screen -dmS xon-ctf-wa $XON_COMMON sv-dedicated.cfg -sessionid ctf-wa +set \_dedimode \"ctf\" +set \_dedimutator \"weaponarena\" +set \_dedidescription \"CTF Weaponarena\"' diff --git a/server/hub/profile-bitmissile.cfg b/server/hub/profile-bitmissile.cfg new file mode 100644 index 00000000..fe839de1 --- /dev/null +++ b/server/hub/profile-bitmissile.cfg @@ -0,0 +1,30 @@ +// ================== +// Server information +// ================== +set _servername "bitmissile" +set _servertag "[HUB]" +set _continent "American" +set _continent_small "NA" +set _location "New Jersey" +set _version "Xonotic 0.7" +hostname "${_servertag} ${_version} ${_description} (${_location})" + +set _motd_intro "Welcome to the ${hostname}' +set _motd_administrator "developer Samual \"Ares\" Lenks" +set _motd_contact "samual@xonotic.org or irc.freenode.org : #xonotic" +set _motd_host "named ${_servername} : Provided by Bitmissile.com" +set _motd_location "${_location} (${_continent})" +sv_motd "^7${_motd_intro}\n^7${_motd_description}\n^2Administrated by ${_motd_administrator}\n^2Contact at ${_motd_contact}\n^2Server ${_motd_host} in ${_motd_location}" + +// ============== +// Administration +// ============== +sv_adminnick "${_servername} admin" +rcon_secure 1 +//rcon_password "example" // set in launcher as XON_PASS environment + +// ============= +// Miscellaneous +// ============= +net_address "204.145.69.196" +sv_curl_defaulturl "http://mirror.bitmissile.com/xonotic/" diff --git a/server/hub/profile-hub-bitmissile.cfg b/server/hub/profile-hub-bitmissile.cfg deleted file mode 100644 index fe839de1..00000000 --- a/server/hub/profile-hub-bitmissile.cfg +++ /dev/null @@ -1,30 +0,0 @@ -// ================== -// Server information -// ================== -set _servername "bitmissile" -set _servertag "[HUB]" -set _continent "American" -set _continent_small "NA" -set _location "New Jersey" -set _version "Xonotic 0.7" -hostname "${_servertag} ${_version} ${_description} (${_location})" - -set _motd_intro "Welcome to the ${hostname}' -set _motd_administrator "developer Samual \"Ares\" Lenks" -set _motd_contact "samual@xonotic.org or irc.freenode.org : #xonotic" -set _motd_host "named ${_servername} : Provided by Bitmissile.com" -set _motd_location "${_location} (${_continent})" -sv_motd "^7${_motd_intro}\n^7${_motd_description}\n^2Administrated by ${_motd_administrator}\n^2Contact at ${_motd_contact}\n^2Server ${_motd_host} in ${_motd_location}" - -// ============== -// Administration -// ============== -sv_adminnick "${_servername} admin" -rcon_secure 1 -//rcon_password "example" // set in launcher as XON_PASS environment - -// ============= -// Miscellaneous -// ============= -net_address "204.145.69.196" -sv_curl_defaulturl "http://mirror.bitmissile.com/xonotic/"