Mon Jun 22 2020

SOURCES/kf2-srv

@@ -17,24 +17,23 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+declare -a DiffNames
+declare -a WaveNames
+declare -A ModeNames
+declare -A MutNames
+
 source /etc/steamcmd/steamcmd.conf
+source /etc/kf2-srv/kf2-srv.conf
 
 ScriptFullname=$(readlink -e "$0")
 ScriptName=$(echo "$ScriptFullname" | awk -F '/' '{print $NF;}')
-ScriptVersion="0.8.0"
+readonly ScriptVersion="0.10.0"
 
-AppServerNum="232130"
+# Constants. Don't change.
-AppClientNum="232090"
+readonly AppServerNum="232130"
-StrangeConstUID="17825793"
+readonly AppClientNum="232090"
-
+readonly StrangeConstUID="17825793"
-DiffArray=('Normal' 'Hard' 'Suicide' 'Hell')
+readonly ServerBotLogin="srvbot" 
-WaveArray=('4' '7' '10')
-declare -A ModeArray
-ModeArray['KFGameContent.KFGameInfo_Survival']='Survival'
-ModeArray['KFGameContent.KFGameInfo_WeeklySurvival']='Weekly'
-ModeArray['KFGameContent.KFGameInfo_Endless']='Endless'
-ModeArray['KFGameContent.KFGameInfo_Objective']='Objective'
-ModeArray['KFGameContent.KFGameInfo_VersusSurvival']='Versus'
 
 function show_help ()
 {
@@ -59,6 +58,7 @@ function show_help ()
 	echo "                            необходимости перекачивает их."
 	echo "  -r, --run      [OPTIONS]  запускает экземпляр сервера с указанными"
 	echo "                            ПАРАМЕТРАМИ"
+	echo "  -c, --chat MSG [INSTANCE] отправляет сообщение в чат указанных экземпляров"
 	echo " -st, --start    [INSTANCE] запускает указанный ЭКЗЕМПЛЯР сервера; если"
 	echo "                            ЭКЗЕМПЛЯР не указан, запускает все"
 	echo "                            автозапускаемые экземпляры сервера"
@@ -98,6 +98,10 @@ function show_help ()
 	echo " -bd, --ban-del    [BAN_ID] удаляет пользователя из списка заблокированных"
 	echo "                            допустимо использовать ID3, SteamID, а также"
 	echo "                            ссылку на профиль пользователя"
+	echo " -fp, --fix-permissions [INSTANCE] поправить права на ini файлы"
+	echo " -as, --admin-sync          синхронизировать всех админов (заглушка)"
+	echo " -pg, --password-game PASSWORD [INSTANCE] установить пароль игры для экземпляров"
+	echo " -pa, --password-admin PASSWORD [INSTANCE] установить пароль админа для экземпляров"
 	echo "  -h, --help                display this help and exit"
 }
 
@@ -198,9 +202,9 @@ function new_instance () # $*: InstanceName[s]
 	for Instance in $(show_instances)
 	do
 		local Config="$InstanceConfigDir/$Instance/main.conf"
-		local GamePort=$(grep -Po '"-port=([0-9]+)' "$Config" | grep -Po '[0-9]+$')
+		local GamePort=$(multini --get "$Config" '' 'PortGame')
-		local WebAdminPort=$(grep -Po '"-webadminport=([0-9]+)' "$Config" | grep -Po '[0-9]+$')
+		local WebAdminPort=$(multini --get "$Config" '' 'PortWeb')
-		local QueryPort=$(grep -Po '"-queryport=([0-9]+)' "$Config" | grep -Po '[0-9]+$')
+		local QueryPort=$(multini --get "$Config" '' 'PortQuery')
 		if [[ "$GamePort" -gt "$MaxGamePort" ]]; then MaxGamePort="$GamePort"; fi
 		if [[ "$QueryPort" -gt "$MaxQueryPort" ]]; then MaxQueryPort="$QueryPort"; fi
 		if [[ "$WebAdminPort" -gt "$MaxWebAdminPort" ]]; then MaxWebAdminPort="$WebAdminPort"; fi
@@ -224,6 +228,8 @@ function new_instance () # $*: InstanceName[s]
 		install $FileMode "$MainConfigTemplate"                                         "$InstanceDir/main.conf"
 		install $FileMode "$DefaultConfigDir/KFAI.ini"                                  "$InstanceDir"
 		install $FileMode "$DefaultConfigDir/KFWeb.ini"                                 "$InstanceDir"
+		install $FileMode "$DefaultConfigDir/KFWebAdmin.ini"                            "$InstanceDir"
+		install $FileMode "$DefaultConfigDir/KFMultiAdmin.ini"                          "$InstanceDir"
 		install $FileMode "$DefaultConfigDir/LinuxServer-KFEngine.ini"                  "$InstanceDir"
 		install $FileMode "$DefaultConfigDir/LinuxServer-KFGame.ini"                    "$InstanceDir"
 		install $FileMode "$DefaultConfigDir/LinuxServer-KFInput.ini"                   "$InstanceDir"
@@ -235,9 +241,9 @@ function new_instance () # $*: InstanceName[s]
 		
 		((MaxGamePort++)); ((MaxQueryPort++)); ((MaxWebAdminPort++))
 		
-		sed -i -r --follow-symlinks "s/-port=[0-9]+/-port=$MaxGamePort/g"                     "$InstanceDir/main.conf"
+		multini -s "$InstanceDir/main.conf" '' 'PortGame'  "$MaxGamePort"
-		sed -i -r --follow-symlinks "s/-queryport=[0-9]+/-queryport=$MaxQueryPort/g"          "$InstanceDir/main.conf"
+		multini -s "$InstanceDir/main.conf" '' 'PortQuery' "$MaxQueryPort"
-		sed -i -r --follow-symlinks "s/-webadminport=[0-9]+/-webadminport=$MaxWebAdminPort/g" "$InstanceDir/main.conf"
+		multini -s "$InstanceDir/main.conf" '' 'PortWeb'   "$MaxWebAdminPort"
 
 		echo "Instance $Instance created. See /etc/$ScriptName/instances$BetaPostfix/$Instance for edit configuration"
 	done
@@ -271,70 +277,95 @@ function delete_instance () # $*: [InstanceName[s]]
 	fi
 }
 
