YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Dirty hack to automatically find custom SSH port

Browse source
This commit is contained in:
Alexandre Aubin 2020-04-29 18:01:40 +02:00
parent c04d3c3806
commit b78d722785
1 changed files with 10 additions and 5 deletions

15
src/yunohost/service.py
View file

@ -24,6 +24,7 @@
Manage services Manage services
""" """
import os import os
import re
import time import time
import yaml import yaml
import subprocess import subprocess
@ -33,11 +34,12 @@ from datetime import datetime
from moulinette import m18n from moulinette import m18n
from yunohost.utils.error import YunohostError from yunohost.utils.error import YunohostError
from moulinette.utils import log, filesystem from moulinette.utils.log import getActionLogger
from moulinette.utils.filesystem import read_file
MOULINETTE_LOCK = "/var/run/moulinette_yunohost.lock" MOULINETTE_LOCK = "/var/run/moulinette_yunohost.lock"
logger = log.getActionLogger('yunohost.service') logger = getActionLogger('yunohost.service')
def service_add(name, description=None, log=None, log_type="file", test_status=None, test_conf=None, needs_exposed_ports=None, need_lock=False, status=None): def service_add(name, description=None, log=None, log_type="file", test_status=None, test_conf=None, needs_exposed_ports=None, need_lock=False, status=None):
@ -552,7 +554,7 @@ def _give_lock(action, service, p):
def _remove_lock(PID_to_remove): def _remove_lock(PID_to_remove):
# FIXME ironically not concurrency safe because it's not atomic... # FIXME ironically not concurrency safe because it's not atomic...
PIDs = filesystem.read_file(MOULINETTE_LOCK).split("\n") PIDs = read_file(MOULINETTE_LOCK).split("\n")
PIDs_to_keep = [PID for PID in PIDs if int(PID) != PID_to_remove] PIDs_to_keep = [PID for PID in PIDs if int(PID) != PID_to_remove]
filesystem.write_to_file(MOULINETTE_LOCK, '\n'.join(PIDs_to_keep)) filesystem.write_to_file(MOULINETTE_LOCK, '\n'.join(PIDs_to_keep))
@ -574,6 +576,11 @@ def _get_services():
if value is None: if value is None:
del services[key] del services[key]
# Dirty hack to automatically find custom SSH port ...
ssh_port_line = re.findall(r"\bPort *([0-9]{2,5})\b", read_file("/etc/ssh/sshd_config"))
if len(ssh_port_line) == 1:
services["ssh"]["needs_exposed_ports"] = [int(ssh_port_line[0])]
# Stupid hack for postgresql which ain't an official service ... Can't # Stupid hack for postgresql which ain't an official service ... Can't
# really inject that info otherwise. Real service we want to check for # really inject that info otherwise. Real service we want to check for
# status and log is in fact postgresql@x.y-main (x.y being the version) # status and log is in fact postgresql@x.y-main (x.y being the version)
@ -654,8 +661,6 @@ def _find_previous_log_file(file):
""" """
Find the previous log file Find the previous log file
""" """
import re
splitext = os.path.splitext(file) splitext = os.path.splitext(file)
if splitext[1] == '.gz': if splitext[1] == '.gz':
file = splitext[0] file = splitext[0]