data-catalog-services/WebHosting
1
0
Fork 0
forked from linux/WebHosting
Code Pull Requests Activity
193 Commits 5 Branches 0 Tags
8948a8026a4fe19670c8952f6896ba137945fd85
Commit Graph
193 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
bruhn_b 8948a8026a Merge pull request 'main' (#27) from flechsig/WebHosting:main into main 
Reviewed-on: linux/WebHosting#27
Reviewed-by: bruhn_b <basil.bruhn@psi.ch>
 2026-01-14 13:48:43 +01:00
flechsig 12193f2b64 merge upstream 2026-01-14 13:25:09 +01:00
flechsig dd0407dbb0 forward http cookie 2026-01-14 13:21:02 +01:00
ebner e2204c741e Merge pull request 'Add actris-test site to the internal hosting' (#26) from actris into main 
Reviewed-on: linux/WebHosting#26
 2026-01-13 15:27:14 +01:00
ebner 965882045c apparantely on the hosting server ther is a .env with secrets - so we should ignore this 2026-01-13 15:26:33 +01:00
ebner 9333c15cba retrofit a change that was done manually on the hosting server 2026-01-13 15:25:19 +01:00
ebner b453de1e32 new service actris-test.psi.ch 2026-01-13 15:16:29 +01:00
flechsig 183b9039cb add conf and logs 2026-01-08 15:41:28 +01:00
ritter_tbuchel_ktom.ritter
 		c06bc0086f chore(v4.0): update frontend and backend container (#25) 
Co-authored-by: tom.ritter <tom.ritter@students.fhnw.ch>
Reviewed-on: linux/WebHosting#25
Co-authored-by: ritter_t <tom.ritter@psi.ch>
Co-committed-by: ritter_t <tom.ritter@psi.ch>
 2026-01-07 11:53:26 +01:00
bruhn_b 3a44d6363b Merge pull request 'WIP main opticswiki image update' (#24) from flechsig/WebHosting:main into main 
Reviewed-on: linux/WebHosting#24
Reviewed-by: bruhn_b <basil.bruhn@psi.ch>
 2025-11-27 12:30:35 +01:00
flechsig 8265fd6c2f change comment 2025-11-27 09:40:30 +01:00
flechsig e8c78f21c0 merge upstream 2025-11-27 09:27:47 +01:00
flechsig b1467fcbce update comments, new image version 1.2 2025-11-27 08:56:09 +01:00
bruhn_b edf6e58074 rebase 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2025-11-25 16:55:37 +01:00
bruhn_bandgitadmin 7533192529 Merge pull request 'simple docker mount and sls2' (#23) from sls2 into main 
Reviewed-on: linux/WebHosting#23
 2025-11-25 16:23:07 +01:00
bruhn_b e0b97741de simple docker mount and sls2 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2025-11-25 16:22:49 +01:00
bruhn_b 0587cb20b4 srem only to NFS 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2025-11-25 15:50:52 +01:00
bruhn_b ee9fba0b90 data mountpoint 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2025-11-25 13:20:02 +01:00
bruhn_b dbcc7013c6 mount to /mount 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2025-11-25 11:43:05 +01:00
bruhn_b acd0bbfc99 no cgi in root folder 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2025-11-25 11:13:19 +01:00
bruhn_b 5a76038aee disable layout wrapping 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2025-11-25 11:07:43 +01:00
bruhn_b e0c259ede1 shtml handler for shtml parsing... 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2025-11-25 10:48:57 +01:00
bruhn_b 95b21ecb96 include for /static 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2025-11-25 10:44:34 +01:00
bruhn_b b1df7508de includes and shtml 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2025-11-25 10:34:55 +01:00
bruhn_b 42be4257d7 read only filesystem 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2025-11-25 10:26:45 +01:00
bruhn_b 9425a555fc mount point for srem data 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2025-11-25 10:24:45 +01:00
bruhn_bandgitadmin 39c840eec3 Merge pull request 'srem' (#22) from srem into main 
Reviewed-on: linux/WebHosting#22
 2025-11-25 09:58:10 +01:00
bruhn_b cc2dc31a84 srem data mount 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2025-11-25 09:57:42 +01:00
bruhn_b 64b4935631 srem 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2025-11-25 09:47:38 +01:00
bruhn_b 32309356db make directories writeable 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2025-11-24 10:52:33 +01:00
bruhn_b 1a464fe1b1 folder location 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2025-11-24 10:41:55 +01:00
bruhn_b 5287936bc4 http to vhost 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2025-11-24 10:38:27 +01:00
bruhn_b 374c5612ef correct vhost 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2025-11-24 10:37:28 +01:00
bruhn_b 8492280db2 nginx conf 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2025-11-24 10:36:12 +01:00
bruhn_b f2d6ca9c83 move fluid to apache 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2025-11-24 10:33:04 +01:00
bruhn_b b6fef42220 Merge pull request 'chore(v3.0.1): fixed missing db column' (#21) from it_strategy into main 
Reviewed-on: linux/WebHosting#21
 2025-11-14 14:23:53 +01:00
tom.ritter e5f7eb77b5 chore(v3.0.1): fixed missing db column 2025-11-14 14:20:07 +01:00
bruhn_b c60963e31b Merge pull request 'IT-Strategy-Dashboard v3.0' (#20) from it_strategy into main 
Reviewed-on: linux/WebHosting#20
Reviewed-by: bruhn_b <basil.bruhn@psi.ch>
 2025-11-13 10:40:48 +01:00
tom.ritter 92b0c38f80 Merge branch 'main' into it_strategy 
# Conflicts:
#	docker-compose.yaml
 2025-11-12 16:06:02 +01:00
tom.ritter 0d9012c6ef Merge remote-tracking branch 'origin/main' 2025-11-12 16:04:35 +01:00
tom.ritter 6d2b4b7087 chore(v3.0): updated frontend and backend container 2025-11-12 14:23:30 +01:00
bruhn_b 106d05bedb apache config error 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2025-11-11 15:21:11 +01:00
bruhn_b ecc9fc2fc1 different container for gfa status 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2025-11-11 15:14:42 +01:00
bruhn_b d9bc31d0b6 individual configs 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2025-11-11 14:55:46 +01:00
bruhn_b a543867ffd gfa-status-test 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2025-11-11 14:48:26 +01:00
bruhn_b 570cd243e2 finally 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2025-11-11 13:18:58 +01:00
bruhn_b 50b7cf64c5 apache 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2025-11-11 13:10:36 +01:00
bruhn_b 0f0ceb374b apache mal wieder 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2025-11-11 13:07:57 +01:00
bruhn_b ac9831d4aa own docker image 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2025-11-11 13:04:43 +01:00
bruhn_b 4fb595ea66 fail 
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
 2025-11-11 12:48:33 +01:00