-function show_status_implementation_body () # $*: [InstanceName[s]]
+function instance_status () # $1: InstanceName
 {
-	for Instance in $InstanceList
+	local Instance="$1"
-	do
+	if ! instance_exists "$Instance"; then return 1; fi
-		if systemctl -q is-enabled $(service_name "$Instance"); then
+	if systemctl -q is-enabled $(service_name "$Instance"); then
-			local IsEnabled="enabled"
+		local IsEnabled="enabled"
-		else
-			local IsEnabled="disabled"
-		fi
-		if systemctl | grep $(service_name "$Instance") | grep -q 'running' ; then
-			local IsRuning="running"
-		else
-			local IsRuning="stopped"
-		fi
-		
-		local Description=$(grep -P 'Description=' "$InstanceConfigDir/$Instance/main.conf" | sed -r 's/(Description=|")//g')
-		local GamePort=$(grep -Po '"-port=([0-9]+)' "$InstanceConfigDir/$Instance/main.conf" | grep -Po '[0-9]+$')
-		local WebAdminPort=$(grep -Po '"-webadminport=([0-9]+)' "$InstanceConfigDir/$Instance/main.conf" | grep -Po '[0-9]+$')
-		local QueryPort=$(grep -Po '"-queryport=([0-9]+)' "$InstanceConfigDir/$Instance/main.conf" | grep -Po '[0-9]+$')
-		local GameType=$(grep -Po 'Game=([^\?]+)' "$InstanceConfigDir/$Instance/main.conf" | sed -r 's/Game=([^?]+)/\1/g' )
-		local GameLength=$(grep -Po 'GameLength=([0-9]+)' "$InstanceConfigDir/$Instance/main.conf" | grep -Po '[0-9]+$')
-		local GameDifficulty=$(grep -Po 'Difficulty=([0-9]+)' "$InstanceConfigDir/$Instance/main.conf" | grep -Po '[0-9]+$')
-		
-		local DisplayGameType=${ModeArray[$GameType]}
-		local DisplayGameLength=${WaveArray[$GameLength]}
-		local DisplayDifficulty=${DiffArray[$GameDifficulty]}
-		
-		if [[ "$DisplayGameType" == 'Weekly' || \
-			  "$DisplayGameType" == 'Endless' || \
-			  "$DisplayGameType" == 'Versus' || \
-			  "$DisplayGameType" == 'Objective' ]]; then
-			DisplayGameLength='-'
-		fi
-		
-		if [[ "$DisplayGameType" == 'Weekly' || \
-			  "$DisplayGameType" == 'Versus' ]]; then
-			DisplayDifficulty='-'
-		fi
-		
-		echo -e "$Instance:$IsEnabled:$IsRuning:$GamePort:$QueryPort:$WebAdminPort:$DisplayGameType:$DisplayGameLength:$DisplayDifficulty:$Description"
-	done
-}
-
-function show_status_implementation_full () # $*: [InstanceName[s]]
-{
-	local InstanceList=""
-	if [[ -z "$*" ]] ; then
-		InstanceList=$(show_instances)
 	else
-		for Instance in $*
+		local IsEnabled="disabled"
-		do
+	fi
-			if instance_exists "$Instance"; then
+	if systemctl | grep $(service_name "$Instance") | grep -q 'running' ; then
-				InstanceList+=" $Instance" 
+		local IsRuning="running"
-			fi
+	else
-		done
+		local IsRuning="stopped"
+	fi
+	local Comment=$(        multini -g "$InstanceConfigDir/$Instance/main.conf" '' "Comment")
+	local GamePort=$(       multini -g "$InstanceConfigDir/$Instance/main.conf" '' "PortGame")
+	local WebAdminPort=$(   multini -g "$InstanceConfigDir/$Instance/main.conf" '' "PortWeb")
+	local QueryPort=$(      multini -g "$InstanceConfigDir/$Instance/main.conf" '' "PortQuery")
+	local GameType=$(       multini -g "$InstanceConfigDir/$Instance/main.conf" '' "Game")
+	local GameLength=$(     multini -g "$InstanceConfigDir/$Instance/main.conf" '' "Length")
+	local GameDifficulty=$( multini -g "$InstanceConfigDir/$Instance/main.conf" '' "Difficulty")
+	local Map=$(            multini -g "$InstanceConfigDir/$Instance/main.conf" '' "Map")
+	local Mutators=$(       multini -g "$InstanceConfigDir/$Instance/main.conf" '' "Mutators")
+	local Args=$(           multini -g "$InstanceConfigDir/$Instance/main.conf" '' "Args")
+	
+	local DisplayGameType=''
+	local DisplayGameLength=''
+	local DisplayDifficulty=''
+	local DisplayMutators=''
+	
+	for Mutator in ${Mutators//,/ }
+	do
+		local MutName=${MutNames[$Mutator]}
+		if [[ -z "$MutName" ]]; then
+			MutName="$Mutator"
+		fi
+		if [[ -z "$DisplayMutators" ]]; then
+			DisplayMutators="$MutName"
+		else
+			DisplayMutators="$DisplayMutators, $MutName"
+		fi
+	done
+	
+	if [[ -n "$GameType"       ]]; then DisplayGameType=${ModeNames[$GameType]}         ; fi
+	if [[ -n "$GameLength"     ]]; then DisplayGameLength=${WaveNames[$GameLength]}     ; fi
+	if [[ -n "$GameDifficulty" ]]; then DisplayDifficulty=${DiffNames[$GameDifficulty]} ; fi
+	
+	if [[ -z "$DisplayMutators" ]] && [[ -z "$Mutators" ]]; then
+		DisplayMutators='-'
 	fi
 	
-	echo -e "INSTANCE:AUTORUN:STATE:P_GAME:P_QUERY:P_WEB:TYPE:LEN:DIFF:DESCRIPTION"
+	if [[ -z "$DisplayGameType" ]]; then
-	show_status_implementation_body "$InstanceList" | sort -t : -k 4
+		DisplayGameType="$GameType"
+	fi
+	
+	if [[ -z "$Args" ]]; then
+		Args='-'
+	fi
+	
+	if [[ "$GameType" == 'KFGameContent.KFGameInfo_WeeklySurvival'  || \
+		  "$GameType" == 'KFGameContent.KFGameInfo_Endless' || \
+		  "$GameType" == 'KFGameContent.KFGameInfo_VersusSurvival'  || \
+		  "$GameType" == 'KFGameContent.KFGameInfo_Objective' ]]; then
+		DisplayGameLength='-'
+	fi
+	
+	if [[ "$GameType" == 'KFGameContent.KFGameInfo_WeeklySurvival' || \
+		  "$DisplayGameType" == 'KFGameContent.KFGameInfo_VersusSurvival' ]]; then
+		DisplayDifficulty='-'
+	fi
+	
+	echo -e "$Instance:$IsEnabled:$IsRuning:$GamePort:$QueryPort:$WebAdminPort:$DisplayGameType:$DisplayGameLength:$DisplayDifficulty:$DisplayMutators:$Args:$Comment"
 }
 
 function show_status () # $*: [InstanceName[s]]
 {
-	show_status_implementation_full $* | column -t -s :
+	{
+		echo -e "INSTANCE:AUTORUN:STATE:P_GAME:P_QUERY:P_WEB:TYPE:LEN:DIFF:MUTATORS:ARGS:COMMENT"
+		{
+			local InstanceList="$*"
+			if [[ -z "$*" ]] ; then
+				InstanceList=$(show_instances)
+			fi
+			for Instance in $InstanceList
+			do
+				instance_status "$Instance"
+			done
+		} | sort -t : -k 4
+	} | column -t -s :
 }
 
 function validate ()
@@ -348,40 +379,17 @@ function validate ()
 	start_instance
 }
 
