verbis-admin
/
bridgehead
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5 from samply/feature/bd-29 

Feature/bd 29
This commit is contained in:
patrickskowronekdkfz 2022-05-04 09:23:36 +02:00 committed by GitHub
parent 03d1a83439 eb1f791f72
commit 290fe5459d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 95 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
README.md
View File

@ -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:

3
configure-bridgehead.sh Normal file
View File

@ -0,0 +1,3 @@
#!/bin/bash
useradd --home-dir /srv/docker/bridgehead -g docker -N -u 317 -s /sbin/nologin

28
landing/index.html
View File

@ -14,7 +14,7 @@
</head> </head>
<body> <body class="d-flex flex-column min-vh-100">
<nav class="navbar navbar-light" style="background-color: #aad7f6;"> <nav class="navbar navbar-light" style="background-color: #aad7f6;">
<h2 class="pb-2 border-bottom">Bridgehead </h2> <h2 class="pb-2 border-bottom">Bridgehead </h2>
@ -33,23 +33,7 @@
<tbody> <tbody>
<tr> <tr>
<td>CCP-IT</td> <td>CCP-IT</td>
<td><a href="https://patientlist.ccp-it.dktk.dkfz.de">Zentrale Patientenliste</td> <td><a href="https://monitor.vmitro.de/icingaweb2/dashboard">Monitoring Service</td>
</tr>
<tr>
<td>CCP-IT</td>
<td><a href="https://decentralsearch.ccp-it.dktk.dkfz.de">Dezentrale Suche</td>
</tr>
<tr>
<td>CCP-IT</td>
<td><a href="https://centralsearch.ccp-it.dktk.dkfz.de">Zentrale Suche</td>
</tr>
<tr>
<td>CCP-IT</td>
<td><a href="https://deployment.ccp-it.dktk.dkfz.de">Deployment-Server</td>
</tr>
<tr>
<td>CCP-IT</td>
<td><a href="https://dktk-kne.kgu.de">Zentraler Kontrollnummernerzeuger</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@ -67,17 +51,13 @@
<tbody> <tbody>
<tr> <tr>
<td>Bridgehead</td> <td>Bridgehead</td>
<td>Reverse Proxy <a href="https://e260-serv-05/dashboard/">Traefik</a></td> <td>Reverse Proxy <a href="http://:8080/">Traefik</a></td>
</tr>
<tr>
<td>DKTK</td>
<td><a href="https://e260-serv-05/dktk-localdatamanagement/fhir/">Blaze</a></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
<footer class="footer mt-auto py-3"> <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" height="10%" width="30%"></a> DKTK 2022 <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> </footer>
</body> </body>

81
lib/generate.sh
View File

