cqrenet/relay
6
0
Fork 0
mirror of https://github.com/chatmail/relay.git synced 2026-10-25 15:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: reset journald.conf back to packaged version

Browse Source
This commit is contained in:
missytake
2026-10-25 13:33:19 +01:00
parent c155e699d5
commit 71b6bf0db1
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmdeploy/src/cmdeploy/deployers.py
+12 -5
View File
@@ -39,6 +39,9 @@ from .selfsigned.deployer import SelfSignedTlsDeployer
from .www import build_webpages, find_merge_conflict, get_paths from .www import build_webpages, find_merge_conflict, get_paths
OLD_JOURNALD_SHA256 = "107c678516c972d5293a67386458fd4785d467cfa2f2b7174185e9a74e034be5"
class Port(FactBase): class Port(FactBase):
""" """
Returns the process occupying a port. Returns the process occupying a port.
@@ -354,11 +357,15 @@ class IrohDeployer(Deployer):
class JournaldDeployer(Deployer): class JournaldDeployer(Deployer):
def configure(self): def configure(self):
overwrite_path = "/etc/systemd/journald.conf.d/90-volatile-logging.conf" self.put_file("90-volatile-logging.conf", "/etc/systemd/journald.conf.d/90-volatile-logging.conf")
journald_conf = "/etc/systemd/journald.conf" if host.get_fact(Sha256File, "/etc/systemd/journald.conf") == OLD_JOURNALD_SHA256:
self.put_file("90-volatile-logging.conf", overwrite_path) server.shell(
self.comment_out(journald_conf, "MaxRetentionSec", f"3d # set in {overwrite_path}") name="Restore Debian's journald.conf",
self.comment_out(journald_conf, "Storage", f"volatile # set in {overwrite_path}") commands=[
"rm /etc/systemd/journald.conf",
"DEBIAN_FRONTEND=noninteractive apt-get install -y --reinstall -o Dpkg::Options::=--force-confmiss systemd",
],
)
def activate(self): def activate(self):
self.ensure_service("systemd-journald.service") self.ensure_service("systemd-journald.service")