-function make_default_instance ()
+function make_default_instance () # $1: Dir
 {
 	local InstanceDir="$InstanceConfigDir/default"
 	
-	chmod 664                                                     \
-	"$DefaultConfigDir/KFAI.ini"                                  \
-	"$DefaultConfigDir/KFWeb.ini"                                 \
-	"$DefaultConfigDir/LinuxServer-KFEngine.ini"                  \
-	"$DefaultConfigDir/LinuxServer-KFGame.ini"                    \
-	"$DefaultConfigDir/LinuxServer-KFInput.ini"                   \
-	"$DefaultConfigDir/LinuxServer-KFSystemSettings.ini"          \
-	"$DefaultConfigDir/LinuxServer/LinuxServerEngine.ini"         \
-	"$DefaultConfigDir/LinuxServer/LinuxServerGame.ini"           \
-	"$DefaultConfigDir/LinuxServer/LinuxServerInput.ini"          \
-	"$DefaultConfigDir/LinuxServer/LinuxServerSystemSettings.ini"
-	
-	dos2unix                                                      \
-	"$DefaultConfigDir/KFAI.ini"                                  \
-	"$DefaultConfigDir/KFWeb.ini"                                 \
-	"$DefaultConfigDir/LinuxServer-KFEngine.ini"                  \
-	"$DefaultConfigDir/LinuxServer-KFGame.ini"                    \
-	"$DefaultConfigDir/LinuxServer-KFInput.ini"                   \
-	"$DefaultConfigDir/LinuxServer-KFSystemSettings.ini"          \
-	"$DefaultConfigDir/LinuxServer/LinuxServerEngine.ini"         \
-	"$DefaultConfigDir/LinuxServer/LinuxServerGame.ini"           \
-	"$DefaultConfigDir/LinuxServer/LinuxServerInput.ini"          \
-	"$DefaultConfigDir/LinuxServer/LinuxServerSystemSettings.ini"
-	
 	install -d -g "$SteamUser" -o "$SteamUser" -m 775 "$InstanceDir"
 	install -d -g "$SteamUser" -o "$SteamUser" -m 775 "$InstanceDir/LinuxServer"
 	install    -g "$SteamUser" -o "$SteamUser" -m 664 "$MainConfigTemplate" "$InstanceDir/main.conf"
 	ln -s "$DefaultConfigDir/KFAI.ini"                                      "$InstanceDir/KFAI.ini"
 	ln -s "$DefaultConfigDir/KFWeb.ini"                                     "$InstanceDir/KFWeb.ini"
 	ln -s "$DefaultConfigDir/KFWebAdmin.ini"                                "$InstanceDir/KFWebAdmin.ini"
+	ln -s "$DefaultConfigDir/KFMultiAdmin.ini"                              "$InstanceDir/KFMultiAdmin.ini"
 	ln -s "$DefaultConfigDir/LinuxServer-KFEngine.ini"                      "$InstanceDir/LinuxServer-KFEngine.ini"
 	ln -s "$DefaultConfigDir/LinuxServer-KFGame.ini"                        "$InstanceDir/LinuxServer-KFGame.ini"
 	ln -s "$DefaultConfigDir/LinuxServer-KFInput.ini"                       "$InstanceDir/LinuxServer-KFInput.ini"
@@ -390,6 +398,36 @@ function make_default_instance ()
 	ln -s "$DefaultConfigDir/LinuxServer/LinuxServerGame.ini"               "$InstanceDir/LinuxServer/LinuxServerGame.ini"
 	ln -s "$DefaultConfigDir/LinuxServer/LinuxServerInput.ini"              "$InstanceDir/LinuxServer/LinuxServerInput.ini"
 	ln -s "$DefaultConfigDir/LinuxServer/LinuxServerSystemSettings.ini"     "$InstanceDir/LinuxServer/LinuxServerSystemSettings.ini"
+	
+	fix_ini_permissions "$InstanceDir"
+	fix_ini_eol "$InstanceDir"
+}
+
+function fix_permissions () # $*: Instance[s]
+{
+	local InstanceList="$*"
+	if [[ -z "$InstanceList" ]] ; then
+		fix_ini_permissions "$InstanceConfigDir"
+	else
+		for Instance in $InstanceList
+		do
+			fix_ini_permissions "$InstanceConfigDir/$Instance"
+		done
+	fi
+}
+
+function fix_ini_permissions () # $1: Dir
+{
+	find "$1" \( -type l -o -type f \) -name '*.ini' | \
+	xargs --max-procs=$(nproc) -I {}  \
+	sh -c "chmod 664 {}; chown $SteamUser:$SteamUser {}"
+}
+
+function fix_ini_eol () # $1: Dir
+{
+	find "$1" \( -type l -o -type f \) -name '*.ini' | \
+	xargs --max-procs=$(nproc) -I {}  \
+	sh -c "dos2unix -F {}"
 }
 
 function fix_steamclient_so ()
@@ -433,44 +471,110 @@ function create_map_dirs ()
 	fi
 }
 
+function first_install ()
+{
+	if ! steamcmd +login $SteamLogin +force_install_dir $InstallDir +app_update $AppServerNum $BetaArg validate +exit; then
+		echo "Errors during installation - exit"
+		exit 1
+	fi
+	
+	echo "Creating base ini files"
+	sudo -u "$SteamUser" $AppBin &> /dev/null &
+	while true
+	do
+		if [[ -e "$DefaultConfigDir/KFAI.ini" ]] &&
+		   [[ -e "$DefaultConfigDir/KFWeb.ini" ]] &&
+		   [[ -e "$DefaultConfigDir/LinuxServer-KFEngine.ini" ]] &&
+		   [[ -e "$DefaultConfigDir/LinuxServer-KFGame.ini" ]] &&
+		   [[ -e "$DefaultConfigDir/LinuxServer-KFInput.ini" ]] &&
+		   [[ -e "$DefaultConfigDir/LinuxServer-KFSystemSettings.ini" ]] &&
+		   [[ -e "$DefaultConfigDir/LinuxServer/LinuxServerEngine.ini" ]] &&
+		   [[ -e "$DefaultConfigDir/LinuxServer/LinuxServerGame.ini" ]] &&
+		   [[ -e "$DefaultConfigDir/LinuxServer/LinuxServerInput.ini" ]] &&
+		   [[ -e "$DefaultConfigDir/LinuxServer/LinuxServerSystemSettings.ini" ]]; then
+		   	break
+		fi
+		sleep 2
+	done
+	killall -KILL KFGameSteamServer.bin.x86_64; sleep 1
+	echo "Setting up WebAdmin"
+	multini -s "$DefaultConfigDir/KFWeb.ini" "IpDrv.WebServer" "bEnabled" "true"
+	sudo -u "$SteamUser" $AppBin &> /dev/null &
+	while true
+	do
+		if [[ -e "$DefaultConfigDir/KFWebAdmin.ini" ]]; then
+		   	break
+		fi
+		sleep 2
+	done
+	killall -KILL KFGameSteamServer.bin.x86_64; sleep 1
+	multini -s "$DefaultConfigDir/KFWebAdmin.ini" "WebAdmin.WebAdmin" "AuthenticationClass" "WebAdmin.MultiWebAdminAuth"
+	multini -s "$DefaultConfigDir/KFWebAdmin.ini" "WebAdmin.WebAdmin" "bHttpAuth" "True"
+	
+	echo "Wait while WebAdmin up"
+	sudo -u "$SteamUser" $AppBin &> /dev/null &
+	while ! curl -s -o "/dev/null" -u "Admin:Admin" "localhost:8080"
+	do
+		sleep 2
+	done
+	echo "Setting up server bot"
+	
+	while !	curl -s -o "/dev/null" \
+		-u "Admin:Admin" \
+		"localhost:8080/ServerAdmin/multiadmin" \
+		--request POST \
+		--data adminid="$ServerBotLogin" \
+		--data action="create" 
+	do sleep 2;	done
+	
+	while ! multini -gq \
+		"$DefaultConfigDir/KFMultiAdmin.ini" \
+		"$ServerBotLogin MultiAdminData" \
+		"Password"
+	do sleep 2; done
+	
+	while ! curl -s -o "/dev/null" \
+		-u "Admin:Admin" \
+		"localhost:8080/ServerAdmin/multiadmin" \
+		--request POST \
+		--data adminid="$ServerBotLogin" \
+		--data displayname="ServerBot" \
+		--data enabled=1 \
+		--data password1="$ServerBotPassword" \
+		--data password2="$ServerBotPassword" \
+		--data order="DenyAllow" \
+		--data deny= \
+		--data allow= \
+		--data action="save"
+	do sleep 2; done
+	
+	while [[ -z $(multini -g \
+		"$DefaultConfigDir/KFMultiAdmin.ini" \
+		"$ServerBotLogin MultiAdminData" \
+		"Password") ]]
+	do sleep 2; done
+	
+	killall -KILL KFGameSteamServer.bin.x86_64; sleep 1
+	create_map_dirs
+	fix_steamclient_so
+	ln -s "$InstanceConfigDir" "$InstanceConfigLnk"
+	make_default_instance
+	echo "KF2 succesfully installed"
+}
+
 function update_kf2 ()
 {
 	if [[ -n "$BetaPostfix" ]]; then
 		local BetaArg="-beta preview"
 	fi
-	if ! server_exists; then # First install
+	if ! server_exists; then
-		if ! steamcmd +login $SteamLogin +force_install_dir $InstallDir +app_update $AppServerNum $BetaArg validate +exit; then
+		first_install
-			echo "Errors during installation - exit"
+	elif updates_aviable; then
-			exit 1
-		fi
-		sudo -u "$SteamUser" $AppBin &
-		while true
-		do
-			if [[ -e "$DefaultConfigDir/KFAI.ini" ]] &&
-			   [[ -e "$DefaultConfigDir/KFWeb.ini" ]] &&
-			   [[ -e "$DefaultConfigDir/LinuxServer-KFEngine.ini" ]] &&
-			   [[ -e "$DefaultConfigDir/LinuxServer-KFGame.ini" ]] &&
-			   [[ -e "$DefaultConfigDir/LinuxServer-KFInput.ini" ]] &&
-			   [[ -e "$DefaultConfigDir/LinuxServer-KFSystemSettings.ini" ]] &&
-			   [[ -e "$DefaultConfigDir/LinuxServer/LinuxServerEngine.ini" ]] &&
-			   [[ -e "$DefaultConfigDir/LinuxServer/LinuxServerGame.ini" ]] &&
-			   [[ -e "$DefaultConfigDir/LinuxServer/LinuxServerInput.ini" ]] &&
-			   [[ -e "$DefaultConfigDir/LinuxServer/LinuxServerSystemSettings.ini" ]]; then
-			   	break
-			fi
-			sleep 2
-		done
-		killall -KILL KFGameSteamServer.bin.x86_64
-		multini -s "$DefaultConfigDir/KFWeb.ini" "IpDrv.WebServer" "bEnabled" "true"
-		create_map_dirs
-		fix_steamclient_so
-		ln -s "$InstanceConfigDir" "$InstanceConfigLnk"
-		make_default_instance
-		echo "KF2 succesfully installed"
-	elif updates_aviable; then # Update
 		stop_instance
 		steamcmd +login $SteamLogin +force_install_dir $InstallDir +app_update $AppServerNum $BetaArg +exit
 		start_instance
+	else
+		echo "Server is up to date"
 	fi
 }
 
