Merge pull request #117 from mariux64/update-systemd-services-to-use-…

…conditionhost Update systemd services to use `ConditionHost=`
mariux64 · Feb 25, 2020 · c59f488 · c59f488
2 parents 5750c19 + e497beb
commit c59f488
Show file tree

Hide file tree

Showing 7 changed files with 73 additions and 3 deletions.
diff --git a/install.sh b/install.sh
@@ -87,9 +87,14 @@ mkdir -p "$DESTDIR$udev_helperdir"
 
 install_exec make-automaps/make-automaps                 "$DESTDIR$usr_sbindir/make-automaps"
 install_data misc_systemd_units/automount.service        "$DESTDIR$systemdunitdir/automount.service"
+install_data misc_systemd_units/dhcrelay.service         "$DESTDIR$systemdunitdir/dhcrelay.service"
 install_data misc_systemd_units/enable_overcommit_memory.service "$DESTDIR$systemdunitdir/enable_overcommit_memory.service"
 install_data misc_systemd_units/gdm.service              "$DESTDIR$systemdunitdir/gdm.service"
+install_data misc_systemd_units/startup-tags.service     "$DESTDIR$systemdunitdir/startup-tags.service"
 install_data misc_systemd_units/unbound.service          "$DESTDIR$systemdunitdir/unbound.service"
+install_data misc_systemd_units/xaruba.service           "$DESTDIR$systemdunitdir/xaruba.service"
+install_data misc_systemd_units/yppasswd.service         "$DESTDIR$systemdunitdir/yppasswd.service"
+install_data misc_systemd_units/ypserv.service           "$DESTDIR$systemdunitdir/ypserv.service"
 install_exec mkmotd/mkmotd.pl                            "$DESTDIR$usr_sbindir/mkmotd.pl"
 install_data mkmotd/motd.service                         "$DESTDIR$systemdunitdir/motd.service"
 install_exec mxgrub/mxgrub                               "$DESTDIR$usr_sbindir/mxgrub"

diff --git a/misc_systemd_units/dhcrelay.service b/misc_systemd_units/dhcrelay.service
@@ -0,0 +1,18 @@
+[Unit]
+
+Description=DHCP relay
+Requires=network.target
+After=network.target
+
+ConditionHost=bka.molgen.mpg.de
+
+[Service]
+
+ExecStart=/usr/sbin/dhcrelay -4 -d dhcp.molgen.mpg.de
+Restart=always
+StandardOutput=syslog
+
+[Install]
+
+WantedBy=multi-user.target
+
diff --git a/misc_systemd_units/named.service b/misc_systemd_units/named.service
@@ -1,10 +1,8 @@
 [Unit]
 After=network.service gateway.service mxmount.service automount.service
 
-Wants=startup-hostname.service
-After=startup-hostname.service
 Before=mxstartup-mxvip.service
-ConditionPathExists=/node/startup-hostname/wtf
+ConditionHost=wtf.molgen.mpg.de
 
 [Service]
 Type=forking

diff --git a/misc_systemd_units/startup-tags.service b/misc_systemd_units/startup-tags.service
@@ -0,0 +1,7 @@
+[Unit]
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/sbin/hostconfig --populate-node
+
diff --git a/misc_systemd_units/xaruba.service b/misc_systemd_units/xaruba.service
@@ -0,0 +1,14 @@
+[Unit]
+After=network.service gateway.service mxmount.service
+Before=network.target
+
+ConditionHost=macheteinfach.molgen.mpg.de
+
+[Service]
+Type=oneshot
+RemainAfterExit=true
+ExecStart=/usr/sbin/ip-nat start 141.14.27.49 443 172.19.109.10 4343 20 net04
+ExecStop=/usr/sbin/ip-nat stop 141.14.27.49 443 172.19.109.10 4343 20 net04
+
+[Install]
+WantedBy=network.target
diff --git a/misc_systemd_units/yppasswd.service b/misc_systemd_units/yppasswd.service
@@ -0,0 +1,12 @@
+[Unit]
+After=network.service gateway.service mxmount.service automount.service
+
+ConditionHost=wtf.molgen.mpg.de
+
+[Service]
+Type=forking
+ExecStart=/package/nis/sbin/rpc.yppasswdd -D /package/nis/src -e chsh
+
+[Install]
+WantedBy=network.target
+
diff --git a/misc_systemd_units/ypserv.service b/misc_systemd_units/ypserv.service
@@ -0,0 +1,16 @@
+[Unit]
+After=network.service gateway.service mxmount.service automount.service
+Before=network.target
+
+ConditionHost=wtf.molgen.mpg.de
+
+[Service]
+Type=forking
+Restart=always
+ExecStartPre=-/sbin/ip addr add 141.14.31.96/20 dev net03
+ExecStart=/package/nis/sbin/ypserv
+ExecStopPost=-/sbin/ip addr del 141.14.31.96/20 dev net03
+
+[Install]
+WantedBy=network.target
+