Fixed merge conflicts

lib/functions.sh

@@ -2,20 +2,11 @@
 
 exitIfNotRoot() {
   if [ "$EUID" -ne 0 ]; then
-<<<<<<< HEAD
-    echo "Please run as root"
-=======
     log "ERROR" "Please run as root"
->>>>>>> version-1
     exit 1
   fi
 }
 
-<<<<<<< HEAD
-log() {
-  echo "$(date +'%Y-%m-%d %T')" "$1:" "$2"
-}
-=======
 checkOwner(){
   COUNT=$(find $1 ! -user $2 |wc -l)
   if [ $COUNT -gt 0 ]; then
@@ -113,4 +104,3 @@ export PRODUCTION="false";
 if [ "$(git branch --show-current)" == "main" ]; then
 	export PRODUCTION="true";
 fi
->>>>>>> version-1

lib/prerequisites.sh

@@ -1,11 +1,5 @@
 #!/bin/bash
 
-<<<<<<< HEAD
-
-## Check if user is a su
-echo "Welcome to the starting a bridgehead. We will get your instance up and running in no time"
-echo "First we will check if all prerequisites are met ..."
-=======
 source lib/functions.sh
 
 if ! id "bridgehead" &>/dev/null; then
@@ -18,7 +12,6 @@ checkOwner /etc/bridgehead bridgehead || exit 1
 
 ## Check if user is a su
 log INFO "Checking if all prerequisites are met ..."
->>>>>>> version-1
 prerequisites="git docker docker-compose"
 for prerequisite in $prerequisites; do
   $prerequisite --version 2>&1
@@ -30,45 +23,6 @@ for prerequisite in $prerequisites; do
   # TODO: Check for specific version
 done
 
-<<<<<<< HEAD
-echo "Checking site.conf"
-
-#check if site.conf is created
-if [ ! -f site.conf ]; then
-  echo "Please create your specific site.conf file from the site.dev.conf"
-  exit
-fi
-
-#Load site specific variables
-source site.conf
-
-if [ -z "$site_name" ]; then
-  echo "Please set site_name"
-fi
-
-echo "Checking site-config module"
-
-## Download submodule
-if [ ! -d "site-config" ]; then
-  echo "Please set up the site-config folder. Instruction are in the readme."
-  exit
-else
-  echo "Site configuration is already loaded"
-fi
-
-#Check if a project is selected
-if [ -z "$project"  ]; then
-  echo "No project selected! Please add a Project in your local site.conf."
-  exit
-fi
-
-#check if project env is present
-if [ -d "site-config/${project}.env" ]; then
-   echo "Please copy the tempalte from ${project} and put it in the site-config folder"
-fi
-
-echo "All prerequisites are met!"
-=======
 log INFO "Checking configuration ..."
 
 ## Download submodule
@@ -108,4 +62,3 @@ fi
 log INFO "Success - all prerequisites are met!"
 
 exit 0
->>>>>>> version-1

lib/systemd/bridgehead-update@.service

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

lib/systemd/bridgehead-update@.timer

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 [Unit]
 Description=Nightly Updates of Bridgehead (%i)
 
@@ -7,13 +6,3 @@ OnCalendar=*-*-* 03:00:00
 
 [Install]
 WantedBy=basic.target
-=======
-[Unit]
-Description=Nightly Updates of Bridgehead (%i)
-
-[Timer]
-OnCalendar=*-*-* 03:00:00
-
-[Install]
-WantedBy=basic.target
->>>>>>> version-1

lib/systemd/bridgehead@.service

@@ -1,30 +1,12 @@
-<<<<<<< HEAD
 [Unit]
 Description=Bridgehead (%i) Service
 
 [Service]
+User=bridgehead
 Restart=always
 RestartSec=30
-
+ExecStart=/srv/docker/bridgehead/bridgehead start %i
-WorkingDirectory=/srv/docker/bridgehead/
+ExecStop=/srv/docker/bridgehead/bridgehead stop %i
-
-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'
 
 [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