@ -1,5 +1,57 @@
#!/bin/bash #!/bin/bash
<<<<<<< HEAD
if [ ! -d ./landing ]
then
mkdir landing
fi
CENTRAL_SERVICES=" <tr>
<td>CCP-IT</td>
<td><a href=\"https://monitor.vmitro.de/icingaweb2/dashboard\">Monitoring Service</td>
</tr>"
LOCAL_SERVICES=" <tr>
<td>Bridgehead</td>
<td>Reverse Proxy <a href=\"http://${HOST}:8080/\">Traefik</a></td>
</tr>"
if [ "$project" = "dktk" ] || [ "$project" = "c4" ] || [ "$project" = "dktk-fed" ]
then
CENTRAL_SERVICES+=" <tr>
<td>CCP-IT</td>
<td><a href=\"https://patientlist.ccp-it.dktk.dkfz.de\">Zentrale Patientenliste</td>
</tr>
<tr>
<td>CCP-IT</td>
<td><a href=\"https://decentralsearch.ccp-it.dktk.dkfz.de\">Dezentrale Suche</td>
</tr>
<tr>
<td>CCP-IT</td>
<td><a href=\"https://centralsearch.ccp-it.dktk.dkfz.de\">Zentrale Suche</td>
</tr>
<tr>
<td>CCP-IT</td>
<td><a href=\"https://deployment.ccp-it.dktk.dkfz.de\">Deployment-Server</td>
</tr>
<tr>
<td>CCP-IT</td>
<td><a href=\"https://dktk-kne.kgu.de\">Zentraler Kontrollnummernerzeuger</td>
</tr>
"
fi
if [ "$project" = "dktk-fed" ]
then
LOCAL_SERVICES+=" <tr>
<td>DKTK</td>
<td><a href=\"https://${HOST}/dktk-localdatamanagement/fhir/\">Blaze</a></td>
</tr>
"
fi
=======
>>>>>>> version-1
cat > ./landing/index.html <<EOL cat > ./landing/index.html <<EOL
<html lang="en"> <html lang="en">
@ -17,7 +69,7 @@ cat > ./landing/index.html <<EOL
</head> </head>
<body> <body class="d-flex flex-column min-vh-100">
<nav class="navbar navbar-light" style="background-color: #aad7f6;"> <nav class="navbar navbar-light" style="background-color: #aad7f6;">
<h2 class="pb-2 border-bottom">Bridgehead ${site_name}</h2> <h2 class="pb-2 border-bottom">Bridgehead ${site_name}</h2>
@ -34,26 +86,7 @@ cat > ./landing/index.html <<EOL
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr> ${CENTRAL_SERVICES}
<td>CCP-IT</td>
<td><a href="https://patientlist.ccp-it.dktk.dkfz.de">Zentrale Patientenliste</td>
</tr>
<tr>
<td>CCP-IT</td>
<td><a href="https://decentralsearch.ccp-it.dktk.dkfz.de">Dezentrale Suche</td>
</tr>
<tr>
<td>CCP-IT</td>
<td><a href="https://centralsearch.ccp-it.dktk.dkfz.de">Zentrale Suche</td>
</tr>
<tr>
<td>CCP-IT</td>
<td><a href="https://deployment.ccp-it.dktk.dkfz.de">Deployment-Server</td>
</tr>
<tr>
<td>CCP-IT</td>
<td><a href="https://dktk-kne.kgu.de">Zentraler Kontrollnummernerzeuger</td>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>
@ -68,6 +101,9 @@ cat > ./landing/index.html <<EOL
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<<<<<<< HEAD
${LOCAL_SERVICES}
=======
<tr> <tr>
<td>Bridgehead</td> <td>Bridgehead</td>
<td>Reverse Proxy <a href="https://e260-serv-05/dashboard/">Traefik</a></td> <td>Reverse Proxy <a href="https://e260-serv-05/dashboard/">Traefik</a></td>
@ -76,11 +112,12 @@ cat > ./landing/index.html <<EOL
<td>DKTK</td> <td>DKTK</td>
<td><a href="https://e260-serv-05/dktk-localdatamanagement/fhir/">Blaze</a></td> <td><a href="https://e260-serv-05/dktk-localdatamanagement/fhir/">Blaze</a></td>
</tr> </tr>
>>>>>>> version-1
</tbody> </tbody>
</table> </table>
</div> </div>
<footer class="footer mt-auto py-3"> <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" height="10%" width="30%"></a> DKTK 2022 <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> </footer>
</body> </body>

2
lib/setup-bridgehead-units.sh
View File

@ -3,8 +3,6 @@
source lib/functions.sh source lib/functions.sh
exitIfNotRoot
if ! ./lib/prerequisites.sh; then if ! ./lib/prerequisites.sh; then
log "Prerequisites failed, exiting" log "Prerequisites failed, exiting"
exit 1 exit 1

4
lib/systemd/bridgehead-update@.service
View File

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

7
lib/systemd/bridgehead@.service
View File

@ -2,14 +2,15 @@
Description=Bridgehead (%i) Service Description=Bridgehead (%i) Service
[Service] [Service]
User=bridgehead
Restart=always Restart=always
RestartSec=30 RestartSec=30
WorkingDirectory=/srv/docker/bridgehead/ WorkingDirectory=/srv/docker/bridgehead/
ExecStartPre=/bin/bash -c '`which docker-compose` -f %i/docker-compose.yml --env-file site-config/%i.env down' ExecStart=/srv/docker/bridgehead/start-bridgehead.sh %i
ExecStart=/bin/bash -c '`which docker-compose` -f %i/docker-compose.yml --env-file site-config/%i.env up' RemainAfterExit=true
ExecStop=/bin/bash -c '`which docker-compose` -f %i/docker-compose.yml --env-file site-config/%i.env down' ExecStop=/srv/docker/bridgehead/stop-bridgehead.sh %i
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target