Plemya-x/hln-a
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

маленькие изменения

Browse Source
This commit is contained in:
Евгений Храмов 2023-05-29 19:40:19 +03:00
parent b5eb8cb652
commit a0a2315826
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hlna.py
View File

@ -470,12 +470,14 @@ def systemd_unit_create(g, name_server=list_config, config_7days=""):
data = read_yaml(name_server, g="ark") data = read_yaml(name_server, g="ark")
ntff = "" if not data['Cluster'] else "-NoTransferFromFiltering" ntff = "" if not data['Cluster'] else "-NoTransferFromFiltering"
unit_dir_server = dir_server_ark unit_dir_server = dir_server_ark
dir_server_exec = f"{dir_server_ark}ShooterGame/Binaries/Linux/"
systemd_unit_exec = f"{dir_server_exec}ShooterGameServer {data['map']}?listen={data['Listen']}?SessionName={data['SessionName']}?ModsId={data['ModsId']}?Port={data['Port']}?QueryPort={data['QueryPort']}?RCONEnabled={data['RCONEnabled']}?RCONPort={data['RCONPort']}?ServerAdminPassword={data['ServerAdminPassword']}?MaxPlayers={data['MaxPlayers']} -clusterid={data['clusterid']} -ClusterDirOverride={data['clusterdir']} {ntff}" systemd_unit_exec = f"{dir_server_exec}ShooterGameServer {data['map']}?listen={data['Listen']}?SessionName={data['SessionName']}?ModsId={data['ModsId']}?Port={data['Port']}?QueryPort={data['QueryPort']}?RCONEnabled={data['RCONEnabled']}?RCONPort={data['RCONPort']}?ServerAdminPassword={data['ServerAdminPassword']}?MaxPlayers={data['MaxPlayers']} -clusterid={data['clusterid']} -ClusterDirOverride={data['clusterdir']} {ntff}"
unit_file = f"{dir_unit}ark_{data['SessionName']}.service".lower() unit_file = f"{dir_unit}ark_{data['SessionName']}.service".lower()
elif g == "7Days": elif g == "7Days":
id_game = "294420" id_game = "294420"
# сюда дописать обращение к xml_parser для получения уникального имени сервера # сюда дописать обращение к xml_parser для получения уникального имени сервера
unit_dir_server = dir_server_7days unit_dir_server = dir_server_7days
dir_server_exec = dir_server_7days
systemd_unit_exec = f"{dir_server_7days}startserver.sh -configfile={config_7days}.xml" systemd_unit_exec = f"{dir_server_7days}startserver.sh -configfile={config_7days}.xml"
unit_file = f"{dir_unit}7days.service".lower() unit_file = f"{dir_unit}7days.service".lower()
@ -488,6 +490,7 @@ After=syslog.target network.target nss-lookup.target network-online.target
ExecStartPre=/usr/bin/steamcmd +force_install_dir {unit_dir_server} +login anonymous +app_update {id_game} +quit ExecStartPre=/usr/bin/steamcmd +force_install_dir {unit_dir_server} +login anonymous +app_update {id_game} +quit
TimeoutStartSec=99999 TimeoutStartSec=99999
ExecStart={systemd_unit_exec} ExecStart={systemd_unit_exec}
WorkingDirectory={dir_server_exec}
LimitNOFILE=100000 LimitNOFILE=100000
ExecReload=/bin/kill -s HUP $MAINPID ExecReload=/bin/kill -s HUP $MAINPID
ExecStop=/bin/kill -s INT $MAINPID ExecStop=/bin/kill -s INT $MAINPID
@ -782,7 +785,6 @@ def restart(g, m):
def check_exist_servers(g): def check_exist_servers(g):
"""Проверяет наличие конфигов для активных карт""" """Проверяет наличие конфигов для активных карт"""
if g == "ark": if g == "ark":
if list_config == []: if list_config == []:
@ -805,7 +807,7 @@ def start_stop(action, g, m):
x = os.system(f"systemctl --user {action} ark_{data['SessionName'].lower()}.service") x = os.system(f"systemctl --user {action} ark_{data['SessionName'].lower()}.service")
if x == 0: if x == 0:
print_line(f"Готово {action} для {g}", flag="GREEN") print_line(f"Готово {action} для {g} {name_servers}", flag="GREEN")
elif g == "7days": elif g == "7days":
x = os.system(f"systemctl --user {action} 7days.service") x = os.system(f"systemctl --user {action} 7days.service")
@ -816,8 +818,7 @@ def start_stop(action, g, m):
def read_yaml(list_config=list_config, flag=True, m="", g=""): def read_yaml(list_config=list_config, flag=True, m="", g=""):
"""Читает конфиги и отдаёт данные туда где их запросили""" """Читает конфиги активных или неактивных карт в зависимости от флага и отдаёт данные туда где их запросили"""
# Читаем конфиги активных или неактивных карт в зависимости от флага
if g == "ark": if g == "ark":
if m == "all": if m == "all":
list_config=list_config list_config=list_config
@ -919,7 +920,6 @@ dir_unit = f"{home_dir}/.config/systemd/user/"
dir_logs = f"{dir_config}logs/" dir_logs = f"{dir_config}logs/"
dir_server_ark = f"{dir_server}ARK/" dir_server_ark = f"{dir_server}ARK/"
dir_server_exec = f"{dir_server_ark}ShooterGame/Binaries/Linux/"
dir_workshop_ark = f"{home_dir}/.local/share/Steam/steamapps/workshop" dir_workshop_ark = f"{home_dir}/.local/share/Steam/steamapps/workshop"
dir_shooter = "ShooterGame" dir_shooter = "ShooterGame"
dir_mods_ark = f"{dir_server_ark}ShooterGame/Content/Mods" dir_mods_ark = f"{dir_server_ark}ShooterGame/Content/Mods"