@@ -624,46 +728,43 @@ function name_by_workshopID () # $1: WorkshopID
 	echo "$Result"
 }
 
-function workshop_list_body () # $1: WorkshopListFile
+function workshop_list_ids ()
 {
-	while read WorkshopID
+	local WsList=''
-	do
-		local Cache="$CacheDir/$WorkshopID"
-		local Downl="$DownloadDir/$WorkshopID"
-		local Url="https://steamcommunity.com/sharedfiles/filedetails/?id=$WorkshopID"
-		local WsName=$(name_by_workshopID "$WorkshopID")
-		if [[ -n "$WsName" ]]; then
-			local WsSize=$(du -sch "$Downl" "$Cache" | tail -n 1 | grep -Po '^[^\s]+')
-		else
-			local WsSize="-"; WsName="-"
-		fi
-		echo "$WorkshopID $WsName $WsSize $Url"
-	done < "$1"
-}
-
-function workshop_list_full () # $1: WorkshoplistFile
-{
-	echo "WORKSHOP_ID NAME SIZE WORKSHOP_URL"
-	workshop_list_body "$1" | sort -k 2
-}
-
-function workshop_list () # $1: [--human-readable]
-{
-	local WsList=$(mktemp)
 	for Instance in $(show_instances)
 	do
 		local Config="$InstanceConfigDir/$Instance/LinuxServer-KFEngine.ini"
 		if multini -gq "$Config" "OnlineSubsystemSteamworks.KFWorkshopSteamworks" "ServerSubscribedWorkshopItems"; then
-			multini -g "$Config" "OnlineSubsystemSteamworks.KFWorkshopSteamworks" "ServerSubscribedWorkshopItems" >> "$WsList"
+			if [[ -n "$WsList" ]]; then
+				WsList+=$'\n'
+			fi
+			WsList+=$(multini -g "$Config" "OnlineSubsystemSteamworks.KFWorkshopSteamworks" "ServerSubscribedWorkshopItems")
 		fi
 	done
-	sort -u "$WsList" -o "$WsList"
+	echo "$WsList" | sort -V -u
-	if [[ -n "$1" ]]; then
+}
-		workshop_list_full "$WsList" | column -t
+
-	else
+function workshop_list ()
-		cat "$WsList"
+{
-	fi
+	# TODO: Multiple *.kfm/*u in folder
-	rm -f "$WsList"
+	{
+		echo "WORKSHOP_ID NAME SIZE WORKSHOP_URL"
+		{
+			for WorkshopID in $(workshop_list_ids)
+			do
+				local Cache="$CacheDir/$WorkshopID"
+				local Downl="$DownloadDir/$WorkshopID"
+				local Url="https://steamcommunity.com/sharedfiles/filedetails/?id=$WorkshopID"
+				local WsName=$(name_by_workshopID "$WorkshopID")
+				if [[ -n "$WsName" ]]; then
+					local WsSize=$(du -sch "$Downl" "$Cache" | tail -n 1 | grep -Po '^[^\s]+')
+				else
+					local WsSize="-"; WsName="-"
+				fi
+				echo "$WorkshopID $WsName $WsSize $Url"
+			done
+		} | sort -k 2
+	} | column -t
 }
 
 function any_to_workshopID () # $1: WorkshopID/URL
@@ -721,11 +822,17 @@ $Downl"
 
 function workshop_sync ()
 {
-	workshop_add $(workshop_list)
+	workshop_add $(workshop_list_ids)
 	
+	# TODO: Make it faster
 	for Instance in $(show_instances)
 	do
-		if instance_exists "$Instance"; then
+		local Service=$(service_name "$Instance")
+		if ! instance_exists "$Instance"; then
+			echo "Instance $Instance not exitst"
+		elif systemctl -q is-active $Service ; then
+			echo "Instance $Instance is running - skip."
+		else
 			local Config="$InstanceConfigDir/$Instance/LinuxServer-KFGame.ini"
 			for MapFile in $(find -L "$CacheDir" -type f -name '*.kfm' -printf "%f\n")
 			do
@@ -740,6 +847,7 @@ function workshop_sync ()
 					multini -s "$Config" "$MapName KFMapSummary" "bPlayableInObjective"  "False"
 				fi
 			done
+			
 			for MutFile in $(find -L "$CacheDir" -type f -name '*.u' -printf "%f\n")
 			do
 				MutName=$(echo "$MutFile" | sed -r 's|.u$||')
@@ -748,8 +856,6 @@ function workshop_sync ()
 					multini -s "$Config" "$MutName KFMutatorSummary" "ClassName" ""
 				fi
 			done
-		else
-			echo "Instance $Instance not exitst"
 		fi
 	done
 }
