data-catalog-services/WebHosting_DMZ
0
0 Fork 0
forked from linux/WebHosting_DMZ
Code Pull Requests 1 Actions Activity
216 Commits 10 Branches 0 Tags
a7d2cd1b520c26ed7ed20744c22e760fd74955e7
Commit Graph
216 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
fpotier a7d2cd1b52 force hostanme resolution for scicat-rocrate services 
The traffic between prod and qa seems to be mixed up sometimes, from
what I read nginx only resolves hostnames at startup when using
literals.
This should force frequently resolving the hostnames
 2026-10-05 14:59:57 +02:00
ebner 870e46add4 Merge pull request 'Automatic version update' (#73) from bb_if_produktiv/WebHosting_DMZ:update-versions-219 into main 
Reviewed-on: linux/WebHosting_DMZ#73
 2026-10-05 08:10:21 +02:00
ebner f39fc17b5a Merge pull request 'update scicat-rocrate-qa' (#74) from data-catalog-services/WebHosting_DMZ:scicat-rocrate-qa into main 
Reviewed-on: linux/WebHosting_DMZ#74
 2026-10-05 08:10:09 +02:00
ebner 084d255a92 Merge pull request 'Update docker-compose.yaml' (#75) from felira_update_2 into main 
Reviewed-on: linux/WebHosting_DMZ#75
 2026-10-05 08:02:09 +02:00
ebner dc8e0a0584 Update docker-compose.yaml 2026-10-05 08:01:48 +02:00
fpotier 3539329e0e update scicat-rocrate-qa 2026-10-02 11:11:48 +02:00
Gitea Actions 50892b2728 automatic version update! 2026-10-02 07:32:49 +00:00
ebner 7f65bbb4ce Merge pull request 'update scicat-rocrate and scicat-rocrate-qa' (#72) from data-catalog-services/WebHosting_DMZ:scicat-rocrate into main 
Reviewed-on: linux/WebHosting_DMZ#72
 2026-10-01 16:38:18 +02:00
fpotier 8db6aa6a2e update scicat-rocrate and scicat-rocrate-qa 2026-10-01 13:34:50 +02:00
ebner 8c39e9455d Merge pull request 'increase felira version' (#71) from felira_update into main 
Reviewed-on: linux/WebHosting_DMZ#71
 2026-10-01 08:41:36 +02:00
ebner c16b2a4552 increase felira version 2026-10-01 08:27:57 +02:00
ebner 603a25efa8 Merge pull request 'Update CLIC to verified BrightPath 5c0cf00 image' (#70) from sacchi_r/WebHosting_DMZ:update-clic-brightpath-5c0cf00 into main 
Reviewed-on: linux/WebHosting_DMZ#70
 2026-09-30 15:30:19 +02:00
romainsacchi 5aeb1d326a deploy(clic): pin verified BrightPath release image 2026-09-30 15:29:33 +02:00
ebner 576f5fde1c Merge pull request 'update scicat-rocrate-qa' (#69) from data-catalog-services/WebHosting_DMZ:scicat-rocrate-qa into main 
Reviewed-on: linux/WebHosting_DMZ#69
 2026-09-30 15:28:14 +02:00
fpotier ec3d450f88 update scicat-rocrate-qa 2026-09-30 11:51:17 +02:00
ebner 7114d6617d Merge pull request 'Update versions' (#68) from bb_if_produktiv/WebHosting_DMZ:update-versions-213 into main 
Reviewed-on: linux/WebHosting_DMZ#68
 2026-09-30 11:04:44 +02:00
Gitea Actions 1d7d3d175d automatic version update! 2026-09-29 10:52:46 +00:00
ebner 707b0cdd97 Merge pull request 'api urls' (#67) from pombas_n/WebHosting_DMZ:apifix into main 
Reviewed-on: linux/WebHosting_DMZ#67
 2026-09-29 08:22:58 +02:00
ebner a86eb1bcbb Merge pull request 'Update versions' (#66) from bb_if_produktiv/WebHosting_DMZ:update-versions-211 into main 
Reviewed-on: linux/WebHosting_DMZ#66
 2026-09-29 08:22:49 +02:00
pombas_n 0bb55a12fc api urls 
pocket app soll direkt auf die API zugreifen, anstatt über eine spezielle nginx config
 2026-09-28 16:38:40 +02:00
Gitea Actions 3990e7b444 automatic version update! 2026-09-28 14:37:55 +00:00
ebner 36f915c0e3 Merge pull request 'Update conf.d/pocketapp.conf' (#65) from pombas_n/WebHosting_DMZ:pombas_n-patch-2 into main 
Reviewed-on: linux/WebHosting_DMZ#65
 2026-09-28 14:40:02 +02:00
pombas_n 1556766bc1 Update conf.d/pocketapp.conf 2026-09-28 14:29:03 +02:00
ebner 9997f49ae3 Merge pull request 'added phoneboot api' (#64) from pombas_n/WebHosting_DMZ:pombas_n-patch-1 into main 
Reviewed-on: linux/WebHosting_DMZ#64
 2026-09-28 14:21:21 +02:00
pombas_n dd9e5bb705 added api 2026-09-28 14:19:53 +02:00
ebner 7eb42831e3 Merge pull request 'Update versions' (#63) from bb_if_produktiv/WebHosting_DMZ:update-versions-210 into main 
Reviewed-on: linux/WebHosting_DMZ#63
 2026-09-28 14:00:09 +02:00
Gitea Actions 68f3dddfed automatic version update! 2026-09-28 11:49:59 +00:00
ebner 63b2707dab Merge pull request 'revert clic changes' (#62) from revert_clic into main 
Reviewed-on: linux/WebHosting_DMZ#62
 2026-09-28 13:18:27 +02:00
ebner 7a973465bc revert clic changes 2026-09-28 13:17:21 +02:00
ebner d82308e45f Merge pull request 'Update CLIC image: Brightway exports, impact scoring and workflow fixes' (#60) from sacchi_r/WebHosting_DMZ:update/clic-brightway-da80c3ea10cb into main 
Reviewed-on: linux/WebHosting_DMZ#60
 2026-09-28 13:04:05 +02:00
ebner 72e6d568be Merge pull request 'update felira version to 3.1.60' (#61) from felira_3.1.60 into main 
Reviewed-on: linux/WebHosting_DMZ#61
 2026-09-28 13:02:47 +02:00
ebner f2de798123 update felira version to 3.1.60 2026-09-28 13:02:07 +02:00
romainsacchi 45d05f1826 Update CLIC image with Brightway export and workflow fixes 2026-09-28 12:47:07 +02:00
ebner eb51977ab0 Merge pull request 'Update versions' (#59) from bb_if_produktiv/WebHosting_DMZ:update-versions-204 into main 
Reviewed-on: linux/WebHosting_DMZ#59
 2026-09-28 11:02:03 +02:00
Gitea Actions 7f534732e8 Update psitrail and pocketapp versions 2026-09-28 08:51:30 +00:00
ebner 1acbc38b73 Merge pull request 'Update versions' (#58) from bb_if_produktiv/WebHosting_DMZ:update-versions-201 into main 
Reviewed-on: linux/WebHosting_DMZ#58
 2026-09-28 10:21:47 +02:00
Gitea Actions 6ed3718df2 Update psitrail and pocketapp versions 2026-09-28 07:38:02 +00:00
buchel_k fbf482521d Merge pull request 'Tier-ranking update' (#57) from huang_h/WebHosting_DMZ:main into main 
Reviewed-on: linux/WebHosting_DMZ#57
Reviewed-by: buchel_k <konrad.bucheli@psi.ch>
 2026-09-25 14:32:44 +02:00
River 4489f7e354 Tier-ranking update 2026-09-25 14:24:05 +02:00
huang_h 95d22541b9 merge upstream 2026-09-25 14:21:30 +02:00
buchel_k c2f784fac3 Merge pull request 'roll out Leaps Ultrafast 3.1.51' (#56) from leaps_ultrafast_3.1.51 into main 
Reviewed-on: linux/WebHosting_DMZ#56
 2026-09-25 14:13:35 +02:00
buchel_k 485ef0b248 roll out Leaps Ultrafast 3.1.51, as requested by frithjof.nolting@psi.ch 2026-09-25 14:12:19 +02:00
bruhn_b b8a0d3ad61 Merge pull request 'bump scicat-rocrate-qa' (#55) from data-catalog-services/WebHosting_DMZ:scicat-rocrate-qa into main 
Reviewed-on: linux/WebHosting_DMZ#55
 2026-09-24 17:21:04 +02:00
fpotier 82c7ff01f0 bump scicat-rocrate-qa 2026-09-24 15:31:02 +02:00
bruhn_b 5261e6c407 Merge pull request 'Fix CLIC 502: restore startup script permissions (a3b90f8)' (#54) from sacchi_r/WebHosting_DMZ:fix-clic-startup-permissions into main 
Reviewed-on: linux/WebHosting_DMZ#54
 2026-09-22 16:00:55 +02:00
romainsacchi 51fb3a5de3 Fix CLIC 502 by deploying startup permission repair a3b90f8 2026-09-22 15:46:00 +02:00
bruhn_b 2fc5f7c8d5 Merge pull request 'CLIC: release reviewed UVEK exports (1a5d217)' (#53) from sacchi_r/WebHosting_DMZ:update-clic-exports-1a5d217 into main 
Reviewed-on: linux/WebHosting_DMZ#53
 2026-09-22 15:33:24 +02:00
romainsacchi 1f58c8d289 Update CLIC services to reviewed export release 1a5d217 2026-09-22 13:39:07 +02:00
bruhn_b a30ff7bf25 Merge pull request 'CLIC: automatic Zenodo restore and container-managed nightly backups' (#52) from sacchi_r/WebHosting_DMZ:update-clic-archive-5bbfcaf into main 
Reviewed-on: linux/WebHosting_DMZ#52
 2026-09-21 13:35:39 +02:00
romainsacchi cedd87127c Remove CLIC archive handoff document from PR 2026-09-21 13:35:24 +02:00