Merge branch 'version-1' of https://github.com/samply/bridgehead into version-1

Conflicts:
	landing/index.html
	lib/generate.sh
	lib/setup-bridgehead-units.sh

lib/generate.sh

@@ -99,6 +99,14 @@ cat > ./landing/index.html <<EOL
         </thead>
         <tbody>
           ${LOCAL_SERVICES}
+          <tr>
+            <td>Bridgehead</td>
+            <td>Reverse Proxy <a href="https://e260-serv-05/dashboard/">Traefik</a></td>
+          </tr>
+          <tr>
+            <td>DKTK</td>
+            <td><a href="https://e260-serv-05/dktk-localdatamanagement/fhir/">Blaze</a></td>
+          </tr>
         </tbody>
       </table>
     </div>

lib/setup-bridgehead-units.sh

@@ -3,6 +3,7 @@
 
 source lib/functions.sh
 
+<<<<<<< HEAD
 exitIfNotRoot
 
 if [ $# -eq 0 ]; then
@@ -17,6 +18,8 @@ fi
 
 export project=$1
 
+=======
+>>>>>>> 290fe5459d7399ff23a2a8db067c1728858350d5
 if ! ./lib/prerequisites.sh; then
     log "Prerequisites failed, exiting"
     exit 1
@@ -40,4 +43,4 @@ if ! systemctl is-active --quiet bridgehead@"${project}"; then
     systemctl enable --now bridgehead-update@"${project}".timer
 fi
 
-echo -e "\nDone - now start your bridgehead by running\n\tsystemctl start bridgehead@${project}.service\nor by rebooting your machine."
+echo -e "\nDone - now start your bridgehead by running\n\tsystemctl start bridgehead@${project}.service\nor by rebooting your machine."

lib/systemd/bridgehead-update@.service

@@ -9,4 +9,4 @@ WorkingDirectory=/srv/docker/bridgehead/
 ExecStart=/srv/docker/bridgehead/update-bridgehead.sh %i
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target

lib/systemd/bridgehead@.service

@@ -13,4 +13,4 @@ RemainAfterExit=true
 ExecStop=/srv/docker/bridgehead/stop-bridgehead.sh %i
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target