@@ -774,6 +880,16 @@ function map_rotate_save () # $*: Instance[s]
 	done
 }
 
+function map_rotate_to_webstring () # $1: MapRotate
+{
+	local RN='%0D%0A'
+	echo "$1" | \
+	sed -r 's/^\(Maps=\("//' | \
+	sed -r 's/"\)\)$//' | \
+	sed 's/ /+/g' | \
+	sed "s/\",\"/${RN}/g"
+}
+
 function map_rotate_load () # $*: Instance[s]
 {
 	local InstanceList="$*"
@@ -783,17 +899,42 @@ function map_rotate_load () # $*: Instance[s]
 	
 	for Instance in $InstanceList
 	do
-		if instance_exists "$Instance"; then	
+		local Service=$(service_name "$Instance")
-			local Config="$InstanceConfigDir/$Instance/LinuxServer-KFGame.ini"
+		local MapRotate="$InstanceConfigDir/$Instance/MapRotate.ini"
-			local MapRotate="$InstanceConfigDir/$Instance/MapRotate.ini"
+		if ! instance_exists "$Instance"; then	
-			if [[ -e "$MapRotate" ]]; then
+			echo "Instance $Instance not exists"
-				sed -i --follow-symlinks -r "/(ActiveMapCycle=|GameMapCycles=)/d" "$Config"
+		elif ! [[ -e "$MapRotate" ]]; then
-				sed -i --follow-symlinks "/\[KFGame\.KFGameInfo\]/ r $MapRotate" "$Config"
+			echo "$MapRotate not found - skip"
-			else
+		elif systemctl -q is-active $Service ; then
-				echo "$MapRotate not found - skip"
+			# TODO: Delete other cycles
+			# Example: maplistidx=1&mapcycle=KF-Airship%0D%0A&delete=doit
+			local ActiveCycleIndex=$(multini -g "$MapRotate" '' 'ActiveMapCycle')
+			local ActiveCycleWeb=''
+			local Index=0
+			while read MapCycle
+			do
+				local MapCycleWeb=$(map_rotate_to_webstring "$MapCycle")
+				admin_curl "$Instance" "ServerAdmin/settings/maplist"  \
+				--request POST                                         \
+				--data maplistidx="$Index"                             \
+				--data mapcycle="$MapCycleWeb"                         \
+				--data action="save"
+				if [[ "$Index" -eq "$ActiveCycleIndex" ]]; then
+					ActiveCycleWeb="$MapCycleWeb"
+				fi
+				((Index++))
+			done < <(multini -g "$MapRotate" '' 'GameMapCycles')
+			if [[ -n "$ActiveCycleWeb" ]]; then
+				admin_curl "$Instance" "ServerAdmin/settings/maplist"  \
+				--request POST                                         \
+				--data maplistidx="$ActiveCycleIndex"                  \
+				--data mapcycle="$ActiveCycleWeb"                      \
+				--data activate="activate"
 			fi
 		else
-			echo "Instance $Instance not exitst"
+			local Config="$InstanceConfigDir/$Instance/LinuxServer-KFGame.ini"
+			sed -i --follow-symlinks -r "/(ActiveMapCycle=|GameMapCycles=)/d" "$Config"
+			sed -i --follow-symlinks "/\[KFGame\.KFGameInfo\]/ r $MapRotate" "$Config"
 		fi
 	done
 }
@@ -818,36 +959,39 @@ function steamID64_to_steamID3 () # $1: ID4
     echo "$ID3"
 }
 
-function ban_list_ext () # $1: BanlistFile
+function ban_list_id3 ()
 {
-	local Num=1
+	local BanList=''
-	echo "NUM STEAM_ID3 STEAM_ID64 PROFILE_URL"
-	while read ID3
-	do
-		local ID64=$(steamID3_to_steamID64 "$ID3")
-		local Url=$(curl "https://steamcommunity.com/profiles/$ID64" -s -L -I -o /dev/null -w '%{url_effective}')
-		echo "$Num $ID3 $ID64 $Url"
-		((Num++))
-	done < "$1"
-}
-
-function ban_list () # $1: [--human-readable]
-{
-	local BanList=$(mktemp)
 	for Instance in $(show_instances)
 	do
 		local Config="$InstanceConfigDir/$Instance/LinuxServer-KFGame.ini"
 		if multini -gq "$Config" "Engine.AccessControl" "BannedIDs"; then
-			multini -g "$Config" "Engine.AccessControl" "BannedIDs" | sed -r 's/.+A=([0-9]+),.+/\1/' >> "$BanList"
+			if [[ -n "$BanList" ]]; then
+				BanList+=$'\n'
+			fi
+			BanList+=$(multini -g "$Config" "Engine.AccessControl" "BannedIDs" | sed -r 's/.+A=([0-9]+),.+/\1/')
 		fi
 	done
-	sort -u "$BanList" -o "$BanList"
+	echo "$BanList" | sort -V -u
-	if [[ -n "$1" ]]; then
+}
-		ban_list_ext "$BanList" | column -t
+
-	else
+function ban_list () # $1: [--human-readable]
-		cat "$BanList"
+{
-	fi
+	{
-	rm -f "$BanList"
+		local Num=1
+		echo "NUM STEAM_ID3 STEAM_ID64 URL_CONST URL_EFFECTIVE"
+		for ID3 in $(ban_list_id3)
+		do
+			local ID64=$(steamID3_to_steamID64 "$ID3")
+			local UrlConst="https://steamcommunity.com/profiles/$ID64"
+			local UrlEffective=$(curl "$UrlConst" -s -L -I -o /dev/null -w '%{url_effective}')
+			if [[ "$UrlConst" == "$UrlEffective" ]]; then
+				UrlEffective="-"
+			fi
+			echo "$Num $ID3 $ID64 $UrlConst $UrlEffective"
+			((Num++))
+		done
+	} | column -t
 }
 
 function ban_ID3 () # $1: ID3
@@ -857,9 +1001,18 @@ function ban_ID3 () # $1: ID3
 	do
 		local Config="$InstanceConfigDir/$Instance/LinuxServer-KFGame.ini"
 		local BanStr="(Uid=(A=$ID3,B=$StrangeConstUID))"
+		local Service=$(service_name "$Instance")
 		if ! multini -gq "$Config" "Engine.AccessControl" "BannedIDs" "$BanStr"; then
 			echo "Add ban $ID3 to $Instance"
-			multini -a "$Config" "Engine.AccessControl" "BannedIDs" "$BanStr"
+			if systemctl -q is-active $Service ; then
+				admin_curl "$Instance" "ServerAdmin/policy/bans"    \
+					--request POST                                  \
+					--data action="add"                             \
+					--data steamint64=$(steamID3_to_steamID64 $ID3) \
+					--data uniqueid=
+			else
+				multini -a "$Config" "Engine.AccessControl" "BannedIDs" "$BanStr"
+			fi
 		fi
 	done 
 }
@@ -871,9 +1024,27 @@ function unban_ID3 () # $1: ID3
 	do
 		local Config="$InstanceConfigDir/$Instance/LinuxServer-KFGame.ini"
 		local BanStr="(Uid=(A=$ID3,B=$StrangeConstUID))"
