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

24
lib/systemd/bridgehead@.service
View File

@ -1,30 +1,12 @@
<<<<<<< HEAD
[Unit]
Description=Bridgehead (%i) Service
[Service]
User=bridgehead
Restart=always
RestartSec=30
WorkingDirectory=/srv/docker/bridgehead/
ExecStartPre=/bin/bash -c '`which docker-compose` -f %i/docker-compose.yml --env-file site-config/%i.env down'
ExecStart=/bin/bash -c '`which docker-compose` -f %i/docker-compose.yml --env-file site-config/%i.env up'
ExecStop=/bin/bash -c '`which docker-compose` -f %i/docker-compose.yml --env-file site-config/%i.env down'
ExecStart=/srv/docker/bridgehead/bridgehead start %i
ExecStop=/srv/docker/bridgehead/bridgehead stop %i
[Install]
WantedBy=multi-user.target
=======
[Unit]
Description=Bridgehead (%i) Service
[Service]
User=bridgehead
Restart=always
RestartSec=30
ExecStart=/srv/docker/bridgehead/bridgehead start %i
ExecStop=/srv/docker/bridgehead/bridgehead stop %i
[Install]
WantedBy=multi-user.target
>>>>>>> version-1