verbis-admin/bridgehead
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflicts

Browse Source
This commit is contained in:
Patrick Skowronek
2022-07-19 14:18:48 +02:00
parent ef7b96372b
commit 8c982c939e
5 changed files with 5 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/systemd/bridgehead-update@.service
View File

@ -1,23 +1,10 @@
<<<<<<< HEAD
[Unit]
Description=Bridgehead (%i) Update Service
[Service]
Type=oneshot
WorkingDirectory=/srv/docker/bridgehead/
ExecStart=/bin/bash -c "/srv/docker/bridgehead/update-bridgehead.sh %i"
User=bridgehead
ExecStart=/srv/docker/bridgehead/bridgehead update %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