diff --git a/bundles/oidentd/files/oidentd.service b/bundles/oidentd/files/oidentd.service new file mode 100644 index 0000000..06b9a6d --- /dev/null +++ b/bundles/oidentd/files/oidentd.service @@ -0,0 +1,12 @@ +[Unit] +Description=RFC 1413 compliant ident daemon +After=network.target + +[Service] +ExecStart=/usr/sbin/oidentd -i -u oident -g oident +ExecReload=/bin/kill -HUP $MAINPID +Restart=always +RestartSec=2 + +[Install] +WantedBy=multi-user.target diff --git a/bundles/oidentd/items.py b/bundles/oidentd/items.py index 2d1f412..723f9fe 100644 --- a/bundles/oidentd/items.py +++ b/bundles/oidentd/items.py @@ -5,6 +5,12 @@ files = { 'svc_systemd:oidentd:restart', }, }, + '/usr/local/lib/systemd/system/oidentd.service': { + 'triggers': { + 'action:systemd-reload', + 'svc_systemd:oidentd:restart', + }, + }, } svc_systemd = { @@ -12,6 +18,7 @@ svc_systemd = { 'needs': { 'pkg_apt:oidentd', 'file:/etc/oidentd.conf', + 'file:/usr/local/lib/systemd/system/oidentd.service', }, }, } diff --git a/bundles/systemd-timers/items.py b/bundles/systemd-timers/items.py index cbf4172..2d23c72 100644 --- a/bundles/systemd-timers/items.py +++ b/bundles/systemd-timers/items.py @@ -1,10 +1,4 @@ directories = { - '/usr/local/lib/systemd/system': { - 'purge': True, - 'triggers': { - 'action:systemd-reload', - }, - }, '/var/lib/systemd-timer-monitored': { 'mode': '0777', }, diff --git a/bundles/systemd/items.py b/bundles/systemd/items.py index 6c8f671..83b0906 100644 --- a/bundles/systemd/items.py +++ b/bundles/systemd/items.py @@ -39,6 +39,15 @@ files = { }, } +directories = { + '/usr/local/lib/systemd/system': { + 'purge': True, + 'triggers': { + 'action:systemd-reload', + }, + }, +} + svc_systemd = { 'systemd-journald': { 'needs': {