Sat Jan 18 2020

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.0
+Version:   0.6.0
 Release:   1%{dist}
 Summary:   Killing Floor 2 server
 Group:     Amusements/Games
@@ -16,11 +18,13 @@ Source7:   main.conf.template
 
 Requires:  systemd >= 219
 Requires:  steamcmd
+Requires:  libxml2
+Requires:  dos2unix
 
 Provides:  %{name}
 
 %description
-Killing Floor 2 server
+Command line tool for managing a set of Killing Floor 2 servers.
 
 %prep
 
@@ -32,7 +36,7 @@ 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 644 -d %{buildroot}/%{_prefix}/games/%{name}
 
 install -m 755 %{SOURCE1} %{buildroot}/%{_bindir}
@@ -49,32 +53,49 @@ sed -i -r "s|^(InstallDir=).*$|\1\"%{_prefix}/games/%{name}\"|g" %{buildroot}/%{
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%attr(775,root,root) %dir               %{_prefix}/games/%{name}
-%attr(755,root,root) %dir               %{_sysconfdir}/%{name}
+%attr(775,root,%{steamuser}) %dir       %{_prefix}/games/%{name}
+%attr(775,root,%{steamuser}) %dir       %{_sysconfdir}/%{name}
+%attr(775,root,%{steamuser}) %dir       %{_sysconfdir}/%{name}/instances
 %attr(644,root,root)                    %{_sysconfdir}/%{name}/main.conf.template
 %attr(644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
 %attr(644,root,root) %config(noreplace) %{_prefix}/lib/firewalld/services/%{name}.xml
 %attr(755,root,root)                    %{_bindir}/%{name}
 %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}/*
 fi
 
 %changelog
+* 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.
+
 * Mon Sep 16 2019 GenZmeY <genzmey@gmail.com> - 0.2.0-1
 - Add --map-sync implementation to kf2-srv.