Merge branch 'version-1' into develop

2022-07-12 11:06:19 +02:00
parent 28fcb2159c 65c30708b8
commit 411edbf0e7
17 changed files with 1074 additions and 298 deletions
--- a/lib/systemd/bridgehead-update@.service
+++ b/lib/systemd/bridgehead-update@.service
@ -1,3 +1,4 @@
+<<<<<<< HEAD
 [Unit]
 Description=Bridgehead (%i) Update Service

@ -8,3 +9,15 @@ ExecStart=/bin/bash -c "/srv/docker/bridgehead/update-bridgehead.sh %i"

 [Install]
 WantedBy=multi-user.target
+=======
+[Unit]
+Description=Bridgehead (%i) Update Service
+
+[Service]
+Type=oneshot
+User=bridgehead
+ExecStart=/srv/docker/bridgehead/bridgehead update %i
+
+[Install]
+WantedBy=multi-user.target
+>>>>>>> version-1