pombas_n/WebHosting_DMZ
0
0
Fork 0
forked from linux/WebHosting_DMZ
Code Pull Requests Activity
157 Commits 12 Branches 0 Tags
b93a6a96139efbbb6359fc8a4bbb4eccca3523d4
Commit Graph
157 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
bruhn_b b93a6a9613 db name 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-09-17 13:18:57 +02:00
bruhn_b e651c810c9 update db name for felira 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-09-17 13:18:23 +02:00
bruhn_b c09f51f774 update felira web 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-09-17 11:30:41 +02:00
bruhn_b 49febaef19 tubulin decom 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-09-17 10:11:00 +02:00
bruhn_b f6204e9d85 Merge pull request 'Add pocketapp and psitrail' (#47) from pombas_n/WebHosting_DMZ:main into main 
Reviewed-on: linux/WebHosting_DMZ#47
 2026-09-17 10:09:22 +02:00
pombas_n f343d80133 Update conf.d/pocketapp.conf 2026-09-16 14:51:23 +02:00
pombas_n 499caabe8a Add conf.d/pocketapp.conf 2026-09-16 14:49:42 +02:00
pombas_n 4d47a6154e Add conf.d/psitrail.conf 2026-09-16 14:49:28 +02:00
pombas_n edd3bb328d Update docker-compose.yaml 2026-09-16 14:48:50 +02:00
bruhn_b f421394fcb undeploy tubulin 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-09-16 12:48:12 +02:00
huang_handRiver 6356ae4abc MCDA software update (#45) 
Co-authored-by: River <he.river.huang@gmail.com>
Reviewed-on: linux/WebHosting_DMZ#45
Co-authored-by: huang_h <river.huang@psi.ch>
 2026-09-16 10:59:02 +02:00
bruhn_b 496ba2fb50 update felira web 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-09-14 15:49:45 +02:00
bruhn_b 63ceec79a5 Merge pull request 'SRF software small update' (#43) from huang_h/WebHosting_DMZ:main into main 
Reviewed-on: linux/WebHosting_DMZ#43
 2026-09-14 15:48:06 +02:00
huang_h 2ec906d37b merge upstream 2026-09-14 09:47:31 +02:00
River 778bcb865c SRF software small update 2026-09-14 09:46:15 +02:00
buchel_k b6121d2313 Merge pull request 'SRF software bug fix' (#42) from huang_h/WebHosting_DMZ:main into main 
Reviewed-on: linux/WebHosting_DMZ#42
Reviewed-by: buchel_k <konrad.bucheli@psi.ch>
 2026-09-11 17:08:01 +02:00
River dbc0487c47 SRF software bug fix 2026-09-11 17:06:00 +02:00
bruhn_b f84b744cb7 add username to tubulindb 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-09-10 15:56:17 +02:00
bruhn_b 23d8cf8486 update tubulin env var 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-09-10 13:56:13 +02:00
bruhn_b f0bff549b5 resolve merge 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-09-10 11:04:31 +02:00
bruhn_b 93cbfd94e3 Merge pull request 'bump scicat-rocrate-qa' (#41) from data-catalog-services/WebHosting_DMZ:scicat-rocrate-qa into main 
Reviewed-on: linux/WebHosting_DMZ#41
 2026-09-10 10:11:32 +02:00
fpotier eddce140e3 bump scicat-rocrate-qa 2026-09-10 10:10:35 +02:00
agosti_j 99bbd877cb Replace certificate name to lx-docker-dmz-01.psi.ch 2026-09-10 08:37:02 +02:00
agosti_j 5abb92e153 Replace /opt mount point with /mount/webhosting_dmz mount 2026-09-10 08:23:47 +02:00
bruhn_b 0075abee3f Merge pull request 'Fix CLIC health check and silently restarting export workers' (#40) from sacchi_r/WebHosting_DMZ:fix-clic-health-workers into main 
Reviewed-on: linux/WebHosting_DMZ#40
 2026-09-09 12:38:01 +02:00
romainsacchi de895cc367 Fix CLIC health probe and worker startup commands 2026-09-09 12:12:28 +02:00
sacchi_r e5c4c8a890 Merge pull request 'Update CLIC image to 754f9f8' (#39) from sacchi_r/WebHosting_DMZ:clic-dmz-pr into main 
Reviewed-on: linux/WebHosting_DMZ#39
 2026-09-04 19:40:38 +02:00
romainsacchi 9b5074e524 Update CLIC image to 754f9f8 2026-09-04 19:28:21 +02:00
bruhn_b 52687285de Merge pull request 'Add CLIC stack to DMZ hosting' (#38) from sacchi_r/WebHosting_DMZ:clic-dmz-pr into main 
Reviewed-on: linux/WebHosting_DMZ#38
Reviewed-by: bruhn_b <basil.bruhn@psi.ch>
 2026-09-04 13:38:19 +02:00
romainsacchi 5bc9be6007 Use shared PSI registry for CLIC image 2026-09-04 13:18:35 +02:00
romainsacchi 079f24d99f Use DMZ write mount for CLIC data 2026-09-04 13:15:02 +02:00
romainsacchi 7676b00d4e Add CLIC stack to DMZ hosting 2026-09-04 12:47:50 +02:00
bruhn_b 82f199b8a9 Merge pull request 'Tier-ranking small bug fix' (#37) from huang_h/WebHosting_DMZ:main into main 
Reviewed-on: linux/WebHosting_DMZ#37
 2026-08-31 14:44:11 +02:00
River e43f44198e Tier-ranking bug fix 2026-08-31 14:41:19 +02:00
huang_h 0ea49eacaa merge upstream 2026-08-31 14:36:06 +02:00
bruhn_b 0df6f70059 Merge pull request 'scicat-rocrate prod deployment' (#36) from data-catalog-services/WebHosting_DMZ:scicat-rocrate into main 
Reviewed-on: linux/WebHosting_DMZ#36
 2026-08-31 09:50:47 +02:00
fpotier 2ece82de8a scicat-rocrate prod deployment 2026-08-31 09:44:40 +02:00
bruhn_b 2a7a1fe006 Update felira to 3.1.18 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-08-31 08:44:26 +02:00
huang_handRiver Huang 8e6e770e3e Tier-ranking tool REST fix (#35) 
Co-authored-by: River Huang <cx7388@gmail.com>
Reviewed-on: linux/WebHosting_DMZ#35
Reviewed-by: buchel_k <konrad.bucheli@psi.ch>
Co-authored-by: huang_h <river.huang@psi.ch>
 2026-08-28 09:05:42 +02:00
River Huang 3cef4016f5 Tier-ranking tool REST fix 2026-08-28 09:00:55 +02:00
bruhn_b e841048d1c update logging 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-08-25 15:29:51 +02:00
bruhn_b 7d3bcf15fe update tiermaker 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-08-25 11:23:29 +02:00
bruhn_b 353a5997f0 downgrade tiermaker 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-08-25 11:21:58 +02:00
bruhn_b 1999e6e116 Merge pull request 'Quick fix' (#34) from huang_h/WebHosting_DMZ:main into main 
Reviewed-on: linux/WebHosting_DMZ#34
 2026-08-24 18:16:53 +02:00
River 114abf24a5 Quick fix 2026-08-24 17:34:05 +02:00
bruhn_b 19238c7565 whoopsie 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-08-24 17:02:54 +02:00
bruhn_b 8d94274ba2 Merge pull request 'deploy tiermaker to DMZ' (#33) from tiermaker into main 
Reviewed-on: linux/WebHosting_DMZ#33
 2026-08-24 17:01:52 +02:00
bruhn_b 7bb9bfd645 update image 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-08-24 17:00:15 +02:00
bruhn_b 05af04a2a2 deploy tiermaker to DMZ 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2026-08-24 16:56:05 +02:00
bruhn_b ba77c1b8f2 Merge pull request 'bump scicat-rocrate-qa' (#32) from data-catalog-services/WebHosting_DMZ:scicat-rocrate-qa into main 
Reviewed-on: linux/WebHosting_DMZ#32
 2026-08-20 15:09:18 +02:00