Commit Graph

230 Commits

Author SHA1 Message Date
Martin Lablans 10ec2b0e92
Merge pull request #45 from samply/develop
Don't warn about modified git dir twice
2022-12-05 08:40:12 +01:00
Martin Lablans eea0c665a2 Don't warn about modified git dir twice 2022-11-29 08:20:51 +00:00
Martin Lablans 5593ae38bb Retry git fetch/pull to make it more resilient to e.g. network outages 2022-11-29 08:10:21 +00:00
Patrick Skowronek 31f4ec9a1d Removed feature branch in install script 2022-11-23 13:37:25 +01:00
Martin Lablans 22d17f264f
Merge pull request #39 from samply/feature/fullyGuidedInstallation
Facilitate installation by scripting some installation steps
2022-11-21 18:27:36 +01:00
Martin Lablans d12f9c44dc
Migrate monitoring to self-hosted instance 2022-11-21 18:06:30 +01:00
Torben Brenner b175c55f5c Shorten installation by including some installation steps into a shell script 2022-11-18 18:09:43 +01:00
Martin Lablans 865870ea91 Until all BBMRI-ERIC bridgeheads are onboarded with git, don't consider missing git info an error 2022-11-04 17:24:23 +01:00
Martin Lablans b28fb2881c Bugfix 2022-11-04 17:20:17 +01:00
Martin Lablans 895ee37296 Report git commits in user agent to monitoring 2022-11-04 17:18:09 +01:00
Martin Lablans c31de507a6
Merge branch 'feature/samplyBeam' into log_git_errors 2022-11-04 16:23:49 +01:00
Martin Lablans 3234a81aa2 Report current git commits 2022-11-04 16:18:30 +01:00
Martin Lablans ceda942731 Remove errors in old git versions 2022-11-04 16:12:24 +01:00
Martin Lablans 8c18426d28 Move warning up 2022-11-04 16:12:08 +01:00
Torben Brenner ebc1b87dc2 feature: Added warning for modified working directories 2022-11-04 16:02:46 +01:00
Martin Lablans 9b3acb4899 Report git errors 2022-11-04 15:29:00 +01:00
Martin Lablans 6b2168ff11 Allow to read hostname from config file 2022-11-04 13:16:57 +01:00
Martin Lablans 1b0fd61863 Make local passwords longer 2022-11-03 18:15:45 +01:00
Martin Lablans 62b8cabb31 Fix getting LDM_LOGIN 2022-11-03 18:14:11 +01:00
Martin Lablans 3ead08fae1 Add export 2022-11-03 17:38:46 +01:00
Martin Lablans 729d4e2c1e Check against LDM_PASSWORD 2022-11-03 17:29:52 +01:00
Martin Lablans a9864a928c Remove unnecessary docker run 2022-11-03 17:26:29 +01:00
Martin Lablans 6394e1fa82 Check for LDM_PASSWORD 2022-11-03 17:23:25 +01:00
Martin Lablans 038d8d69f6 Make LDM password nicer 2022-11-03 17:19:15 +01:00
p.delpy@dkfz-heidelberg.de 7ea5e928fc Removed add_bc_user.sh 2022-11-03 11:34:51 +01:00
Torben Brenner ce386f5a2a fix: Moved LDM Password to /etc/bridgehead 2022-11-03 09:14:44 +01:00
Torben Brenner 0e10205f1a fix: LDM Password is now generated at Installation 2022-11-03 09:13:32 +01:00
Martin Lablans 5e31da5139 Unfortunately, we cannot support docker snap installations, cf. https://askubuntu.com/questions/1374480/docker-compose-installed-with-snap-gives-error-on-yml-file
This reverts commit 292d71b6c2.
2022-10-28 15:25:06 +02:00
Martin Lablans 292d71b6c2 Support docker installation via snap, e.g. Ubuntu 22.04 2022-10-28 15:14:34 +02:00
Martin Lablans 853e1d9283
Make compose check not fail 2022-10-28 14:26:57 +02:00
Martin Lablans 79fc157ad4
Merge pull request #29 from samply/feature/robustcompose
Support docker compose as well as docker-compose
2022-10-28 13:07:03 +02:00
Martin Lablans ef2965f72f Make traefik use certificates at /etc/bridgehead/traefik-tls 2022-10-28 11:37:49 +02:00
Martin Lablans 6293dc65f0 Fail in prereqs if compose does not exist 2022-10-28 10:17:14 +02:00
Martin Lablans 2aef5f29c3 Move to functions.sh 2022-10-28 10:12:21 +02:00
Martin Lablans 5755baaf00 Support docker compose as well as docker-compose 2022-10-28 10:06:43 +02:00
Martin Lablans 6a27b9a5ad
Issue a warning (but don't crash) on missing MONITOR_APIKEY 2022-10-27 11:58:24 +02:00
Martin Lablans 3351e696af Don't pull ubuntu image on every startup. Use server's full hostname. 2022-10-26 10:44:32 +02:00
Martin Lablans b18b98e792
Make bridgehead-update ignore commented out docker images 2022-10-26 10:10:31 +02:00
Martin Lablans 07c0c4534e Make this work for BBMRI-ERIC 2022-10-25 11:45:01 +02:00
Martin Lablans 2b78835872 Add housekeeping task (docker image cleanup) 2022-10-20 16:55:05 +02:00
Martin Lablans 17c6a2b0e0 Fix git update detection 2022-10-17 16:13:29 +02:00
Martin Lablans f72a185dbb Be more specific about what changed on an update 2022-10-17 16:07:25 +02:00
Martin Lablans a8a33291a7 Rename traefik certificate/key 2022-10-17 15:30:43 +02:00
Martin Lablans f8b9aed7f5 Cleaning 2022-10-17 15:09:18 +02:00
Martin Lablans e273e97d9c
Certificate enrollment (#24) 2022-10-17 14:38:34 +02:00
Martin Lablans 7b15e02bec Use HTTPS proxy (not http proxy) for git pull 2022-10-06 12:49:48 +02:00
Martin Lablans f7c4bf6ac5 Consider stopped docker containers for reports, updates 2022-10-06 12:49:31 +02:00
Martin Lablans 0f44934419 Clarified log message 2022-10-06 12:05:36 +02:00
Martin Lablans 2fb57980ee Format docker status table 2022-10-06 12:04:24 +02:00
Martin Lablans 8a62743894
Monitoring for bridgehead startup and update (#22) 2022-10-06 10:45:50 +02:00
Martin Lablans b41e5b2315 Fix permissions on startup. Requires re-install of systemd units. 2022-10-05 19:58:07 +02:00
Martin Lablans 091402eea0
Update prerequisites.sh 2022-09-30 17:42:53 +02:00
Martin Lablans f52012008d
Update prerequisites.sh 2022-09-30 17:36:07 +02:00
Martin Lablans 1d05137bb9
Use proxy in time check 2022-09-30 17:13:28 +02:00
Martin Lablans 7d13eace32 Check clock skew even smarter 2022-09-30 17:02:05 +02:00
Martin Lablans 054d71538d Check time sync in prereqs 2022-09-30 16:55:36 +02:00
Martin Lablans d89c08702c Update deployment 2022-09-30 15:35:37 +02:00
Martin Lablans 7692c4e889 Update install scripts and prereqs (sudo) 2022-09-30 15:25:09 +02:00
Torben Brenner 55f4f66328 fix: Now using correct Certificates for Traefik 2022-09-30 13:57:47 +02:00
Martin Lablans da6cf14600
Add missing newline in update-bridgehead.sh 2022-09-30 13:42:41 +02:00
Torben Brenner caef43ec59 fix: Ensured use of HTTP_PROXY_URL in update job 2022-09-30 11:49:18 +02:00
Torben Brenner f4f33b95fc fix: Added Traefik Certificate Specification 2022-09-26 10:52:21 +02:00
Patrick Skowronek 066ab45e9c WIP: Beam Pem Check 2022-09-08 10:21:14 +02:00
Patrick Skowronek 5c2c76e759 Added WIP spot and beam proxy 2022-09-07 11:09:53 +02:00
Patrick Skowronek 8c982c939e Fixed merge conflicts 2022-07-19 14:18:48 +02:00
Patrick Skowronek 411edbf0e7 Merge branch 'version-1' into develop 2022-07-12 11:06:19 +02:00
Martin Lablans 2c50d357a9 Disable debug output. 2022-05-31 14:03:07 +02:00
Martin Lablans 2168e6299d Variable renamed to GIT_PASSWORD 2022-05-31 14:02:09 +02:00
Martin Lablans 519f4785cb Make git update use new credential helper that fetches git creds from vault. 2022-05-31 13:56:44 +02:00
Martin Lablans 37d954e304 New function assertVarsNotEmpty() 2022-05-31 13:56:12 +02:00
Martin Lablans 57483e78d4 Move checkOwner() to functions.sh 2022-05-31 13:55:40 +02:00
Martin Lablans ff3d6fb4fe Bugfix in fetchVarsFromVaultByFile: Detect variables with values à la "<VAULT>" 2022-05-31 13:40:25 +02:00
Martin Lablans 9f76b0c739 Refactor fetchVarsFromVault 2022-05-31 09:37:31 +02:00
Torben Brenner 981ff50c2f feature: Set Production Flag based on main Branch 2022-05-23 11:21:16 +02:00
Torben Brenner 63529250c0 feature: Added Comparison Generation for Gitlab 2022-05-19 14:26:56 +02:00
Torben Brenner ebcb1e8e20 feature: Added Link to Gitdiff for Gitlab 2022-05-19 13:38:01 +02:00
Torben Brenner 54897057d9 refactor: Ensured Usage of Log Function
This should ensure a more consistent script output
2022-05-17 15:55:25 +02:00
Patrick Skowronek 1f3a29cdab Remove old config checks 2022-05-17 13:34:16 +02:00
patrickskowronekdkfz 4ba956e45f
Merge pull request #11 from samply/feature/checkOwner
Check directory ownership.
2022-05-17 10:51:50 +02:00
patrickskowronekdkfz 1e6ec2b7c7
Merge pull request #12 from samply/feature/logGitDiff
Added Link to Git Diff for Github Repositories to Bridgehead Update
2022-05-17 10:48:12 +02:00
Patrick Skowronek 8c93524230 Merge branch 'version-1' of https://github.com/samply/bridgehead into version-1 2022-05-17 09:37:45 +02:00
Patrick Skowronek ce10b41bbb Move all .env refs to .conf 2022-05-17 09:37:20 +02:00
Torben Brenner dfaa4b8b15 feature: Added Link to Git Diff to Update Logs 2022-05-16 11:44:21 +02:00
Martin Lablans e3e83dd886 Make sure both /etc/bridgehead and /srv/docker/bridgehead are owned by the correct user. 2022-05-16 09:46:03 +02:00
Torben Brenner d23e15d1d8 docs: Added note on PROJECTNAME Parameter to Usage 2022-05-16 09:25:15 +02:00
Patrick Skowronek c6865624e5 Removed ref to site.conf 2022-05-16 09:21:42 +02:00
Martin Lablans 8352965d66 Don't use TTY for systemd job. 2022-05-13 15:59:05 +02:00
Torben Brenner fbfd7cc428
Merge pull request #9 from samply/feature/fetchSecretsFromVault
Auto-fetch sensitive variables from vault.
2022-05-13 15:20:00 +02:00
Martin Lablans f510b1d0cb Use http proxy set in $http_proxy. 2022-05-13 14:19:52 +02:00
Martin Lablans 1692395ffc Support retrieving credentials for vault from /etc/bridgehead/vault.conf 2022-05-13 14:11:14 +02:00
Martin Lablans 4b5af787e5 Use correct image name. 2022-05-12 18:27:34 +02:00
Martin Lablans d428f08d8a Whenever a variable has the value <VAULT>, auto-fetch value from vault. 2022-05-12 18:24:31 +02:00
Martin Lablans 5ddca3d9f4 Make TLS certificate generation non-interactively, and make certificates valid for a longer time. 2022-05-12 18:21:31 +02:00
Martin Lablans 821eebe8c6 Ask for correct SITE_NAME variable in error message. 2022-05-12 18:20:43 +02:00
Patrick Skowronek 2b4ea24b59 Updated Readme and remove old script 2022-05-12 13:00:08 +02:00
Patrick Skowronek 1928713b9d Fixed naming
Update the git config repo
2022-05-11 10:30:18 +02:00
Patrick Skowronek 8da8a7933a Correct link to docker images 2022-05-11 09:05:23 +02:00
Patrick Skowronek 25cee2ff5b Merge branch 'version-1' into feature/landingpage-as-container 2022-05-10 14:00:58 +02:00
Martin Lablans 66120a4ae7 Fix for other projects, too. 2022-05-10 11:56:50 +02:00
Patrick Skowronek d092d28980 Merge branch 'version-1' into martinsFixes 2022-05-10 09:16:47 +02:00
Martin Lablans 334f82661b Housekeeping and script hardening in /srv/docker/bridgehead. Existing installations need to run bridgehead uninstall, bridgehead install. 2022-05-09 15:13:38 +02:00
Patrick Skowronek 7be87cc3ad Fixed prerequisites 2022-05-09 13:44:36 +02:00
Patrick Skowronek dc8b8b3339 Some fixes after review with Martin 2022-05-09 12:57:24 +02:00
Patrick Skowronek 445add6d30 Updated gbn docker-compose 2022-05-09 08:09:14 +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
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 63b279617b Some more improvements for deployment 2022-05-03 09:16:19 +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 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 649a6d431a Merge branch 'refactor/preconfiguredImages' into version-1 2022-03-22 09:54:53 +01:00
Patrick Skowronek fe412d7c81 Remove site specific config 2022-03-18 12:54:18 +01:00
Patrick Skowronek 3a9ed42327 Enforce https and some cleanup 2022-03-18 10:52:58 +01:00
Torben Brenner c53ae9173c Result from Meeting with Patrick 2022-03-01 17:24:53 +01:00
root c9709f719d Added if statements for specific Projects 2022-03-01 11:26:28 +01:00
root 8efc8069b8 Fixed missing hostname 2022-02-16 15:22:59 +01:00
root 6d14bf8edb Set shell script execution flag and fixed landing path 2022-02-16 12:44:46 +01:00
Patrick Skowronek d344afe203 dktk-fed 2022-02-16 09:59:53 +01:00
root 342f709901 First draft of dktk-fed and many other improvements 2022-02-16 09:42:53 +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 0ecf38cabb Correct typo 2022-01-10 15:41:38 +01:00
Martin Lablans 123ce65c82 Don't do sudo 2022-01-10 15:31:07 +01:00
Martin Lablans 44398c5088 Move prerequisites.sh to lib folder 2022-01-10 14:45:52 +01:00