Commit Graph

161 Commits

Author SHA1 Message Date
5287936bc4 http to vhost
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2025-11-24 10:38:27 +01:00
374c5612ef correct vhost
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2025-11-24 10:37:28 +01:00
8492280db2 nginx conf
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2025-11-24 10:36:12 +01:00
f2d6ca9c83 move fluid to apache
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2025-11-24 10:33:04 +01:00
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
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
106d05bedb apache config error
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2025-11-11 15:21:11 +01:00
ecc9fc2fc1 different container for gfa status
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2025-11-11 15:14:42 +01:00
d9bc31d0b6 individual configs
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2025-11-11 14:55:46 +01:00
a543867ffd gfa-status-test
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2025-11-11 14:48:26 +01:00
570cd243e2 finally
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2025-11-11 13:18:58 +01:00
50b7cf64c5 apache
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2025-11-11 13:10:36 +01:00
0f0ceb374b apache mal wieder
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2025-11-11 13:07:57 +01:00
ac9831d4aa own docker image
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2025-11-11 13:04:43 +01:00
4fb595ea66 fail
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2025-11-11 12:48:33 +01:00
fb522a5a89 apache ist soooooooo kompliziert
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2025-11-11 12:47:03 +01:00
a455dcc032 change index
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2025-11-11 12:44:55 +01:00
2280fb03ad make apache config modular
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2025-11-11 12:42:02 +01:00
fe99b08bdd apache config document root disable
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2025-11-11 12:26:57 +01:00
572398fe57 add apache php / cgi container for future apps and rfmwtools
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2025-11-11 12:21:04 +01:00
7056994308 whitespaces
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2025-11-11 12:03:42 +01:00
0ace2e232e java script errors
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2025-11-11 11:50:02 +01:00
c96d168b6d x-frame-options allow
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2025-11-11 11:28:42 +01:00
0b68f41715 prefix match
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2025-11-11 11:10:13 +01:00
478e3ab70f fix description and locations EOS
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2025-11-11 11:07:39 +01:00
0d160ed817 deploy fluid-eos and rfmwtools test
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2025-11-11 11:00:19 +01:00
0661847299 remove all woodpecker containers and nginx config
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2025-11-07 09:08:24 +01:00
e164197a8c update Hedgedoc and swiss ecargo, also add env variable for openAI
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2025-11-07 08:52:36 +01:00
52790849b1 version up swiss ecargo
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2025-11-04 15:23:38 +01:00
81323b6964 Update docker-compose.yaml 2025-11-04 15:20:15 +01:00
399acfb04d Merge pull request 'Opticswiki' (#11) from flechsig/WebHosting:main into main
Reviewed-on: linux/WebHosting#11
Reviewed-by: bruhn_b <basil.bruhn@psi.ch>
2025-11-04 15:17:48 +01:00
7cfc54073b merge upstream 2025-11-04 15:15:02 +01:00
7fca83e624 Update docker-compose.yaml 2025-11-04 15:13:23 +01:00
6201b7d127 restart woodpecker
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2025-11-03 16:36:48 +01:00
19626d4bac merge upstream 2025-11-03 10:52:37 +01:00
b018578b30 OpenMaint: fix mixed content block (#18)
Reviewed-on: linux/WebHosting#18
Co-authored-by: Konrad Bucheli <konrad.bucheli@psi.ch>
Co-committed-by: Konrad Bucheli <konrad.bucheli@psi.ch>
2025-10-28 11:03:53 +01:00
9ff88d5de0 fix forwarding for cmdbuild (#17)
Reviewed-on: linux/WebHosting#17
Co-authored-by: Konrad Bucheli <konrad.bucheli@psi.ch>
Co-committed-by: Konrad Bucheli <konrad.bucheli@psi.ch>
2025-10-28 10:16:39 +01:00
690f1fc8c5 name db host properly (#16)
Reviewed-on: linux/WebHosting#16
Co-authored-by: Konrad Bucheli <konrad.bucheli@psi.ch>
Co-committed-by: Konrad Bucheli <konrad.bucheli@psi.ch>
2025-10-28 08:44:17 +01:00
edb28e88de fix indentation (#15)
Reviewed-on: linux/WebHosting#15
Co-authored-by: Konrad Bucheli <konrad.bucheli@psi.ch>
Co-committed-by: Konrad Bucheli <konrad.bucheli@psi.ch>
2025-10-28 08:35:43 +01:00
1031743c36 add OpenMaint as panda-maintenance.psi.ch (#14)
Add a [OpenMaint](https://www.openmaint.org/en/home) instance using the Docker images and compose from https://github.com/itmicus/cmdbuild_docker.

Reviewed-on: linux/WebHosting#14
Reviewed-by: bruhn_b <basil.bruhn@psi.ch>
Co-authored-by: Konrad Bucheli <konrad.bucheli@psi.ch>
Co-committed-by: Konrad Bucheli <konrad.bucheli@psi.ch>
2025-10-28 08:28:56 +01:00
77f34de401 default server
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2025-10-27 09:21:51 +01:00
7d3007c361 correct comment 2025-10-23 14:06:58 +02:00
44c64087ff correct port number to 80 2025-10-23 14:06:17 +02:00
78793d5b70 Merge branch 'main' into main 2025-10-23 13:52:52 +02:00
d78cc05037 certificate name
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2025-10-21 17:00:20 +02:00
0eeacd3412 merge #13
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
2025-10-21 16:55:36 +02:00