Commit Graph
423 Commits
Author SHA1 Message Date
flechsig ccf2ef856d merge upstream 2026-10-01 15:58:02 +02:00
flechsig 95468c99dc new image version + mounted icons 2026-10-01 15:55:28 +02:00
ebner d3a796d934 Merge pull request 'new image version' (#95) from flechsig/WebHosting:main into main
Reviewed-on: linux/WebHosting#95
2026-10-01 08:45:19 +02:00
flechsig d70c59ca86 new image version 2026-09-30 17:32:17 +02:00
bruhn_b 161b8c4a34 Merge pull request 'slsbl update' (#94) from flechsig/WebHosting:main into main
Reviewed-on: linux/WebHosting#94
2026-09-24 17:23:40 +02:00
flechsig 790c890664 mount a few more data dirs 2026-09-24 16:18:50 +02:00
flechsig 0f225780ae merge upstream 2026-09-24 16:14:15 +02:00
flechsig eb2c04b8c5 undo my last commit
Revert "mount more data dirs"

This reverts commit e8a065ce4f.
2026-09-24 16:12:40 +02:00
flechsig e8a065ce4f mount more data dirs 2026-09-24 16:04:59 +02:00
bruhn_b 71240df3e8 Update README.md 2026-09-18 19:05:06 +02:00
bruhn_b 70b8e5f0ca Update README.md 2026-09-18 19:04:52 +02:00
bruhn_b 51fff508c4 Merge pull request 'update readme and networks' (#92) from refactor/application-networks into main
Reviewed-on: linux/WebHosting#92
2026-09-18 19:04:01 +02:00
bruhn_b 2bcc1dfed8 update readme and networks
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-09-18 19:03:28 +02:00
bruhn_b 3fc29610a4 Merge pull request 'update compose to work with modules/stack' (#91) from refactor/compose-application-modules into main
Reviewed-on: linux/WebHosting#91
2026-09-18 18:53:18 +02:00
bruhn_b 075721cc1d update compose and README to not forget where i left
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-09-18 17:01:19 +02:00
bruhn_b 491022beac update compose to work with modules/stack
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-09-18 16:54:09 +02:00
bruhn_b 28af4588a2 Merge pull request 'health checks, validation and variable fix.' (#90) from fix/compose-config-validation into main
Reviewed-on: linux/WebHosting#90
2026-09-18 16:21:36 +02:00
bruhn_b 3d646f9bd5 health checks, validation and variable fix.
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-09-18 16:14:14 +02:00
bruhn_b 3046bec72f body size
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-09-15 12:40:14 +02:00
bruhn_b 326cd79289 Merge pull request 'slsbl' (#88) from flechsig/WebHosting:main into main
Reviewed-on: linux/WebHosting#88
2026-09-10 13:47:20 +02:00
flechsig 8e33ab2832 add slsbl project 2026-09-10 11:21:30 +02:00
flechsig 9b37490b1a merge upstream 2026-09-10 11:10:52 +02:00
bruhn_b 67e6df6ec7 update lib and class for prod
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-09-04 10:29:30 +02:00
bruhn_b d2e76d90b5 edit lib path for docrouter
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-09-04 10:07:23 +02:00
bruhn_b 6f7533a76b edit classpath
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-09-04 09:49:03 +02:00
bruhn_b b9cc92d210 access for lmx elog
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-09-01 08:43:03 +02:00
flechsig 47ffbf001b new image version 1.8 (#86)
Reviewed-on: linux/WebHosting#86
Reviewed-by: buchel_k <konrad.bucheli@psi.ch>
Co-authored-by: flechsig <uwe.flechsig@psi.ch>
2026-08-27 10:51:22 +02:00
flechsig 5e0b89c176 new image version 1.8 2026-08-26 15:16:55 +02:00
bruhn_b c870b8234c update nginx log format
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-08-25 15:15:34 +02:00
bruhn_b d79815c100 remove high energy physics apps from test since they are all in DMZ
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-08-24 18:33:24 +02:00
bruhn_b 000f35ae86 Merge pull request 'MCDA SRF update' (#81) from huang_h/WebHosting:main into main
Reviewed-on: linux/WebHosting#81
Reviewed-by: bruhn_b <basil.bruhn@psi.ch>
2026-08-24 16:45:39 +02:00
River 30185a583c Tiermaker email function update 2026-08-24 14:17:50 +02:00
huang_h c3fe1f479f merge upstream 2026-08-24 14:10:55 +02:00
altorf_aandAimo Altorfer 94d11e34ce add pikettlischte-beautifier for pikett.psi.ch (#85)
Co-authored-by: Aimo Altorfer <hansoberdorf41@gmail.com>
Reviewed-on: linux/WebHosting#85
Co-authored-by: altorf_a <aimo.altorfer@psi.ch>
2026-08-19 10:28:19 +02:00
bruhn_b 0c2d51b85b Merge pull request 'move pct from docker to docker-dmz' (#84) from pct into main
Reviewed-on: linux/WebHosting#84
2026-08-13 10:53:40 +02:00
bruhn_b 323139931c move pct from docker to docker-dmz
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-08-13 10:53:06 +02:00
bruhn_b e999517395 emergency network fix
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-08-13 10:22:42 +02:00
bruhn_b bf709c943a Merge pull request 'udpate tiermaker compose file' (#83) from tiermaker into main
Reviewed-on: linux/WebHosting#83
2026-08-13 10:21:09 +02:00
bruhn_b dd22a66142 update version number
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-08-13 10:19:24 +02:00
bruhn_b 5d22d4a405 udpate tiermaker compose file
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-08-13 10:11:54 +02:00
bruhn_b 0836ad83c2 Merge pull request 'scicat-rocrate-dev: config' (#82) from data-catalog-services/WebHosting:scicat-rocrate-dev into main
Reviewed-on: linux/WebHosting#82
2026-08-11 14:23:09 +02:00
fpotier 20221d30db scicat-rocrate-dev: config 2026-08-11 14:21:27 +02:00
bruhn_b d9a56f671b file name
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-08-10 13:51:58 +02:00
bruhn_b a4eee184f5 add tiermaker
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-08-10 13:48:54 +02:00
River b093aeec76 MCDA SRF update 2026-08-10 12:02:34 +02:00
bruhn_b 464a27d690 archive cost
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-08-05 18:55:05 +02:00
bruhn_b c988c6e9a7 remove alloy and archive cost
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-08-05 18:52:17 +02:00
bruhn_b b07e0afd66 enable production exporter
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-07-21 14:13:17 +02:00
bruhn_b d6bcfda530 banf fetcher in test
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-07-17 13:54:15 +02:00
ebner b5ded615fa Merge pull request 'Rework Apache vhost for SSL-terminating reverse proxy' (#79) from holler/WebHosting:fix/redirect_issue into main
Reviewed-on: linux/WebHosting#79
2026-07-16 09:44:05 +02:00