From d36ad9b4e3cf5c90a26e3a5a580d6a35551f1c21 Mon Sep 17 00:00:00 2001 From: Patrick Skowronek Date: Thu, 5 May 2022 14:17:57 +0200 Subject: [PATCH] Fix some more merge conflicts and some improvements --- .gitignore | 2 +- README.md | 16 ----------- landing/index.html | 64 -------------------------------------------- lib/generate.sh | 3 +-- lib/prerequisites.sh | 12 +++++++++ start-bridgehead.sh | 2 ++ 6 files changed, 16 insertions(+), 83 deletions(-) delete mode 100644 landing/index.html diff --git a/.gitignore b/.gitignore index 2d9a08b..f289dbd 100644 --- a/.gitignore +++ b/.gitignore @@ -3,5 +3,5 @@ config/**/* !config/**/*.default docker-compose.override.yml site.conf -lading/* +landing/* certs/* diff --git a/README.md b/README.md index 4feaa10..9fced0e 100644 --- a/README.md +++ b/README.md @@ -147,26 +147,10 @@ sudo mkdir -p /srv/docker/; sudo git clone https://github.com/samply/bridgehead.git /srv/docker/bridgehead; ``` -<<<<<<< HEAD adduser --no-create-home --disabled-login --ingroup docker --gecos "" bridgehead useradd -M -g docker -N -s /sbin/nologin bridgehead chown bridghead /srv/docker/bridgehead/ -R -======= -The next step is to create a user for the bridgehead service - -``` shell -#!/bin/bash - -mkdir /srv/docker && cd /srv/docker - -adduser --no-create-home --disabled-login --ingroup docker --gecos "" bridgehead -useradd -M -g docker -N -s /sbin/nologin bridgehead - -chown 777 /srv/docker/bridgehead bridgehead -sudo chown bridgehead /srv/docker/bridgehead/ -``` ->>>>>>> version-1 Next, you need to configure a set of variables, specific for your site with not so high security concerns. You can visit the configuration template at [GitHub](https://github.com/samply/bridgehead-config). You can download the repositories contents and add them to the "bridgehead-config" directory. diff --git a/landing/index.html b/landing/index.html deleted file mode 100644 index c652299..0000000 --- a/landing/index.html +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - Bridgehead Overview - - - - - - - - - -