-		if multini -gq "$Config" "Engine.AccessControl" "BannedIDs" "$BanStr"; then
+		local Service=$(service_name "$Instance")
-			echo "Remove ban $ID3 from $Instance"
+		if systemctl -q is-active $Service ; then
-			multini -d "$Config" "Engine.AccessControl" "BannedIDs" "$BanStr"
+			local PlainID=0
+			while read Line
+			do
+				if echo "$Line" | grep -qF "A=$ID3,"; then
+					echo "Remove ban $ID3 from $Instance"
+					admin_curl "$Instance" "ServerAdmin/policy/bans"    \
+						--request POST                                  \
+						--data action="delete"                          \
+						--data banid="plainid:$PlainID"
+					break
+				else
+					((PlainID++))
+				fi
+			done < <(multini -g "$Config" 'Engine.AccessControl' 'BannedIDs')
+		else
+			if multini -gq "$Config" "Engine.AccessControl" "BannedIDs" "$BanStr"; then
+				echo "Remove ban $ID3 from $Instance"
+				multini -d "$Config" "Engine.AccessControl" "BannedIDs" "$BanStr"
+			fi
 		fi
 	done 
 }
@@ -922,13 +1093,123 @@ function ban_del () # $*: ban list
 
 function ban_sync ()
 {
-	ban_list | \
+	ban_list_id3 | \
 	while read ID3
 	do
 		ban_ID3 "$ID3"
 	done
 }
 
+function admin_sync ()
+{
+	# TODO: Implementation
+	echo "Dummy"
+}
+
+function admin_curl () # $1: Instance, $2: URL, $*: Request
+{
+	local Instance="$1"
+	local URL="$2"
+	local MainConf="$InstanceConfigDir/$Instance/main.conf"
+	local WebPort=$(multini --get "$MainConf" '' "PortWeb")
+	shift; shift
+	curl -s -o "/dev/null" -u "$ServerBotLogin:$ServerBotPassword" "localhost:$WebPort/$URL" $*
+}
+
+function password_game () # $1: Password (if empty, use: ''), $*: Instance[s]
+{
+	if echo "$1" | grep -qP '\s'; then
+		echo "Password should not contain spaces"
+		return 1
+	fi
+	
+	local Password="$1"; shift
+	local InstanceList="$*"
+	if [[ -z "$InstanceList" ]] ; then
+		InstanceList=$(show_instances)
+	fi
+	
+	for Instance in $InstanceList
+	do
+		if instance_exists "$Instance"; then	
+			local Config="$InstanceConfigDir/$Instance/LinuxServer-KFGame.ini"
+			local Service=$(service_name "$Instance")
+			if systemctl -q is-active $Service ; then
+				admin_curl "$Instance" "ServerAdmin/policy/passwords" \
+				--request POST               \
+				--data action="gamepassword" \
+				--data gamepw1="$Password"   \
+				--data gamepw2="$Password"
+			else
+				multini -s "$Config" "Engine.AccessControl" "GamePassword" "$Password"
+			fi
+		else
+			echo "Instance $Instance not exitst"
+		fi
+	done
+}
+
+function password_admin () # $1: Password (if empty, use: ''), $*: Instance[s]
+{
+	if echo "$1" | grep -qP '\s'; then
+		echo "Password should not contain spaces"
+		return 1
+	fi
+	
+	local Password="$1"; shift
+	local InstanceList="$*"
+	if [[ -z "$InstanceList" ]] ; then
+		InstanceList=$(show_instances)
+	fi
+	
+	for Instance in $InstanceList
+	do
+		if instance_exists "$Instance"; then	
+			local Config="$InstanceConfigDir/$Instance/LinuxServer-KFGame.ini"
+			local Service=$(service_name "$Instance")
+			if systemctl -q is-active $Service ; then
+				admin_curl "$Instance" "ServerAdmin/policy/passwords" \
+				--request POST               \
+				--data action="adminpassword" \
+				--data adminpw1="$Password"   \
+				--data adminpw2="$Password"
+			else
+				multini -s "$Config" "Engine.AccessControl" "AdminPassword" "$Password"
+			fi
+		else
+			echo "Instance $Instance not exitst"
+		fi
+	done
+}
+
+function chat ()
+{
+	local Message=$(echo "$1" | sed 's/ /+/g')
+	shift
+	local InstanceList="$*"
+	if [[ -z "$InstanceList" ]] ; then
+		InstanceList=$(show_instances)
+	fi
+	
+	for Instance in $InstanceList
+	do
+		if instance_exists "$Instance"; then	
+			local Service=$(service_name "$Instance")
+			if systemctl -q is-active $Service ; then
+				admin_curl "$Instance" "ServerAdmin/current/chat+frame+data" \
+				--request POST            \
+				--data ajax=1             \
+				--data message="$Message" \
+				--data teamsay=-1
+			else
+				echo "Instance $Instance not running - skip"
+			fi
+		else
+			echo "Instance $Instance not exitst"
+		fi
+	done
+}
+
 if [[ "$1" == "beta" ]]; then
 	BetaPostfix="-beta"; shift
 fi
@@ -951,20 +1232,25 @@ case $1 in
 	  -u|--update          ) if [[ "$EUID" -eq 0 ]]; then        update_kf2         ; else run_as_root $*; fi ;;
 	  -v|--validate        ) if [[ "$EUID" -eq 0 ]]; then        validate           ; else run_as_root $*; fi ;;
 	  -r|--run             )                              shift; run              $*;                         ;;
+	  -c|--chat            ) shift; Msg="$1"; shift;             chat "$Msg"      $*;                         ;;
 	 -st|--start           ) if [[ "$EUID" -eq 0 ]]; then shift; start_instance   $*; else run_as_root $*; fi ;;
 	 -sp|--stop            ) if [[ "$EUID" -eq 0 ]]; then shift; stop_instance    $*; else run_as_root $*; fi ;;
 	 -rs|--restart         ) if [[ "$EUID" -eq 0 ]]; then shift; restart_instance $*; else run_as_root $*; fi ;;
 	 -en|--enable          ) if [[ "$EUID" -eq 0 ]]; then shift; enable_instance  $*; else run_as_root $*; fi ;;
 	 -di|--disable         ) if [[ "$EUID" -eq 0 ]]; then shift; disable_instance $*; else run_as_root $*; fi ;;
-	 -wl|--workshop-list   ) if [[ "$EUID" -eq 0 ]]; then shift; workshop_list "-h" ; else run_as_root $*; fi ;;
+	 -wl|--workshop-list   ) if [[ "$EUID" -eq 0 ]]; then shift; workshop_list      ; else run_as_root $*; fi ;;
 	 -wa|--workshop-add    ) if [[ "$EUID" -eq 0 ]]; then shift; workshop_add     $*; else run_as_root $*; fi ;;
 	 -wd|--workshop-del    ) if [[ "$EUID" -eq 0 ]]; then shift; workshop_del     $*; else run_as_root $*; fi ;;
 	 -ws|--workshop-sync   ) if [[ "$EUID" -eq 0 ]]; then shift; workshop_sync      ; else run_as_root $*; fi ;;
 	-mrs|--map-rotate-save ) if [[ "$EUID" -eq 0 ]]; then shift; map_rotate_save  $*; else run_as_root $*; fi ;;
 	-mrl|--map-rotate-load ) if [[ "$EUID" -eq 0 ]]; then shift; map_rotate_load  $*; else run_as_root $*; fi ;;
