Commit Graph

121 Commits

Author SHA1 Message Date
Patrick Skowronek 0fce958f44 Updated readme 2022-05-05 15:03:06 +02:00
Patrick Skowronek d36ad9b4e3 Fix some more merge conflicts and some improvements 2022-05-05 14:17:57 +02:00
Patrick Skowronek f159ea8c3c Fixed some merge issues 2022-05-05 08:52:09 +02:00
root 0f1f2a2feb 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
2022-05-04 13:59:09 +02:00
root cfceb6d435 Cleanup of earlier merge 2022-05-04 13:50:33 +02:00
patrickskowronekdkfz 290fe5459d
Merge pull request #5 from samply/feature/bd-29
Feature/bd 29
2022-05-04 09:23:36 +02:00
root eb1f791f72 Merge branch 'version-1' into feature/bd-29
Conflicts:
	.gitignore
	README.md
	auth/dktk
	dktk-fed/docker-compose.yml
	landing/index.html
	lib/generate.sh
2022-05-04 09:22:39 +02:00
root 26c9fc0cff Moved all systemd untis to user bridgehead 2022-05-04 09:14:32 +02:00
root 03d1a83439 Removed hacky solution for central components 2022-05-03 15:50:38 +02:00
root 63b279617b Some more improvements for deployment 2022-05-03 09:16:19 +02:00
root 8c5e8ed833 Cleanup of old files
Moved c4 and dktk to ccp
2022-05-02 16:19:17 +02:00
patrickskowronekdkfz 7b299bb338
Merge pull request #3 from samply/feature/bd28
WIP: Feature/bd28
2022-04-28 09:10:55 +02:00
patrickskowronekdkfz f0f89f0a6b
Merge pull request #4 from samply/feature/bd24
WIP: Feature/bd24
2022-04-28 08:48:13 +02:00
Patrick Skowronek ddc2be5a1d Added NNGM compose file and add proxy vars to squid 2022-04-28 08:46:47 +02:00
Patrick Skowronek bb6118a66e Added NNGM project 2022-04-25 14:09:05 +02:00
root c929da51b3 Moved traefik dashboard to https and finished add user script 2022-04-12 08:44:10 +02:00
root fe0e1ce5d2 Made requested changes by TB 2022-04-11 15:28:11 +02:00
Patrick Skowronek 0e82dad091 Fixed proxy 2022-04-08 14:10:17 +02:00
Patrick Skowronek 900748b997 Added Squid Forward Proxy to Container 2022-04-08 08:43:42 +02:00
Patrick Skowronek a3f9dc64b7 Improved script for user 2022-04-04 14:02:03 +02:00
Patrick Skowronek 2bab2edf43 Added script for basic auth user 2022-03-28 15:34:57 +02:00
root 5bacdf02fb Added user bridgehead and made changes to run bridghead as this user 2022-03-25 10:41:15 +01:00
Patrick Skowronek 03f3f5ed94 Added new script for user bridgehead 2022-03-24 09:57:31 +01:00
root cd149277ef Sync with other branches 2022-03-23 11:54:23 +01:00
Patrick Skowronek 649a6d431a Merge branch 'refactor/preconfiguredImages' into version-1 2022-03-22 09:54:53 +01:00
Torben Brenner c53ae9173c Result from Meeting with Patrick 2022-03-01 17:24:53 +01:00
Torben Brenner 1f6ae18cfb docs: Updated Documentation about Configuration 2022-03-01 11:14:04 +01:00
Torben Brenner 17f57233c5 docs: Added Command for correcting C4 Database 2022-03-01 09:11:00 +01:00
Torben Brenner d02170f266 refactor: Removed container_name from all services 2022-03-01 08:51:42 +01:00
Torben Brenner 26b7e272bf refactor: renamed containers based on projects
Using the flag "-p bridgehead" with docker-compose to deploy all
bridgeheads on one system
2022-02-24 13:01:05 +01:00
Torben Brenner ee61ac3a03 refactor: Resorted environment and prepared special images for dktk 2022-02-24 10:48:09 +01:00
root 342f709901 First draft of dktk-fed and many other improvements 2022-02-16 09:42:53 +01:00
root 3244c3db29 Some more adjustments for dktk 2022-02-09 10:58:32 +01:00
Torben Brenner 87f345ca31 fix: Routing and ReverseProxy Settings for ID-Manager and Patientlist 2022-02-04 16:42:58 +01:00
Torben Brenner 24856376b9 fix: Corrected Address of Patientlist for ID-manager 2022-02-04 16:41:49 +01:00
Torben Brenner b2ae3d6458 fix: Insertion of ID-Generator Seeds 2022-02-04 16:40:50 +01:00
Torben Brenner 21fff6d74c fix: Reflected Changes in MagicPL Classpath to Config 2022-02-04 16:40:07 +01:00
root 31525571e1 Make C4 and Dktk work 2022-01-21 09:32:21 +01:00
root 7357870670 Manges changes and moving vars to the correct file 2022-01-19 10:52:25 +01:00
root 42d69cef4e Uniform dktk and c4 docker-compose files 2022-01-11 14:40:16 +01:00
root 1649d0b624 Uniform container_names 2022-01-11 13:52:20 +01:00
root 9f304d8fed remove switching directories to run docker-compose 2022-01-11 13:49:36 +01:00
root ce89382a32 Add which docker-compose to locate the correct path for systemd 2022-01-11 13:48:02 +01:00
Martin Lablans 43bdb23849 Rename "convenience" systemd units 2022-01-10 16:42:13 +01:00
Martin Lablans bcf1ba2ce1 Make systemctl disable more robust 2022-01-10 16:39:46 +01:00
Martin Lablans 31ab3ddef2 Fix uninstall-bridgehead.sh 2022-01-10 16:36:54 +01:00
Martin Lablans 0d7769fa7f Several fixes to shell scripts 2022-01-10 16:31:48 +01:00
Martin Lablans 0ecf38cabb Correct typo 2022-01-10 15:41:38 +01:00
Martin Lablans 99a8b5038e Make sure docker-compose is found 2022-01-10 15:41:07 +01:00
Martin Lablans 123ce65c82 Don't do sudo 2022-01-10 15:31:07 +01:00