Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
5fa12d821b | |||
ab8b757a8d | |||
31167e6f7a | |||
8f34f6fa95 |
1
Makefile
1
Makefile
@ -46,7 +46,6 @@ builddep:
|
|||||||
prep: clean-tmp
|
prep: clean-tmp
|
||||||
cd $(SOURCESDIR) && tar czf $(SOURCETARBALL) \
|
cd $(SOURCESDIR) && tar czf $(SOURCETARBALL) \
|
||||||
config \
|
config \
|
||||||
force-attr \
|
|
||||||
main \
|
main \
|
||||||
COPYING \
|
COPYING \
|
||||||
Makefile
|
Makefile
|
||||||
|
@ -60,13 +60,11 @@ build:
|
|||||||
|
|
||||||
cp -r $(SOURCEDIR)/main $(RELEASEDIR)
|
cp -r $(SOURCEDIR)/main $(RELEASEDIR)
|
||||||
cp -r $(SOURCEDIR)/config $(RELEASEDIR)
|
cp -r $(SOURCEDIR)/config $(RELEASEDIR)
|
||||||
cp -r $(SOURCEDIR)/force-attr $(RELEASEDIR)
|
|
||||||
|
|
||||||
find $(RELEASEDIR) -type f -exec sed -i 's|:DEFINE_PREFIX:|$(PREFIX)|g;' {} \;
|
find $(RELEASEDIR) -type f -exec sed -i 's|:DEFINE_PREFIX:|$(PREFIX)|g;' {} \;
|
||||||
|
|
||||||
fake-systemd-build:
|
fake-systemd-build:
|
||||||
find $(SOURCEDIR)/main -type f -name '*.service' -exec cp -f {} $(RELEASEDIR)/{} \;
|
find $(SOURCEDIR)/main -type f -name '*.service' -exec cp -f {} $(RELEASEDIR)/{} \;
|
||||||
find $(SOURCEDIR)/force-attr -type f -name '*.service' -exec cp -f {} $(RELEASEDIR)/{} \;
|
|
||||||
find $(RELEASEDIR) -type f -exec sed -i 's|:DEFINE_PREFIX:|$(DESTDIR)$(PREFIX)|g;' {} \;
|
find $(RELEASEDIR) -type f -exec sed -i 's|:DEFINE_PREFIX:|$(DESTDIR)$(PREFIX)|g;' {} \;
|
||||||
find $(RELEASEDIR) -type f -exec sed -i -r 's|ExecStart=.+KFGameSteamServer.bin.x86_64|ExecStart=/bin/bash|g;' {} \;
|
find $(RELEASEDIR) -type f -exec sed -i -r 's|ExecStart=.+KFGameSteamServer.bin.x86_64|ExecStart=/bin/bash|g;' {} \;
|
||||||
|
|
||||||
@ -122,9 +120,6 @@ install: filesystem build
|
|||||||
install -m 644 $(RELEASEDIR)/main/logrotate/$(NAME) $(LOGROTATEDIR)
|
install -m 644 $(RELEASEDIR)/main/logrotate/$(NAME) $(LOGROTATEDIR)
|
||||||
install -m 644 $(RELEASEDIR)/main/rsyslog/$(NAME).conf $(RSYSLOGDIR)
|
install -m 644 $(RELEASEDIR)/main/rsyslog/$(NAME).conf $(RSYSLOGDIR)
|
||||||
|
|
||||||
install -m 755 $(RELEASEDIR)/force-attr/$(NAME)-force-attr $(SBINDIR)
|
|
||||||
install -m 644 $(RELEASEDIR)/force-attr/systemd/$(NAME)-force-attr.service $(UNITDIR)
|
|
||||||
|
|
||||||
install -m 640 $(RELEASEDIR)/config/bot.conf $(CONFDIR)
|
install -m 640 $(RELEASEDIR)/config/bot.conf $(CONFDIR)
|
||||||
install -m 644 $(RELEASEDIR)/config/instance.conf.template $(CONFDIR)
|
install -m 644 $(RELEASEDIR)/config/instance.conf.template $(CONFDIR)
|
||||||
install -m 644 $(RELEASEDIR)/config/$(NAME).conf $(CONFDIR)
|
install -m 644 $(RELEASEDIR)/config/$(NAME).conf $(CONFDIR)
|
||||||
@ -148,9 +143,6 @@ uninstall:
|
|||||||
rm -f $(LOGROTATEDIR)/$(NAME)
|
rm -f $(LOGROTATEDIR)/$(NAME)
|
||||||
rm -f $(RSYSLOGDIR)/$(NAME).conf
|
rm -f $(RSYSLOGDIR)/$(NAME).conf
|
||||||
|
|
||||||
rm -f $(SBINDIR)/$(NAME)-force-attr
|
|
||||||
rm -f $(UNITDIR)/$(NAME)-force-attr.service
|
|
||||||
|
|
||||||
rm -rf $(LICENSEDIR)
|
rm -rf $(LICENSEDIR)
|
||||||
rm -rf $(KF2MAINDIR)
|
rm -rf $(KF2MAINDIR)
|
||||||
rm -rf $(KF2BETADIR)
|
rm -rf $(KF2BETADIR)
|
||||||
@ -165,11 +157,9 @@ test: fake-systemd-build
|
|||||||
$(SYSTEMDCHECK) $(RELEASEDIR)/main/systemd/$(NAME)-beta-update.timer
|
$(SYSTEMDCHECK) $(RELEASEDIR)/main/systemd/$(NAME)-beta-update.timer
|
||||||
$(SYSTEMDCHECK) $(RELEASEDIR)/main/systemd/$(NAME)-update.service
|
$(SYSTEMDCHECK) $(RELEASEDIR)/main/systemd/$(NAME)-update.service
|
||||||
$(SYSTEMDCHECK) $(RELEASEDIR)/main/systemd/$(NAME)-update.timer
|
$(SYSTEMDCHECK) $(RELEASEDIR)/main/systemd/$(NAME)-update.timer
|
||||||
$(SYSTEMDCHECK) $(RELEASEDIR)/force-attr/systemd/$(NAME)-force-attr.service
|
|
||||||
|
|
||||||
$(BASHCHECK) $(RELEASEDIR)/main/$(NAME)
|
$(BASHCHECK) $(RELEASEDIR)/main/$(NAME)
|
||||||
$(BASHCHECK) $(RELEASEDIR)/main/$(NAME)-beta
|
$(BASHCHECK) $(RELEASEDIR)/main/$(NAME)-beta
|
||||||
$(BASHCHECK) $(RELEASEDIR)/force-attr/$(NAME)-force-attr
|
|
||||||
|
|
||||||
$(BASHCHECK) $(RELEASEDIR)/main/cmdgrp/ban/list
|
$(BASHCHECK) $(RELEASEDIR)/main/cmdgrp/ban/list
|
||||||
$(BASHCHECK) $(RELEASEDIR)/main/cmdgrp/ban/add
|
$(BASHCHECK) $(RELEASEDIR)/main/cmdgrp/ban/add
|
||||||
@ -196,6 +186,8 @@ test: fake-systemd-build
|
|||||||
$(BASHCHECK) $(RELEASEDIR)/main/cmdgrp/workshop/add
|
$(BASHCHECK) $(RELEASEDIR)/main/cmdgrp/workshop/add
|
||||||
$(BASHCHECK) $(RELEASEDIR)/main/cmdgrp/workshop/delete
|
$(BASHCHECK) $(RELEASEDIR)/main/cmdgrp/workshop/delete
|
||||||
$(BASHCHECK) $(RELEASEDIR)/main/cmdgrp/workshop/sync
|
$(BASHCHECK) $(RELEASEDIR)/main/cmdgrp/workshop/sync
|
||||||
|
$(BASHCHECK) $(RELEASEDIR)/main/cmdgrp/log/cat
|
||||||
|
$(BASHCHECK) $(RELEASEDIR)/main/cmdgrp/log/tail
|
||||||
|
|
||||||
$(BASHCHECK) $(RELEASEDIR)/main/lib/ban.lib
|
$(BASHCHECK) $(RELEASEDIR)/main/lib/ban.lib
|
||||||
$(BASHCHECK) $(RELEASEDIR)/main/lib/game.lib
|
$(BASHCHECK) $(RELEASEDIR)/main/lib/game.lib
|
||||||
@ -205,6 +197,7 @@ test: fake-systemd-build
|
|||||||
$(BASHCHECK) $(RELEASEDIR)/main/lib/playerids.lib
|
$(BASHCHECK) $(RELEASEDIR)/main/lib/playerids.lib
|
||||||
$(BASHCHECK) $(RELEASEDIR)/main/lib/webadmin.lib
|
$(BASHCHECK) $(RELEASEDIR)/main/lib/webadmin.lib
|
||||||
$(BASHCHECK) $(RELEASEDIR)/main/lib/workshop.lib
|
$(BASHCHECK) $(RELEASEDIR)/main/lib/workshop.lib
|
||||||
|
$(BASHCHECK) $(RELEASEDIR)/main/lib/log.lib
|
||||||
|
|
||||||
$(BASHCHECK) $(RELEASEDIR)/main/bash_completion/$(NAME)
|
$(BASHCHECK) $(RELEASEDIR)/main/bash_completion/$(NAME)
|
||||||
|
|
||||||
|
@ -25,10 +25,7 @@ MutNames['KFMutator.KFMutator_MaxPlayersV2']='MaxPlayers'
|
|||||||
MutNames['ClassicScoreboard.ClassicSCMut']='ClassicSC'
|
MutNames['ClassicScoreboard.ClassicSCMut']='ClassicSC'
|
||||||
MutNames['ZedCustom.ZedCustomMut']='ZedVarients'
|
MutNames['ZedCustom.ZedCustomMut']='ZedVarients'
|
||||||
|
|
||||||
# These parameters are used when creating new instances.
|
# These parameters are used when creating new instances and in the command "kf2-srv game fix-permissions"
|
||||||
# In order for the parameters to be applied to the files that the working server creates, the "kf2-srv-force-attr.service" must be active.
|
IniPermissions=664
|
||||||
ForceIniPermissions=664
|
IniGroup=steam
|
||||||
ForceLogPermissions=644
|
|
||||||
ForceIniGroup=steam
|
|
||||||
ForceLogGroup=steam
|
|
||||||
|
|
||||||
|
@ -1,18 +0,0 @@
|
|||||||
[Unit]
|
|
||||||
Description=kf2-srv force attr service
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
Type=simple
|
|
||||||
StandardOutput=null
|
|
||||||
StandardError=null
|
|
||||||
ExecStart=:DEFINE_PREFIX:/sbin/kf2-srv-force-attr
|
|
||||||
Restart=always
|
|
||||||
|
|
||||||
NoNewPrivileges=yes
|
|
||||||
PrivateTmp=true
|
|
||||||
PrivateDevices=true
|
|
||||||
ProtectHome=true
|
|
||||||
ProtectSystem=true
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=multi-user.target
|
|
@ -35,7 +35,8 @@ function cmd_info ()
|
|||||||
|
|
||||||
function cmd_help ()
|
function cmd_help ()
|
||||||
{
|
{
|
||||||
echo "TODO: description"
|
echo "Id can be SteamID3, SteamID64 or a link to a user profile."
|
||||||
|
echo "EGS players are not supported."
|
||||||
}
|
}
|
||||||
|
|
||||||
function cmd_main () # $*: ban list
|
function cmd_main () # $*: ban list
|
||||||
|
@ -35,7 +35,8 @@ function cmd_info ()
|
|||||||
|
|
||||||
function cmd_help ()
|
function cmd_help ()
|
||||||
{
|
{
|
||||||
echo "TODO: description"
|
echo "Id can be SteamID3, SteamID64 or a link to a user profile."
|
||||||
|
echo "EGS players are not supported."
|
||||||
}
|
}
|
||||||
|
|
||||||
function cmd_main () # $*: ban list
|
function cmd_main () # $*: ban list
|
||||||
|
@ -33,10 +33,10 @@ function cmd_info ()
|
|||||||
echo "Show the list of blocked users"
|
echo "Show the list of blocked users"
|
||||||
}
|
}
|
||||||
|
|
||||||
function cmd_help ()
|
#function cmd_help ()
|
||||||
{
|
#{
|
||||||
echo "TODO: description"
|
# echo ""
|
||||||
}
|
#}
|
||||||
|
|
||||||
function cmd_main ()
|
function cmd_main ()
|
||||||
{
|
{
|
||||||
|
@ -33,10 +33,10 @@ function cmd_info ()
|
|||||||
echo "Sync blocklist for all servers"
|
echo "Sync blocklist for all servers"
|
||||||
}
|
}
|
||||||
|
|
||||||
function cmd_help ()
|
#function cmd_help ()
|
||||||
{
|
#{
|
||||||
echo "TODO: description"
|
# echo ""
|
||||||
}
|
#}
|
||||||
|
|
||||||
function cmd_main ()
|
function cmd_main ()
|
||||||
{
|
{
|
||||||
|
@ -35,7 +35,10 @@ function cmd_info ()
|
|||||||
|
|
||||||
function cmd_help ()
|
function cmd_help ()
|
||||||
{
|
{
|
||||||
echo "TODO: description"
|
echo "By default, all files created by the kf2 server"
|
||||||
|
echo "have 600 permissions, which can be inconvenient."
|
||||||
|
echo "This command fixes the permissions and groups of"
|
||||||
|
echo "all ini files to the values specified in kf2-srv.conf"
|
||||||
}
|
}
|
||||||
|
|
||||||
function cmd_main ()
|
function cmd_main ()
|
||||||
|
@ -35,7 +35,7 @@ function cmd_info ()
|
|||||||
|
|
||||||
function cmd_help ()
|
function cmd_help ()
|
||||||
{
|
{
|
||||||
echo "TODO: description"
|
echo "Run the server binary directly, without systemd or anything else."
|
||||||
}
|
}
|
||||||
|
|
||||||
function cmd_main ()
|
function cmd_main ()
|
||||||
|
@ -35,7 +35,8 @@ function cmd_info ()
|
|||||||
|
|
||||||
function cmd_help ()
|
function cmd_help ()
|
||||||
{
|
{
|
||||||
echo "TODO: description"
|
echo "Stops all running server instances, installs updates (if any)"
|
||||||
|
echo "When finished, starts all enabled instances."
|
||||||
}
|
}
|
||||||
|
|
||||||
function cmd_main ()
|
function cmd_main ()
|
||||||
|
@ -35,7 +35,8 @@ function cmd_info ()
|
|||||||
|
|
||||||
function cmd_help ()
|
function cmd_help ()
|
||||||
{
|
{
|
||||||
echo "TODO: description"
|
echo "Stops all running server instances, validate server files."
|
||||||
|
echo "When finished, starts all enabled instances."
|
||||||
}
|
}
|
||||||
|
|
||||||
function cmd_main ()
|
function cmd_main ()
|
||||||
|
@ -35,7 +35,7 @@ function cmd_info ()
|
|||||||
|
|
||||||
function cmd_help ()
|
function cmd_help ()
|
||||||
{
|
{
|
||||||
echo "TODO: description"
|
echo "Name(s) must not contain spaces."
|
||||||
}
|
}
|
||||||
|
|
||||||
function cmd_main ()
|
function cmd_main ()
|
||||||
|
@ -30,12 +30,12 @@ function cmd_usage ()
|
|||||||
|
|
||||||
function cmd_info ()
|
function cmd_info ()
|
||||||
{
|
{
|
||||||
echo "Send message to specified server instances"
|
echo "Send message to specified server instance(s)"
|
||||||
}
|
}
|
||||||
|
|
||||||
function cmd_help ()
|
function cmd_help ()
|
||||||
{
|
{
|
||||||
echo "TODO: description"
|
echo "If instance is not specified, sends a message to all running servers."
|
||||||
}
|
}
|
||||||
|
|
||||||
function cmd_main ()
|
function cmd_main ()
|
||||||
|
@ -30,12 +30,12 @@ function cmd_usage ()
|
|||||||
|
|
||||||
function cmd_info ()
|
function cmd_info ()
|
||||||
{
|
{
|
||||||
echo "Delete the specified server instances"
|
echo "Delete the specified server instance(s)"
|
||||||
}
|
}
|
||||||
|
|
||||||
function cmd_help ()
|
function cmd_help ()
|
||||||
{
|
{
|
||||||
echo "TODO: description"
|
echo "If instance is not specified, deletes all server instances."
|
||||||
}
|
}
|
||||||
|
|
||||||
function cmd_main ()
|
function cmd_main ()
|
||||||
|
@ -30,12 +30,12 @@ function cmd_usage ()
|
|||||||
|
|
||||||
function cmd_info ()
|
function cmd_info ()
|
||||||
{
|
{
|
||||||
echo "Disable specified server instance(s)"
|
echo "Disable autostart for specified server instance(s)"
|
||||||
}
|
}
|
||||||
|
|
||||||
function cmd_help ()
|
function cmd_help ()
|
||||||
{
|
{
|
||||||
echo "TODO: description"
|
echo "If instance is not specified, disable autostart for all instances."
|
||||||
}
|
}
|
||||||
|
|
||||||
function cmd_main ()
|
function cmd_main ()
|
||||||
|
@ -30,12 +30,12 @@ function cmd_usage ()
|
|||||||
|
|
||||||
function cmd_info ()
|
function cmd_info ()
|
||||||
{
|
{
|
||||||
echo "Enable specified server instance(s)"
|
echo "Enable autostart for specified server instance(s)"
|
||||||
}
|
}
|
||||||
|
|
||||||
function cmd_help ()
|
function cmd_help ()
|
||||||
{
|
{
|
||||||
echo "TODO: description"
|
echo "If instance is not specified, disable autostart for all instances."
|
||||||
}
|
}
|
||||||
|
|
||||||
function cmd_main ()
|
function cmd_main ()
|
||||||
|
@ -35,7 +35,7 @@ function cmd_info ()
|
|||||||
|
|
||||||
function cmd_help ()
|
function cmd_help ()
|
||||||
{
|
{
|
||||||
echo "TODO: description"
|
echo "If instance is not specified, displays the status of all instances."
|
||||||
}
|
}
|
||||||
|
|
||||||
function cmd_main ()
|
function cmd_main ()
|
||||||
|
@ -35,7 +35,7 @@ function cmd_info ()
|
|||||||
|
|
||||||
function cmd_help ()
|
function cmd_help ()
|
||||||
{
|
{
|
||||||
echo "TODO: description"
|
echo "If instance is not specified, restarts all enabled instances."
|
||||||
}
|
}
|
||||||
|
|
||||||
function cmd_main ()
|
function cmd_main ()
|
||||||
|
@ -35,7 +35,7 @@ function cmd_info ()
|
|||||||
|
|
||||||
function cmd_help ()
|
function cmd_help ()
|
||||||
{
|
{
|
||||||
echo "TODO: description"
|
echo "If instance is not specified, starts all enabled instances."
|
||||||
}
|
}
|
||||||
|
|
||||||
function cmd_main ()
|
function cmd_main ()
|
||||||
|
@ -35,7 +35,7 @@ function cmd_info ()
|
|||||||
|
|
||||||
function cmd_help ()
|
function cmd_help ()
|
||||||
{
|
{
|
||||||
echo "TODO: description"
|
echo "If instance is not specified, stops all instances."
|
||||||
}
|
}
|
||||||
|
|
||||||
function cmd_main ()
|
function cmd_main ()
|
||||||
|
@ -19,25 +19,29 @@
|
|||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
declare -A ModeNames MutNames
|
cmd_need_superuser () { false ;}
|
||||||
|
cmd_need_steamuser () { false ;}
|
||||||
|
cmd_need_installed_server () { true ;}
|
||||||
|
|
||||||
source "/etc/kf2-srv/kf2-srv.conf"
|
function cmd_usage ()
|
||||||
|
{
|
||||||
|
echo "[<instance>...]"
|
||||||
|
}
|
||||||
|
|
||||||
DirLog="/var/log/kf2-srv"
|
function cmd_info ()
|
||||||
DirLogBeta="/var/log/kf2-srv-beta"
|
{
|
||||||
DirInstances="/etc/kf2-srv/instances"
|
echo "Print in stdout full log of specified server instance(s)"
|
||||||
DirInstancesBeta="/etc/kf2-srv/instances-beta"
|
}
|
||||||
|
|
||||||
/usr/bin/inotifywait -qmr -e create -e moved_to --format %w%f \
|
function cmd_help ()
|
||||||
"$DirLog" "$DirLogBeta" "$DirInstances" "$DirInstancesBeta" | \
|
{
|
||||||
while read File
|
echo "If instance is not specified, prints the log of all instances."
|
||||||
do
|
}
|
||||||
if echo "$File" | grep -Piq "\.log$"; then
|
|
||||||
chmod "$ForceLogPermissions" "$File"
|
function cmd_main ()
|
||||||
chown :"$ForceLogGroup" "$File"
|
{
|
||||||
elif echo "$File" | grep -Piq "\.ini$"; then
|
include "$LibDir/log.lib"
|
||||||
chmod "$ForceIniPermissions" "$File"
|
|
||||||
chown :"$ForceIniGroup" "$File"
|
log_cat "$@"
|
||||||
fi
|
}
|
||||||
done
|
|
||||||
|
|
47
SOURCES/main/cmdgrp/log/tail
Normal file
47
SOURCES/main/cmdgrp/log/tail
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# kf2-srv is a command line tool for managing a set of Killing Floor 2 servers.
|
||||||
|
# Copyright (C) 2019, 2020 GenZmeY
|
||||||
|
# mailto: genzmey@gmail.com
|
||||||
|
#
|
||||||
|
# This file is part of kf2-srv.
|
||||||
|
#
|
||||||
|
# kf2-srv is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
cmd_need_superuser () { false ;}
|
||||||
|
cmd_need_steamuser () { false ;}
|
||||||
|
cmd_need_installed_server () { true ;}
|
||||||
|
|
||||||
|
function cmd_usage ()
|
||||||
|
{
|
||||||
|
echo "[<instance>...]"
|
||||||
|
}
|
||||||
|
|
||||||
|
function cmd_info ()
|
||||||
|
{
|
||||||
|
echo "Print in stdout tail log of specified server instance(s) in real time"
|
||||||
|
}
|
||||||
|
|
||||||
|
function cmd_help ()
|
||||||
|
{
|
||||||
|
echo "If instance is not specified, prints the log of all instances in real time."
|
||||||
|
}
|
||||||
|
|
||||||
|
function cmd_main ()
|
||||||
|
{
|
||||||
|
include "$LibDir/log.lib"
|
||||||
|
|
||||||
|
log_tail "$@"
|
||||||
|
}
|
||||||
|
|
@ -35,7 +35,7 @@ function cmd_info ()
|
|||||||
|
|
||||||
function cmd_help ()
|
function cmd_help ()
|
||||||
{
|
{
|
||||||
echo "TODO: description"
|
echo "If instance is not specified, load map rotation for all instances."
|
||||||
}
|
}
|
||||||
|
|
||||||
function cmd_main () # $*: Instance[s]
|
function cmd_main () # $*: Instance[s]
|
||||||
|
@ -35,7 +35,7 @@ function cmd_info ()
|
|||||||
|
|
||||||
function cmd_help ()
|
function cmd_help ()
|
||||||
{
|
{
|
||||||
echo "TODO: description"
|
echo "If instance is not specified, save map rotation for all instances."
|
||||||
}
|
}
|
||||||
|
|
||||||
function cmd_main () # $*: Instance[s]
|
function cmd_main () # $*: Instance[s]
|
||||||
|
@ -35,7 +35,9 @@ function cmd_info ()
|
|||||||
|
|
||||||
function cmd_help ()
|
function cmd_help ()
|
||||||
{
|
{
|
||||||
echo "TODO: description"
|
echo "If instance is not specified, set a admin password for all instances."
|
||||||
|
echo "To remove a password, use an empty password as an argument,"
|
||||||
|
echo "example: ${ScriptFullname}${KF2POSTFIX} password admin '' test_instance"
|
||||||
}
|
}
|
||||||
|
|
||||||
function cmd_main ()
|
function cmd_main ()
|
||||||
|
@ -35,7 +35,9 @@ function cmd_info ()
|
|||||||
|
|
||||||
function cmd_help ()
|
function cmd_help ()
|
||||||
{
|
{
|
||||||
echo "TODO: description"
|
echo "If instance is not specified, set a game password for all instances."
|
||||||
|
echo "To remove a password, use an empty password as an argument,"
|
||||||
|
echo "example: ${ScriptFullname}${KF2POSTFIX} password game '' test_instance"
|
||||||
}
|
}
|
||||||
|
|
||||||
function cmd_main ()
|
function cmd_main ()
|
||||||
|
@ -25,7 +25,7 @@ cmd_need_installed_server () { false ;}
|
|||||||
|
|
||||||
function cmd_usage ()
|
function cmd_usage ()
|
||||||
{
|
{
|
||||||
echo "[<workshop_id>...]"
|
echo "<workshop_id>..."
|
||||||
}
|
}
|
||||||
|
|
||||||
function cmd_info ()
|
function cmd_info ()
|
||||||
@ -35,7 +35,7 @@ function cmd_info ()
|
|||||||
|
|
||||||
function cmd_help ()
|
function cmd_help ()
|
||||||
{
|
{
|
||||||
echo "TODO: description"
|
echo "workshop_id can be a resource ID or a link to a resource in workshop."
|
||||||
}
|
}
|
||||||
|
|
||||||
function cmd_main ()
|
function cmd_main ()
|
||||||
|
@ -35,7 +35,7 @@ function cmd_info ()
|
|||||||
|
|
||||||
function cmd_help ()
|
function cmd_help ()
|
||||||
{
|
{
|
||||||
echo "TODO: description"
|
echo "workshop_id can be a resource ID or a link to a resource in workshop."
|
||||||
}
|
}
|
||||||
|
|
||||||
function cmd_main ()
|
function cmd_main ()
|
||||||
|
@ -33,10 +33,10 @@ function cmd_info ()
|
|||||||
echo "Show the list of steam workshop resources"
|
echo "Show the list of steam workshop resources"
|
||||||
}
|
}
|
||||||
|
|
||||||
function cmd_help ()
|
#function cmd_help ()
|
||||||
{
|
#{
|
||||||
echo "TODO: description"
|
# echo ""
|
||||||
}
|
#}
|
||||||
|
|
||||||
function cmd_main ()
|
function cmd_main ()
|
||||||
{
|
{
|
||||||
|
@ -30,12 +30,13 @@ function cmd_usage ()
|
|||||||
|
|
||||||
function cmd_info ()
|
function cmd_info ()
|
||||||
{
|
{
|
||||||
echo "Sync steamorkshop resources between all server instances"
|
echo "Sync steam workshop resources between all server instances"
|
||||||
}
|
}
|
||||||
|
|
||||||
function cmd_help ()
|
function cmd_help ()
|
||||||
{
|
{
|
||||||
echo "TODO: description"
|
echo "In addition to synchronization, adds loaded maps and mutators to KFGame.ini."
|
||||||
|
echo "This command works for stopped server instances only."
|
||||||
}
|
}
|
||||||
|
|
||||||
function cmd_main ()
|
function cmd_main ()
|
||||||
|
@ -197,10 +197,22 @@ elif [[ -d "$GroupPathname" ]]; then
|
|||||||
shift
|
shift
|
||||||
source "$CommandPathName"
|
source "$CommandPathName"
|
||||||
if is_help "$1"; then
|
if is_help "$1"; then
|
||||||
|
if ! function_exists "cmd_usage" \
|
||||||
|
&& ! function_exists "cmd_info" \
|
||||||
|
&& ! function_exists "cmd_help"; then
|
||||||
|
echo "No help page for this command."
|
||||||
|
else
|
||||||
|
if function_exists "cmd_usage"; then
|
||||||
|
echo "usage: $(cmd_usage)"
|
||||||
|
echo
|
||||||
|
fi
|
||||||
|
if function_exists "cmd_info"; then
|
||||||
|
cmd_info
|
||||||
|
echo
|
||||||
|
fi
|
||||||
if function_exists "cmd_help"; then
|
if function_exists "cmd_help"; then
|
||||||
cmd_help
|
cmd_help
|
||||||
else
|
fi
|
||||||
echo "No help page for this command."
|
|
||||||
fi
|
fi
|
||||||
elif is_usage "$1"; then
|
elif is_usage "$1"; then
|
||||||
if function_exists "cmd_usage"; then
|
if function_exists "cmd_usage"; then
|
||||||
|
@ -39,7 +39,7 @@ function fix_ini_permissions () # $1: Dir
|
|||||||
|
|
||||||
find "$1" \( -type l -o -type f \) -name '*.ini' | \
|
find "$1" \( -type l -o -type f \) -name '*.ini' | \
|
||||||
xargs --max-procs=$(nproc) -I {} \
|
xargs --max-procs=$(nproc) -I {} \
|
||||||
sh -c "chmod $ForceIniPermissions {}; chown $SteamUser:$ForceIniGroup {}"
|
sh -c "chmod $IniPermissions {}; chown $SteamUser:$IniGroup {}"
|
||||||
}
|
}
|
||||||
|
|
||||||
function game_run () # $@: Game args
|
function game_run () # $@: Game args
|
||||||
@ -255,9 +255,9 @@ function make_default_instance () # $1: Dir
|
|||||||
|
|
||||||
local InstanceDir="$InstanceConfigDir/default"
|
local InstanceDir="$InstanceConfigDir/default"
|
||||||
|
|
||||||
install -d -g "$SteamUser" -o "$ForceIniGroup" -m 775 "$InstanceDir"
|
install -d -g "$SteamUser" -o "$IniGroup" -m 775 "$InstanceDir"
|
||||||
install -d -g "$SteamUser" -o "$ForceIniGroup" -m 775 "$InstanceDir/LinuxServer"
|
install -d -g "$SteamUser" -o "$IniGroup" -m 775 "$InstanceDir/LinuxServer"
|
||||||
install -g "$SteamUser" -o "$ForceIniGroup" -m $ForceIniPermissions "$InstanceConfigTemplate" "$InstanceDir/instance.conf"
|
install -g "$SteamUser" -o "$IniGroup" -m $IniPermissions "$InstanceConfigTemplate" "$InstanceDir/instance.conf"
|
||||||
ln -s "$DefaultConfigDir/KFAI.ini" "$InstanceDir/KFAI.ini"
|
ln -s "$DefaultConfigDir/KFAI.ini" "$InstanceDir/KFAI.ini"
|
||||||
ln -s "$DefaultConfigDir/KFWeb.ini" "$InstanceDir/KFWeb.ini"
|
ln -s "$DefaultConfigDir/KFWeb.ini" "$InstanceDir/KFWeb.ini"
|
||||||
ln -s "$DefaultConfigDir/KFWebAdmin.ini" "$InstanceDir/KFWebAdmin.ini"
|
ln -s "$DefaultConfigDir/KFWebAdmin.ini" "$InstanceDir/KFWebAdmin.ini"
|
||||||
|
@ -90,8 +90,8 @@ function instance_add () # $*: InstanceName[s]
|
|||||||
|
|
||||||
local InstanceDir="$InstanceConfigDir/$Instance"
|
local InstanceDir="$InstanceConfigDir/$Instance"
|
||||||
|
|
||||||
local DirMode="-d -g $SteamUser -o $ForceIniGroup -m 775"
|
local DirMode="-d -g $SteamUser -o $IniGroup -m 775"
|
||||||
local FileMode=" -g $SteamUser -o $ForceIniGroup -m $ForceIniPermissions"
|
local FileMode=" -g $SteamUser -o $IniGroup -m $IniPermissions"
|
||||||
|
|
||||||
install $DirMode "$InstanceDir"
|
install $DirMode "$InstanceDir"
|
||||||
install $DirMode "$InstanceDir/LinuxServer"
|
install $DirMode "$InstanceDir/LinuxServer"
|
||||||
|
75
SOURCES/main/lib/log.lib
Normal file
75
SOURCES/main/lib/log.lib
Normal file
@ -0,0 +1,75 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# kf2-srv is a command line tool for managing a set of Killing Floor 2 servers.
|
||||||
|
# Copyright (C) 2019, 2020 GenZmeY
|
||||||
|
# mailto: genzmey@gmail.com
|
||||||
|
#
|
||||||
|
# This file is part of kf2-srv.
|
||||||
|
#
|
||||||
|
# kf2-srv is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
function log_cat () # $*: InstanceName[s]
|
||||||
|
{
|
||||||
|
include "$LibDir/instance.lib"
|
||||||
|
|
||||||
|
local InstanceList="$*"
|
||||||
|
if [[ -z "$InstanceList" ]] ; then
|
||||||
|
InstanceList=$(show_instances)
|
||||||
|
fi
|
||||||
|
|
||||||
|
local Logs
|
||||||
|
for Instance in $InstanceList
|
||||||
|
do
|
||||||
|
if instance_exists "$Instance"; then
|
||||||
|
local Service=$(service_name "$Instance")
|
||||||
|
Logs+="-u $Service "
|
||||||
|
else
|
||||||
|
echo "Instance $Instance not exitst"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
if [[ -z "$Logs" ]]; then
|
||||||
|
echo "No logs available."
|
||||||
|
else
|
||||||
|
journalctl --no-pager $Logs
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
function log_tail () # $*: InstanceName[s]
|
||||||
|
{
|
||||||
|
include "$LibDir/instance.lib"
|
||||||
|
|
||||||
|
local InstanceList="$*"
|
||||||
|
if [[ -z "$InstanceList" ]] ; then
|
||||||
|
InstanceList=$(show_instances)
|
||||||
|
fi
|
||||||
|
|
||||||
|
local Logs
|
||||||
|
for Instance in $InstanceList
|
||||||
|
do
|
||||||
|
if instance_exists "$Instance"; then
|
||||||
|
local Service=$(service_name "$Instance")
|
||||||
|
Logs+="-u $Service "
|
||||||
|
else
|
||||||
|
echo "Instance $Instance not exitst"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
if [[ -z "$Logs" ]]; then
|
||||||
|
echo "No logs available."
|
||||||
|
else
|
||||||
|
echo "Hint: use Ctrl+C to stop output"
|
||||||
|
journalctl --no-pager -f $Logs
|
||||||
|
fi
|
||||||
|
}
|
@ -2,9 +2,12 @@ global(parser.permitSlashInProgramName="on")
|
|||||||
|
|
||||||
template(name="DynFile" type="string" string="/var/log/%programname%.log")
|
template(name="DynFile" type="string" string="/var/log/%programname%.log")
|
||||||
|
|
||||||
|
# Change "UMask" in /usr/lib/systemd/system/rsyslog.service
|
||||||
|
# to make "FileCreateMode" and "Umask" work correctly for this config.
|
||||||
|
|
||||||
if ($programname startswith "kf2-srv") then
|
if ($programname startswith "kf2-srv") then
|
||||||
{
|
{
|
||||||
action(Type="omfile" DynaFile="DynFile" FileCreateMode="0640" Umask="0027" FileOwner="root" FileGroup="steam")
|
action(Type="omfile" DynaFile="DynFile" FileCreateMode="0644" Umask="0022" FileOwner="root" FileGroup="steam")
|
||||||
stop
|
stop
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
%global steamuser steam
|
%global steamuser steam
|
||||||
|
|
||||||
Name: kf2-srv
|
Name: kf2-srv
|
||||||
Version: 0.15.4
|
Version: 0.16.0
|
||||||
Release: 1%{dist}
|
Release: 1%{dist}
|
||||||
Summary: Killing Floor 2 server
|
Summary: Killing Floor 2 server
|
||||||
Group: Amusements/Games
|
Group: Amusements/Games
|
||||||
@ -74,7 +74,6 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%attr(0644,root,root) %config(noreplace) %{_prefix}/lib/firewalld/services/%{name}.xml
|
%attr(0644,root,root) %config(noreplace) %{_prefix}/lib/firewalld/services/%{name}.xml
|
||||||
%attr(0755,root,root) %{_bindir}/%{name}
|
%attr(0755,root,root) %{_bindir}/%{name}
|
||||||
%attr(0755,root,root) %{_bindir}/%{name}-beta
|
%attr(0755,root,root) %{_bindir}/%{name}-beta
|
||||||
%attr(0755,root,root) %{_sbindir}/%{name}-force-attr
|
|
||||||
%attr(0644,root,root) %{_unitdir}/*
|
%attr(0644,root,root) %{_unitdir}/*
|
||||||
%attr(0644,root,root) %doc %{_datadir}/licenses/%{name}/*
|
%attr(0644,root,root) %doc %{_datadir}/licenses/%{name}/*
|
||||||
%attr(0644,root,root) %{_sysconfdir}/rsyslog.d/%{name}.conf
|
%attr(0644,root,root) %{_sysconfdir}/rsyslog.d/%{name}.conf
|
||||||
@ -101,6 +100,11 @@ if [[ $1 == 1 ]]; then # Install
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Sep 21 2020 GenZmeY <genzmey@gmail.com> - 0.16.0-1
|
||||||
|
- remove force-attr daemon;
|
||||||
|
- log cmg group;
|
||||||
|
- command descriptions.
|
||||||
|
|
||||||
* Sat Aug 15 2020 GenZmeY <genzmey@gmail.com> - 0.15.4-1
|
* Sat Aug 15 2020 GenZmeY <genzmey@gmail.com> - 0.15.4-1
|
||||||
- fixed broken update;
|
- fixed broken update;
|
||||||
- replaced steamID3/steamID64 conversation algorithm.
|
- replaced steamID3/steamID64 conversation algorithm.
|
||||||
|
Reference in New Issue
Block a user