-	 -bl|--ban-list        ) if [[ "$EUID" -eq 0 ]]; then shift; ban_list "-h"      ; else run_as_root $*; fi ;;
+	 -bl|--ban-list        ) if [[ "$EUID" -eq 0 ]]; then shift; ban_list           ; else run_as_root $*; fi ;;
 	 -bs|--ban-sync        ) if [[ "$EUID" -eq 0 ]]; then shift; ban_sync           ; else run_as_root $*; fi ;;
 	 -ba|--ban-add         ) if [[ "$EUID" -eq 0 ]]; then shift; ban_add          $*; else run_as_root $*; fi ;;
 	 -bd|--ban-del         ) if [[ "$EUID" -eq 0 ]]; then shift; ban_del          $*; else run_as_root $*; fi ;;
+	 -fp|--fix-permissions ) if [[ "$EUID" -eq 0 ]]; then shift; fix_permissions  $*; else run_as_root $*; fi ;;
+	 -as|--admin-sync      ) if [[ "$EUID" -eq 0 ]]; then shift; admin_sync         ; else run_as_root $*; fi ;;
+	 -pg|--password-game   ) if [[ "$EUID" -eq 0 ]]; then shift; Pass="$1"; shift   ; password_game  "$Pass" $*; else run_as_root $*; fi ;;
+	 -pa|--password-admin  ) if [[ "$EUID" -eq 0 ]]; then shift; Pass="$1"; shift   ; password_admin "$Pass" $*; else run_as_root $*; fi ;;
 	    *                  ) echo "Command not recognized: $1"; exit 1                                        ;;
 esac

SOURCES/kf2-srv-beta-update.service

@@ -2,7 +2,21 @@
 Description=Check and Update Killing Floor 2 server
 
 [Service]
-Type=simple
+Type=oneshot
+
+ExecStart=/usr/bin/kf2-srv-beta --chat 'Scheduled server restart at 4:00 (MSK)'
+ExecStart=/usr/bin/kf2-srv-beta --chat 'Server will restart after 30 minutes'
+ExecStart=/bin/sleep 15m
+
+ExecStart=/usr/bin/kf2-srv-beta --chat 'Server will restart after 15 minutes'
+ExecStart=/bin/sleep 10m
+
+ExecStart=/usr/bin/kf2-srv-beta --chat 'Server will restart after 5 minutes'
+ExecStart=/bin/sleep 5m
+
+ExecStart=/usr/bin/kf2-srv-beta --chat 'Server shutting down...'
+ExecStart=/bin/sleep 5s
+
 ExecStart=/usr/bin/kf2-srv-beta --update
 
 PrivateTmp=true

SOURCES/kf2-srv-beta-update.timer

@@ -2,7 +2,7 @@
 Description=Check and Update killing Floor 2 beta job
 
 [Timer]
-OnCalendar=Wed, 04:00
+OnCalendar=Wed, 03:30
 Unit=kf2-srv-beta-update.service
 
 [Install]

SOURCES/kf2-srv-beta@.service

@@ -8,7 +8,7 @@ Type=simple
 StandardOutput=null
 StandardError=null
 EnvironmentFile=/etc/kf2-srv/instances-beta/%i/main.conf
-ExecStart=/usr/games/kf2-srv-beta/Binaries/Win64/KFGameSteamServer.bin.x86_64 $Args configsubdir=instances/%i $PortW $PortQ $PortG
+ExecStart=/usr/games/kf2-srv-beta/Binaries/Win64/KFGameSteamServer.bin.x86_64 ${Map}?Difficulty=${Difficulty}?GameLength=${Length}?Game=${Game}?Mutator=${Mutators}?${Args} configsubdir=instances/%i -webadminport=${PortWeb} -queryport=${PortQuery} -port=${PortGame}
 Restart=always
 
 NoNewPrivileges=yes

SOURCES/kf2-srv-update.service

@@ -2,7 +2,21 @@
 Description=Check and Update Killing Floor 2 server
 
 [Service]
-Type=simple
+Type=oneshot
+
+ExecStart=/usr/bin/kf2-srv --chat 'Scheduled server restart at 4:00 (MSK)'
+ExecStart=/usr/bin/kf2-srv --chat 'Server will restart after 30 minutes'
+ExecStart=/bin/sleep 15m
+
+ExecStart=/usr/bin/kf2-srv --chat 'Server will restart after 15 minutes'
+ExecStart=/bin/sleep 10m
+
+ExecStart=/usr/bin/kf2-srv --chat 'Server will restart after 5 minutes'
+ExecStart=/bin/sleep 5m
+
+ExecStart=/usr/bin/kf2-srv --chat 'Server shutting down...'
+ExecStart=/bin/sleep 5s
+
 ExecStart=/usr/bin/kf2-srv --update
 
 PrivateTmp=true

SOURCES/kf2-srv-update.timer

@@ -2,7 +2,7 @@
 Description=Check and Update killing Floor 2 job
 
 [Timer]
-OnCalendar=Wed, 04:00
+OnCalendar=Wed, 03:30
 Unit=kf2-srv-update.service
 
 [Install]

SOURCES/kf2-srv.conf

@@ -1 +1,22 @@
-#BranchName="preview"
+# Displays game difficulty
+# You can rename them as you like
+DiffNames=('Normal' 'Hard' 'Suicide' 'Hell')
+
+# Displays the number of waves
+# You can rename them as you like
+WaveNames=('4' '7' '10')
+
+# Add custom gamemodes to the end of the list, similar to what is already there:
+ModeNames['KFGameContent.KFGameInfo_Survival']='Survival'
+ModeNames['KFGameContent.KFGameInfo_WeeklySurvival']='Weekly'
+ModeNames['KFGameContent.KFGameInfo_Endless']='Endless'
+ModeNames['KFGameContent.KFGameInfo_Objective']='Objective'
+ModeNames['KFGameContent.KFGameInfo_VersusSurvival']='Versus'
+
+# Add mutators to the end of the list, similar to what is already there:
+MutNames['ServerExtMut.ServerExtMut']='RPG'
+
+# Bot default password
+# To change the password for the bot, you must do this here and in WebAdmin.
+# Otherwise, the bot will stop working and some actions cannot be done on running servers
+ServerBotPassword=VerySecretBotPassword

SOURCES/kf2-srv@.service

@@ -8,7 +8,7 @@ Type=simple
 StandardOutput=null
 StandardError=null
 EnvironmentFile=/etc/kf2-srv/instances/%i/main.conf
-ExecStart=/usr/games/kf2-srv/Binaries/Win64/KFGameSteamServer.bin.x86_64 $Args configsubdir=instances/%i $PortW $PortQ $PortG
+ExecStart=/usr/games/kf2-srv/Binaries/Win64/KFGameSteamServer.bin.x86_64 ${Map}?Difficulty=${Difficulty}?GameLength=${Length}?Game=${Game}?Mutator=${Mutators}?${Args} configsubdir=instances/%i -webadminport=${PortWeb} -queryport=${PortQuery} -port=${PortGame}
 Restart=always
 
 NoNewPrivileges=yes

SOURCES/main.conf.template

@@ -1,29 +1,38 @@
 LANG=en_US.UTF-8
 
-PortW=-webadminport=8080
+PortWeb=8080
-PortQ=-queryport=27015
+PortQuery=27015
-PortG=-port=7777
+PortGame=7777
+
+# Default Map
+Map=KF-Nuked
 
