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
This commit is contained in:
root
commit
0f1f2a2feb
|
|
@ -4,4 +4,4 @@ config/**/*
|
||||||
docker-compose.override.yml
|
docker-compose.override.yml
|
||||||
site.conf
|
site.conf
|
||||||
lading/*
|
lading/*
|
||||||
certs/*
|
certs/*
|
||||||
|
|
|
||||||
17
README.md
17
README.md
|
|
@ -147,6 +147,12 @@ sudo mkdir -p /srv/docker/;
|
||||||
sudo git clone https://github.com/samply/bridgehead.git /srv/docker/bridgehead;
|
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
|
The next step is to create a user for the bridgehead service
|
||||||
|
|
||||||
``` shell
|
``` shell
|
||||||
|
|
@ -160,6 +166,7 @@ useradd -M -g docker -N -s /sbin/nologin bridgehead
|
||||||
chown 777 /srv/docker/bridgehead bridgehead
|
chown 777 /srv/docker/bridgehead bridgehead
|
||||||
sudo chown bridgehead /srv/docker/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.
|
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:
|
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
|
### DKTK/C4
|
||||||
|
|
||||||
You can create the site specific configuration with:
|
You can create the site specific configuration with:
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,3 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
useradd --home-dir /srv/docker/bridgehead -g docker -N -u 317 -s /sbin/nologin
|
||||||
|
|
@ -0,0 +1,64 @@
|
||||||
|
<html lang="en">
|
||||||
|
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<meta name="description" content="">
|
||||||
|
<title>Bridgehead Overview</title>
|
||||||
|
<!-- Bootstrap core CSS -->
|
||||||
|
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet"
|
||||||
|
integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
|
||||||
|
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js"
|
||||||
|
integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p"
|
||||||
|
crossorigin="anonymous"></script>
|
||||||
|
|
||||||
|
</head>
|
||||||
|
|
||||||
|
<body class="d-flex flex-column min-vh-100">
|
||||||
|
|
||||||
|
<nav class="navbar navbar-light" style="background-color: #aad7f6;">
|
||||||
|
<h2 class="pb-2 border-bottom">Bridgehead </h2>
|
||||||
|
</nav>
|
||||||
|
<div class="container px-4 py-5" id="featured-3">
|
||||||
|
<div>
|
||||||
|
<h2>Components</h2>
|
||||||
|
<h3>Central</h3>
|
||||||
|
<table class="table">
|
||||||
|
<thead class="thead-dark">
|
||||||
|
<tr>
|
||||||
|
<th style="width: 50%">Group</th>
|
||||||
|
<th style="width: 50%">Service</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td>CCP-IT</td>
|
||||||
|
<td><a href="https://monitor.vmitro.de/icingaweb2/dashboard">Monitoring Service</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<h3>Local</h3>
|
||||||
|
<table class="table">
|
||||||
|
<thead class="thead-dark">
|
||||||
|
<tr>
|
||||||
|
<th style="width: 50%">Project</th>
|
||||||
|
<th style="width: 50%">Services</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td>Bridgehead</td>
|
||||||
|
<td>Reverse Proxy <a href="http://:8080/">Traefik</a></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
<footer class="footer mt-auto py-3">
|
||||||
|
<a href="https://dktk.dkfz.de/"><img src="https://www.oncoray.de/fileadmin/files/bilder_gruppen/DKTK/Logo_DKTK_neu_2016.jpg" style="max-width: 30%; height: auto;"></a> DKTK 2022<span style="float: right;"><a href="https://github.com/samply/bridgehead"><button type="button" class="btn btn-primary">Documentaion</button></a></span>
|
||||||
|
</footer>
|
||||||
|
</body>
|
||||||
|
|
||||||
|
</html>
|
||||||
|
|
@ -99,6 +99,14 @@ cat > ./landing/index.html <<EOL
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
${LOCAL_SERVICES}
|
${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>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@
|
||||||
|
|
||||||
source lib/functions.sh
|
source lib/functions.sh
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
exitIfNotRoot
|
exitIfNotRoot
|
||||||
|
|
||||||
if [ $# -eq 0 ]; then
|
if [ $# -eq 0 ]; then
|
||||||
|
|
@ -17,6 +18,8 @@ fi
|
||||||
|
|
||||||
export project=$1
|
export project=$1
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> 290fe5459d7399ff23a2a8db067c1728858350d5
|
||||||
if ! ./lib/prerequisites.sh; then
|
if ! ./lib/prerequisites.sh; then
|
||||||
log "Prerequisites failed, exiting"
|
log "Prerequisites failed, exiting"
|
||||||
exit 1
|
exit 1
|
||||||
|
|
@ -40,4 +43,4 @@ if ! systemctl is-active --quiet bridgehead@"${project}"; then
|
||||||
systemctl enable --now bridgehead-update@"${project}".timer
|
systemctl enable --now bridgehead-update@"${project}".timer
|
||||||
fi
|
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."
|
||||||
|
|
|
||||||
|
|
@ -9,4 +9,4 @@ WorkingDirectory=/srv/docker/bridgehead/
|
||||||
ExecStart=/srv/docker/bridgehead/update-bridgehead.sh %i
|
ExecStart=/srv/docker/bridgehead/update-bridgehead.sh %i
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
||||||
|
|
|
||||||
|
|
@ -13,4 +13,4 @@ RemainAfterExit=true
|
||||||
ExecStop=/srv/docker/bridgehead/stop-bridgehead.sh %i
|
ExecStop=/srv/docker/bridgehead/stop-bridgehead.sh %i
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue