diff --git a/.gitignore b/.gitignore index 7196e2b..2d9a08b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,4 @@ config/**/* docker-compose.override.yml site.conf lading/* -certs/* \ No newline at end of file +certs/* diff --git a/README.md b/README.md index 96ed3b1..fa0c6eb 100644 --- a/README.md +++ b/README.md @@ -147,6 +147,12 @@ 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 @@ -160,6 +166,7 @@ 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. @@ -189,6 +196,16 @@ sudo ./lib/setup-bridgehead-units.sh Finally, you need to configure your sites secrets. These are places as configuration for each bridgeheads system unit. Refer to the section for your specific project: +### For Any Project you need to set the proxy in Update too + +``` conf +[Service] +Environment=http_proxy= +Environment=https_proxy= +``` + + + ### DKTK/C4 You can create the site specific configuration with: diff --git a/configure-bridgehead.sh b/configure-bridgehead.sh new file mode 100644 index 0000000..e20dca9 --- /dev/null +++ b/configure-bridgehead.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +useradd --home-dir /srv/docker/bridgehead -g docker -N -u 317 -s /sbin/nologin \ No newline at end of file diff --git a/landing/index.html b/landing/index.html index 73d2113..c652299 100644 --- a/landing/index.html +++ b/landing/index.html @@ -14,7 +14,7 @@ - +