86 Commits
Author SHA1 Message Date
River 576450eb14 Merge branch 'main' of https://gitea.psi.ch/huang_h/WebHosting_DMZ 2026-08-03 16:49:12 +02:00
River 0ebd01f504 UP-MAVT update 2026-08-03 16:49:11 +02:00
bruhn_b 484ee182af Merge pull request 'Update scicat-rocrate deployment' (#21) from data-catalog-services/WebHosting_DMZ:update-scicat-rocrate into main
Reviewed-on: linux/WebHosting_DMZ#21
2026-07-30 13:02:36 +02:00
fpotier d0f591469e update scicat-rocrate 2026-07-29 16:03:47 +02:00
bruhn_b 9f6174cab5 Merge pull request 'Deploy Rhodo 1.2.0 images' (#20) from hidber_f/WebHosting_DMZ:rhodo-1.2.0 into main
Reviewed-on: linux/WebHosting_DMZ#20
2026-07-23 11:29:48 +02:00
flurinh fd1f3f7583 Deploy Rhodo 1.2.0 images 2026-07-23 10:15:01 +02:00
ebner 9282a905ff Merge pull request 'fix felira' (#19) from ebner-patch-2 into main
Reviewed-on: linux/WebHosting_DMZ#19
2026-07-20 09:02:17 +02:00
ebner c8295d6ab0 fix felira 2026-07-20 09:01:42 +02:00
bruhn_b b145fd7b7e Update docker-compose.yaml 2026-07-17 12:01:34 +02:00
bruhn_b c2e0ccd183 Update docker-compose.yaml 2026-07-17 10:07:16 +02:00
bruhn_b 864f810113 change mount points for rocrate qa
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-07-16 14:53:19 +02:00
ebner f5c726326a Merge pull request 'Update docker-compose.yaml' (#18) from ebner-patch-1 into main
Reviewed-on: linux/WebHosting_DMZ#18
2026-07-14 11:14:24 +02:00
ebner 09495fa0db Update docker-compose.yaml 2026-07-14 11:13:16 +02:00
bruhn_b 021c5ec54a Merge pull request 'Update MCDA-SRF' (#17) from huang_h/WebHosting_DMZ:main into main
Reviewed-on: linux/WebHosting_DMZ#17
2026-07-13 15:32:59 +02:00
River 826ac1ed47 Merge branch 'main' of https://gitea.psi.ch/huang_h/WebHosting_DMZ 2026-07-13 15:29:44 +02:00
River eadf3b6da5 Update MCDA-SRF 2026-07-13 15:29:43 +02:00
bruhn_b 1ae1cae663 upload limit for felira-web
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-07-13 13:39:18 +02:00
bruhn_b 4a3d6c4a9e add data dir for leaps
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-07-08 10:38:10 +02:00
bruhn_b 0caec46eb8 felira container name
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-07-07 12:14:13 +02:00
bruhn_b d62d5234e0 all names
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-07-02 16:16:54 +02:00
bruhn_b 63a48a50a0 the webserver is using some hardcoded values
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-07-02 16:16:01 +02:00
bruhn_b 71bb3fa482 Merge pull request 'MCDA-UP enhance debug log update' (#16) from huang_h/WebHosting_DMZ:main into main
Reviewed-on: linux/WebHosting_DMZ#16
2026-07-01 18:58:30 +02:00
River 969ecdcb8c MCDA-UP enhance debug log update 1 2026-07-01 17:17:50 +02:00
River edf50f947c MCDA-UP enhance debug log update 2026-07-01 16:47:47 +02:00
bruhn_bandgitadmin 0b5b1e2ec0 Merge pull request 'deploy leaps app for fritjof' (#14) from leaps_felira into main
Reviewed-on: linux/WebHosting_DMZ#14
2026-07-01 16:24:05 +02:00
bruhn_b 78ea71cf41 deploy leaps app for fritjof
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-07-01 16:22:44 +02:00
bruhn_b 0273021cf3 typo
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-07-01 12:22:59 +02:00
bruhn_b 6f024ad9a7 Merge pull request 'add scicat-rocrate QA' (#13) from data-catalog-services/WebHosting_DMZ:scicat-rocrate into main
Reviewed-on: linux/WebHosting_DMZ#13
Reviewed-by: bruhn_b <basil.bruhn@psi.ch>
2026-07-01 12:20:47 +02:00
fpotier ac6622d500 update certificate name 2026-07-01 11:51:19 +02:00
fpotier 24cb61de69 fix service name 2026-07-01 11:43:40 +02:00
fpotier c888f5fa86 mount nfs share 2026-07-01 11:42:11 +02:00
fpotier b9bcc9ae94 add scicat-rocrate QA 2026-06-26 12:41:41 +02:00
bruhn_b 44cdec3271 Merge pull request 'MCDA-UP update' (#12) from huang_h/WebHosting_DMZ:main into main
Reviewed-on: linux/WebHosting_DMZ#12
2026-06-23 10:31:34 +02:00
River 6021137395 MCDA-UP update 2026-06-11 14:08:04 +02:00
bruhn_b 0738ce0cf3 add nginx conf to INC0163729
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-05-22 15:14:55 +02:00
bruhn_b c04aa690e1 deploy INC0163729
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-05-22 15:12:17 +02:00
bruhn_b 18afb54d74 Merge pull request 'MCDA-UP update' (#10) from huang_h/WebHosting_DMZ:main into main
Reviewed-on: linux/WebHosting_DMZ#10
Reviewed-by: bruhn_b <basil.bruhn@psi.ch>
2026-05-18 11:50:41 +02:00
cx7388 edb91fb3d5 MCDA-UP update 2026-05-18 11:41:02 +02:00
bruhn_b ada9a1cffa Update software from river to 0.5.0 like in test
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-05-12 13:58:25 +02:00
bruhn_bandgitadmin 397ff56a24 Merge pull request 'deploying several MCDA apps' (#9) from mcda_apps into main
Reviewed-on: linux/WebHosting_DMZ#9
2026-04-30 12:44:34 +02:00
bruhn_b 53b4e80fce update nginx
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-04-30 12:44:23 +02:00
bruhn_b 9fe65b5ac9 deploying several MCDA apps
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-04-30 10:45:31 +02:00
bruhn_b 392d03eb28 add pepisco to production
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-03-19 09:37:35 +01:00
bruhn_b 37889e87c9 symlinks
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-02-24 10:41:49 +01:00
bruhn_b c7b41d7729 traversal and symlink
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-02-24 10:24:23 +01:00
bruhn_b 40c67b0902 make dokuwiki easy to update
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-02-24 10:19:37 +01:00
bruhn_bandgitadmin e2f25fbb30 Merge pull request 'dokuwiki moved over from tcpwiki-01' (#8) from tcpwiki into main
Reviewed-on: linux/WebHosting_DMZ#8
2026-02-10 11:31:37 +01:00
bruhn_b ff4c490c0a dokuwiki moved over from tcpwiki-01
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-02-10 11:27:42 +01:00
bruhn_b 5c40af0314 fix omny to omny.web
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-01-30 09:44:20 +01:00
bruhn_b c49600c429 omny web to external hosting
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2026-01-29 10:10:13 +01:00