From b3f39306a48950adc3e96e3f316a7587d67cf7cb Mon Sep 17 00:00:00 2001 From: GenZmeY Date: Mon, 13 Jul 2020 05:04:36 +0300 Subject: [PATCH] rename main.conf to instance.conf --- SOURCES/kf2-srv | 39 +++++++++++++++++------------------ SOURCES/kf2-srv-beta@.service | 2 +- SOURCES/kf2-srv@.service | 2 +- SPECS/kf2-srv.spec | 9 +++++--- TODO | 1 - 5 files changed, 27 insertions(+), 26 deletions(-) diff --git a/SOURCES/kf2-srv b/SOURCES/kf2-srv index d2c6eb4..5844719 100644 --- a/SOURCES/kf2-srv +++ b/SOURCES/kf2-srv @@ -204,7 +204,7 @@ function new_instance () # $*: InstanceName[s] local MaxWebAdminPort='8080' for Instance in $(show_instances) do - local Config="$InstanceConfigDir/$Instance/main.conf" + local Config="$InstanceConfigDir/$Instance/instance.conf" local GamePort=$(multini --get "$Config" '' 'PortGame') local WebAdminPort=$(multini --get "$Config" '' 'PortWeb') local QueryPort=$(multini --get "$Config" '' 'PortQuery') @@ -228,7 +228,7 @@ function new_instance () # $*: InstanceName[s] install $DirMode "$InstanceDir" install $DirMode "$InstanceDir/LinuxServer" - install $FileMode "$MainConfigTemplate" "$InstanceDir/main.conf" + install $FileMode "$InstanceConfigTemplate" "$InstanceDir/instance.conf" install $FileMode "$DefaultConfigDir/KFAI.ini" "$InstanceDir" install $FileMode "$DefaultConfigDir/KFWeb.ini" "$InstanceDir" install $FileMode "$DefaultConfigDir/KFWebAdmin.ini" "$InstanceDir" @@ -244,9 +244,9 @@ function new_instance () # $*: InstanceName[s] ((MaxGamePort++)); ((MaxQueryPort++)); ((MaxWebAdminPort++)) - multini -s "$InstanceDir/main.conf" '' 'PortGame' "$MaxGamePort" - multini -s "$InstanceDir/main.conf" '' 'PortQuery' "$MaxQueryPort" - multini -s "$InstanceDir/main.conf" '' 'PortWeb' "$MaxWebAdminPort" + multini -s "$InstanceDir/instance.conf" '' 'PortGame' "$MaxGamePort" + multini -s "$InstanceDir/instance.conf" '' 'PortQuery' "$MaxQueryPort" + multini -s "$InstanceDir/instance.conf" '' 'PortWeb' "$MaxWebAdminPort" multini -s "$InstanceDir/KFWeb.ini" "IpDrv.WebServer" "bEnabled" "true" multini -s "$InstanceDir/LinuxServer-KFEngine.ini" "LogFiles" "PurgeLogsDays" "0" @@ -304,16 +304,16 @@ function instance_status () # $1: InstanceName else 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 Comment=$( multini -g "$InstanceConfigDir/$Instance/instance.conf" '' "Comment") + local GamePort=$( multini -g "$InstanceConfigDir/$Instance/instance.conf" '' "PortGame") + local WebAdminPort=$( multini -g "$InstanceConfigDir/$Instance/instance.conf" '' "PortWeb") + local QueryPort=$( multini -g "$InstanceConfigDir/$Instance/instance.conf" '' "PortQuery") + local GameType=$( multini -g "$InstanceConfigDir/$Instance/instance.conf" '' "Game") + local GameLength=$( multini -g "$InstanceConfigDir/$Instance/instance.conf" '' "Length") + local GameDifficulty=$( multini -g "$InstanceConfigDir/$Instance/instance.conf" '' "Difficulty") + local Map=$( multini -g "$InstanceConfigDir/$Instance/instance.conf" '' "Map") + local Mutators=$( multini -g "$InstanceConfigDir/$Instance/instance.conf" '' "Mutators") + local Args=$( multini -g "$InstanceConfigDir/$Instance/instance.conf" '' "Args") local DisplayGameType='' local DisplayGameLength='' @@ -398,7 +398,7 @@ function make_default_instance () # $1: Dir 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" + install -g "$SteamUser" -o "$SteamUser" -m 664 "$InstanceConfigTemplate" "$InstanceDir/instance.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" @@ -1130,14 +1130,13 @@ 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") + local InstanceConf="$InstanceConfigDir/$Instance/instance.conf" + local WebPort=$(multini --get "$InstanceConf" '' "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 @@ -1242,7 +1241,7 @@ CacheDir="$InstallDir/KFGame/Cache" LogDir="$InstallDir/KFGame/Logs" InstanceConfigDir="/etc/kf2-srv/instances$BetaPostfix" InstanceConfigLnk="$DefaultConfigDir/instances" -MainConfigTemplate="/etc/kf2-srv/main.conf.template" +InstanceConfigTemplate="/etc/kf2-srv/instance.conf.template" if [[ $# -eq 0 ]]; then show_help; exit 0; fi case $1 in diff --git a/SOURCES/kf2-srv-beta@.service b/SOURCES/kf2-srv-beta@.service index cc762fc..f4b5057 100644 --- a/SOURCES/kf2-srv-beta@.service +++ b/SOURCES/kf2-srv-beta@.service @@ -11,7 +11,7 @@ Type=simple StandardOutput=syslog StandardError=syslog SyslogIdentifier=kf2-srv-beta/%i -EnvironmentFile=/etc/kf2-srv/instances-beta/%i/main.conf +EnvironmentFile=/etc/kf2-srv/instances-beta/%i/instance.conf 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 diff --git a/SOURCES/kf2-srv@.service b/SOURCES/kf2-srv@.service index bcf5647..3d92bef 100644 --- a/SOURCES/kf2-srv@.service +++ b/SOURCES/kf2-srv@.service @@ -11,7 +11,7 @@ Type=simple StandardOutput=syslog StandardError=syslog SyslogIdentifier=kf2-srv/%i -EnvironmentFile=/etc/kf2-srv/instances/%i/main.conf +EnvironmentFile=/etc/kf2-srv/instances/%i/instance.conf 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 diff --git a/SPECS/kf2-srv.spec b/SPECS/kf2-srv.spec index 09857f2..705d4fe 100644 --- a/SPECS/kf2-srv.spec +++ b/SPECS/kf2-srv.spec @@ -1,7 +1,7 @@ %global steamuser steam Name: kf2-srv -Version: 0.12.0 +Version: 0.12.1 Release: 1%{dist} Summary: Killing Floor 2 server Group: Amusements/Games @@ -14,7 +14,7 @@ Source3: %{name}.xml Source4: %{name}@.service Source5: %{name}-update.service Source6: %{name}-update.timer -Source7: main.conf.template +Source7: instance.conf.template Source8: %{name}-beta@.service Source9: %{name}-beta-update.service Source10: %{name}-beta-update.timer @@ -101,7 +101,7 @@ rm -rf $RPM_BUILD_ROOT %attr(0775,root,%{steamuser}) %dir %{_sysconfdir}/%{name}/mapcycles %attr(0770,root,%{steamuser}) %dir %{_localstatedir}/log/%{name} %attr(0770,root,%{steamuser}) %dir %{_localstatedir}/log/%{name}-beta -%attr(0664,root,%{steamuser}) %config(noreplace) %{_sysconfdir}/%{name}/main.conf.template +%attr(0664,root,%{steamuser}) %config(noreplace) %{_sysconfdir}/%{name}/instance.conf.template %attr(0664,root,%{steamuser}) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf %attr(0640,root,%{steamuser}) %config(noreplace) %{_sysconfdir}/%{name}/bot.conf %attr(0644,root,root) %config(noreplace) %{_prefix}/lib/firewalld/services/%{name}.xml @@ -130,6 +130,9 @@ systemctl try-restart rsyslog.service #fi %changelog +* Mon Jul 13 2020 GenZmeY - 0.12.1-1 +- rename main.conf to instance.conf. + * Mon Jul 13 2020 GenZmeY - 0.12.0-1 - chat logs without timestamp; - update rsyslog config - now logs will be create with steam group and 640 permissions; diff --git a/TODO b/TODO index ee2df01..85e63fc 100644 --- a/TODO +++ b/TODO @@ -11,7 +11,6 @@ - generate unique password for server bot on install - parallel actions - bash completion -- rename main.conf to instance.conf ###################