Sat Mar 7 2020

SOURCES/kf2-srv-beta

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+/usr/bin/kf2-srv beta $*

SOURCES/kf2-srv-beta-update.service

@@ -0,0 +1,14 @@
+[Unit]
+Description=Check and Update Killing Floor 2 server
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/kf2-srv-beta --update
+
+PrivateTmp=true
+PrivateDevices=true
+ProtectHome=false
+ProtectSystem=false
+
+[Install]
+WantedBy=multi-user.target

SOURCES/kf2-srv-beta-update.timer

@@ -0,0 +1,9 @@
+[Unit]
+Description=Check and Update killing Floor 2 beta job
+
+[Timer]
+OnCalendar=*-*-* 4:00:00
+Unit=kf2-srv-beta-update.service
+
+[Install]
+WantedBy=multi-user.target

SOURCES/kf2-srv-beta@.service

@@ -0,0 +1,21 @@
+[Unit]
+Description=Killing Floor 2 Beta Server Daemon - %i
+
+[Service]
+User=steam
+Group=steam
+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
+Restart=always
+
+NoNewPrivileges=yes
+PrivateTmp=true
+PrivateDevices=true
+ProtectHome=true
+ProtectSystem=false
+
+[Install]
+WantedBy=multi-user.target

SOURCES/kf2-srv-update.timer

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

SOURCES/kf2-srv.conf

@@ -1 +1 @@
-BranchName="preview"
+#BranchName="preview"

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 $Map configsubdir=instances/%i $Arg1 $Arg2 $Arg3
+ExecStart=/usr/games/kf2-srv/Binaries/Win64/KFGameSteamServer.bin.x86_64 $Args configsubdir=instances/%i $PortW $PortQ $PortG
 Restart=always
 
 NoNewPrivileges=yes

SOURCES/main.conf.template

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

SPECS/kf2-srv.spec

@@ -1,5 +1,7 @@
+%global steamuser steam
+
 Name:      kf2-srv
-Version:   0.2.1
+Version:   0.7.0
 Release:   1%{dist}
 Summary:   Killing Floor 2 server
 Group:     Amusements/Games
@@ -7,15 +9,28 @@ License:   GNU GPLv3
 BuildArch: noarch
 
 Source1:   %{name}
-Source2:   %{name}.conf
+Source2:   %{name}-beta
 Source3:   %{name}.xml
 Source4:   %{name}@.service
 Source5:   %{name}-update.service
 Source6:   %{name}-update.timer
 Source7:   main.conf.template
+Source8:   %{name}-beta@.service
+Source9:   %{name}-beta-update.service
+Source10:  %{name}-beta-update.timer
 
 Requires:  systemd >= 219
 Requires:  steamcmd
+Requires:  libxml2
+Requires:  dos2unix
+Requires:  curl
+Requires:  grep
+Requires:  coreutils
+Requires:  sed
+Requires:  util-linux
+Requires:  sudo
+Requires:  psmisc
+Requires:  gawk
 
 Provides:  %{name}
 
@@ -32,49 +47,76 @@ rm -rf $RPM_BUILD_ROOT
 install -m 755 -d %{buildroot}/%{_bindir}
 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}
+install -m 755 -d %{buildroot}/%{_sysconfdir}/%{name}/instances
+install -m 755 -d %{buildroot}/%{_sysconfdir}/%{name}/instances-beta
 install -m 644 -d %{buildroot}/%{_prefix}/games/%{name}
+install -m 644 -d %{buildroot}/%{_prefix}/games/%{name}-beta
 
 install -m 755 %{SOURCE1}  %{buildroot}/%{_bindir}
-install -m 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name}
+install -m 644 %{SOURCE2}  %{buildroot}/%{_bindir}
 install -m 644 %{SOURCE3}  %{buildroot}/%{_prefix}/lib/firewalld/services
 install -m 644 %{SOURCE4}  %{buildroot}/%{_prefix}/lib/systemd/system
 install -m 644 %{SOURCE5}  %{buildroot}/%{_prefix}/lib/systemd/system
 install -m 644 %{SOURCE6}  %{buildroot}/%{_prefix}/lib/systemd/system
 install -m 644 %{SOURCE7}  %{buildroot}/%{_sysconfdir}/%{name}
-
-sed -i -r "s|^(InstallDir=).*$|\1\"%{_prefix}/games/%{name}\"|g" %{buildroot}/%{_bindir}/%{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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%attr(775,root,root) %dir               %{_prefix}/games/%{name}
-%attr(755,root,root) %dir               %{_sysconfdir}/%{name}
-%attr(644,root,root)                    %{_sysconfdir}/%{name}/main.conf.template
-%attr(644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
+%attr(775,root,%{steamuser}) %dir       %{_prefix}/games/%{name}
+%attr(775,root,%{steamuser}) %dir       %{_prefix}/games/%{name}-beta
+%attr(775,root,%{steamuser}) %dir       %{_sysconfdir}/%{name}
+%attr(775,root,%{steamuser}) %dir       %{_sysconfdir}/%{name}/instances
+%attr(775,root,%{steamuser}) %dir       %{_sysconfdir}/%{name}/instances-beta
+%attr(644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/main.conf.template
 %attr(644,root,root) %config(noreplace) %{_prefix}/lib/firewalld/services/%{name}.xml
 %attr(755,root,root)                    %{_bindir}/%{name}
+%attr(755,root,root)                    %{_bindir}/%{name}-beta
 %attr(644,root,root)                    %{_prefix}/lib/systemd/system/*
 
-%post
-#/bin/env bash
-#if [[ $1 -eq 1 ]]; then # First installation
-#	
-#fi
-#exit 0
-
 %preun
-#/bin/env bash
 if [[ $1 -eq 0 ]] ; then # Uninstall
 	%{_bindir}/%{name} --stop
 	%{_bindir}/%{name} --disable
-	yes | %{_bindir}/%{name} --delete
-	rm -f %{_sysconfdir}/%{name}/instances
 	rm -rf %{_prefix}/games/%{name}/*
+	rm -rf %{_prefix}/games/%{name}-beta/*
+	rm -rf %{_sysconfdir}/%{name}/instances/default
+	rm -rf %{_sysconfdir}/%{name}/instances-beta/default
 fi
 
 %changelog
+* Sat Mar 7 2020 GenZmeY <genzmey@gmail.com> - 0.7.0-1
+- dual versions support;
+- check updates;
+- bugfixes.
+
+* Sat Jan 18 2020 GenZmeY <genzmey@gmail.com> - 0.6.0-1
+- versions;
+- instance conf tweaks;
+- extended map list;
+- clear cache on delete map;
+- removed useless messages.
+
+* Sun Jan 12 2020 GenZmeY <genzmey@gmail.com> - 0.5.0-1
+- ban admin;
+- map admin;
+- multiple args support.
+
+* Sun Sep 29 2019 GenZmeY <genzmey@gmail.com> - 0.4.0-1
+- Reworked main.template and kf2-srv@.service;
+- Add --restart option;
+- --status option shows more info;
+- --list option removed.
+
+* Fri Sep 20 2019 GenZmeY <genzmey@gmail.com> - 0.3.0-1
+- validate option;
+- auto validate on change active branch;
+- port info on --status.
+
 * Mon Sep 16 2019 GenZmeY <genzmey@gmail.com> - 0.2.1-1
 - --map-sync bugfixes.