-# First arg: map name
-#
 # Difficulty:
 # Normal:         0
 # Hard:           1
 # Suicide:        2
 # Hell:           3
-#
+Difficulty=2
+
 # Game:
 # Survival:       KFGameContent.KFGameInfo_Survival
 # WeeklyOutbreak: KFGameContent.KFGameInfo_WeeklySurvival
 # Endless:        KFGameContent.KFGameInfo_Endless
 # Objective:      KFGameContent.KFGameInfo_Objective
 # Versus:         KFGameContent.KFGameInfo_VersusSurvival
-#
+Game=KFGameContent.KFGameInfo_Endless
+
 # GameLength:
 # 4  waves:       0
 # 7  waves:       1
 # 10 waves:       2
-Args=kf-bioticslab?Difficulty=0?Game=KFGameContent.KFGameInfo_Survival?GameLength=2
+Length=2
+
+# Mutators
+Mutators=
+
+# Additional parameters
+Args=
 
 # Notes for yourself
-Description="Default description"
+Comment=

SPECS/kf2-srv.spec

@@ -1,39 +1,40 @@
 %global steamuser steam
 
-Name:      kf2-srv
+Name:       kf2-srv
-Version:   0.8.0
+Version:    0.10.0
-Release:   1%{dist}
+Release:    1%{dist}
-Summary:   Killing Floor 2 server
+Summary:    Killing Floor 2 server
-Group:     Amusements/Games
+Group:      Amusements/Games
-License:   GNU GPLv3
+License:    GNU GPLv3
-BuildArch: noarch
+BuildArch:  noarch
 
-Source1:   %{name}
+Source1:    %{name}
-Source2:   %{name}-beta
+Source2:    %{name}-beta
-Source3:   %{name}.xml
+Source3:    %{name}.xml
-Source4:   %{name}@.service
+Source4:    %{name}@.service
-Source5:   %{name}-update.service
+Source5:    %{name}-update.service
-Source6:   %{name}-update.timer
+Source6:    %{name}-update.timer
-Source7:   main.conf.template
+Source7:    main.conf.template
-Source8:   %{name}-beta@.service
+Source8:    %{name}-beta@.service
-Source9:   %{name}-beta-update.service
+Source9:    %{name}-beta-update.service
-Source10:  %{name}-beta-update.timer
+Source10:   %{name}-beta-update.timer
+Source11:   %{name}.conf
 
-Requires:  systemd >= 219
+Requires:   systemd >= 219
-Requires:  steamcmd
+Requires:   steamcmd
-Requires:  libxml2
+Requires:   libxml2
-Requires:  dos2unix
+Requires:   dos2unix
-Requires:  curl
+Requires:   curl
-Requires:  grep
+Requires:   grep
-Requires:  coreutils
+Requires:   coreutils
-Requires:  sed
+Requires:   sed
-Requires:  util-linux
+Requires:   util-linux
-Requires:  sudo
+Requires:   sudo
-Requires:  psmisc
+Requires:   psmisc
-Requires:  gawk
+Requires:   gawk
-Requires:  multini >= 0.2
+Requires:   multini >= 0.2.3
 
-Provides:  %{name}
+Provides:   %{name}
 
 %description
 Command line tool for managing a set of Killing Floor 2 servers.
@@ -50,6 +51,7 @@ install -m 755 -d %{buildroot}/%{_prefix}/lib/systemd/system
 install -m 755 -d %{buildroot}/%{_prefix}/lib/firewalld/services
 install -m 755 -d %{buildroot}/%{_sysconfdir}/%{name}/instances
 install -m 755 -d %{buildroot}/%{_sysconfdir}/%{name}/instances-beta
+install -m 755 -d %{buildroot}/%{_sysconfdir}/%{name}/mapcycles
 install -m 644 -d %{buildroot}/%{_prefix}/games/%{name}
 install -m 644 -d %{buildroot}/%{_prefix}/games/%{name}-beta
 
@@ -63,21 +65,24 @@ install -m 644 %{SOURCE7}  %{buildroot}/%{_sysconfdir}/%{name}
 install -m 644 %{SOURCE8}  %{buildroot}/%{_prefix}/lib/systemd/system
 install -m 644 %{SOURCE9}  %{buildroot}/%{_prefix}/lib/systemd/system
 install -m 644 %{SOURCE10} %{buildroot}/%{_prefix}/lib/systemd/system
+install -m 644 %{SOURCE11} %{buildroot}/%{_sysconfdir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%attr(775,root,%{steamuser}) %dir       %{_prefix}/games/%{name}
+%attr(775,root,%{steamuser}) %dir               %{_prefix}/games/%{name}
-%attr(775,root,%{steamuser}) %dir       %{_prefix}/games/%{name}-beta
+%attr(775,root,%{steamuser}) %dir               %{_prefix}/games/%{name}-beta
-%attr(775,root,%{steamuser}) %dir       %{_sysconfdir}/%{name}
+%attr(775,root,%{steamuser}) %dir               %{_sysconfdir}/%{name}
-%attr(775,root,%{steamuser}) %dir       %{_sysconfdir}/%{name}/instances
+%attr(775,root,%{steamuser}) %dir               %{_sysconfdir}/%{name}/instances
-%attr(775,root,%{steamuser}) %dir       %{_sysconfdir}/%{name}/instances-beta
+%attr(775,root,%{steamuser}) %dir               %{_sysconfdir}/%{name}/instances-beta
-%attr(644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/main.conf.template
+%attr(775,root,%{steamuser}) %dir               %{_sysconfdir}/%{name}/mapcycles
-%attr(644,root,root) %config(noreplace) %{_prefix}/lib/firewalld/services/%{name}.xml
+%attr(644,root,%{steamuser}) %config(noreplace) %{_sysconfdir}/%{name}/main.conf.template
-%attr(755,root,root)                    %{_bindir}/%{name}
+%attr(640,root,%{steamuser}) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
-%attr(755,root,root)                    %{_bindir}/%{name}-beta
+%attr(644,root,root)         %config(noreplace) %{_prefix}/lib/firewalld/services/%{name}.xml
-%attr(644,root,root)                    %{_prefix}/lib/systemd/system/*
+%attr(755,root,root)                            %{_bindir}/%{name}
+%attr(755,root,root)                            %{_bindir}/%{name}-beta
+%attr(644,root,root)                            %{_prefix}/lib/systemd/system/*
 
 %preun
 if [[ $1 -eq 0 ]] ; then # Uninstall
@@ -90,6 +95,25 @@ if [[ $1 -eq 0 ]] ; then # Uninstall
 fi
 
 %changelog
+* Mon Jun 22 2020 GenZmeY <genzmey@gmail.com> - 0.10.0-1
+- separate mutators setting;
+- mutator column in server list;
+- chat notifications on restart for updates;
+- unban on working servers;
+- refactoring.
+
+* Sun May 31 2020 GenZmeY <genzmey@gmail.com> - 0.9.1-1
+- fix realtime -mrl with spaces;
+- mapcycles directory.
+
+* Wed May 27 2020 GenZmeY <genzmey@gmail.com> - 0.9.0-1
+- new main.conf format;
+- multiple WebAdmin and http auth by default;
+- online actions;
+- chat-bot;
+- set password;
+- refactoring.
+
 * Mon Apr 27 2020 GenZmeY <genzmey@gmail.com> - 0.8.0-1
 - use multini for ini edit;
 - add mutators support;