|
|
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 |
|
|
|
57edf05d52
|
letsencrypt
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
|
2025-10-21 13:43:17 +02:00 |
|
romainsacchi
|
2bd2cbade7
|
Rename service name from carculator to swiss-ecargo because this is a special version of carculator and we want to reserve the carculator name for later.
|
2025-10-16 18:42:29 +02:00 |
|
|
|
3e7bc935ac
|
it_strategy_dashboard v2.0.1 (#12)
New defautlt data added via liquibase in backend container
Co-authored-by: ritter_t <tom.ritter@students.fhnw.ch>
Co-authored-by: tom.ritter <tom.ritter@students.fhnw.ch>
Reviewed-on: linux/WebHosting#12
Reviewed-by: buchel_k <konrad.bucheli@psi.ch>
Co-authored-by: ritter_t <tom.ritter@psi.ch>
Co-committed-by: ritter_t <tom.ritter@psi.ch>
|
2025-10-08 15:24:27 +02:00 |
|
|
|
52cd5e5f68
|
verify file format by comparing with original version
|
2025-10-07 11:03:33 +02:00 |
|
|
|
ef30ebf834
|
moved opticswiki after gfa-status-test since Im not sure
about the correct intention after woodpecker
|
2025-10-07 10:44:54 +02:00 |
|
|
|
4fe84492c5
|
clone other entry, partial adjustment
|
2025-10-06 15:55:42 +02:00 |
|
|
|
324e8e2879
|
use port 8090
|
2025-10-06 15:46:45 +02:00 |
|
|
|
2f90b5cb5e
|
add opticswiki.conf
|
2025-10-06 15:41:30 +02:00 |
|
|
|
3cba955dc6
|
docker-compose.yaml aktualisiert (#10)
added directory with frontend data to nginx service
Reviewed-on: linux/WebHosting#10
Reviewed-by: buchel_k <konrad.bucheli@psi.ch>
Co-authored-by: ritter_t <tom.ritter@psi.ch>
Co-committed-by: ritter_t <tom.ritter@psi.ch>
|
2025-09-30 07:11:37 +02:00 |
|
|
|
fe9ea4674e
|
Merge pull request 'IT Strategy Dashboard' (#9) from it_strategy into main
Reviewed-on: linux/WebHosting#9
Reviewed-by: buchel_k <konrad.bucheli@psi.ch>
Reviewed-by: ritter_t <tom.ritter@psi.ch>
|
2025-09-26 14:12:03 +02:00 |
|
|
|
27a7aa2bd5
|
conf.d/it-strategy-dashboard.conf aktualisiert
redirect requests to the frontend and make backend reachable via /API
|
2025-09-26 11:22:51 +02:00 |
|
|
|
2c43e9c5b9
|
docker-compose.yaml aktualisiert
added frontend-container to network for it-strategy
|
2025-09-26 10:51:36 +02:00 |
|
|
|
73bac2bde2
|
it dashboard
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
|
2025-09-26 10:22:34 +02:00 |
|
|
|
50263dd8c5
|
Merge pull request 'Update docker-compose.yaml' (#8) from bruhn_b-patch-2 into main
Reviewed-on: linux/WebHosting#8
|
2025-09-09 16:31:32 +02:00 |
|
|
|
1fb7cfa579
|
Update docker-compose.yaml
|
2025-09-09 16:31:24 +02:00 |
|
|
|
e0a09b6258
|
Merge pull request 'Update conf.d/n8n.conf' (#7) from bruhn_b-patch-1 into main
Reviewed-on: linux/WebHosting#7
|
2025-09-09 16:20:05 +02:00 |
|
|
|
ab7ec5c966
|
Update conf.d/n8n.conf
|
2025-09-09 16:19:52 +02:00 |
|
|
|
c22c2d5dcb
|
backend network
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
|
2025-08-21 10:39:58 +02:00 |
|
|
|
d1c8ce6dce
|
backend name
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
|
2025-08-21 10:35:18 +02:00 |
|
|
|
5d3634abcf
|
http backend
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
|
2025-08-21 10:34:00 +02:00 |
|
|
|
63f94dca58
|
more options
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
|
2025-08-21 10:30:53 +02:00 |
|
|
|
17603a5ea4
|
Merge pull request 'N8N App' (#6) from INC0150655 into main
Reviewed-on: linux/WebHosting#6
|
2025-08-21 10:15:06 +02:00 |
|
|
|
3fc7d0ecd1
|
comments on services
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
|
2025-08-21 10:14:36 +02:00 |
|
|
|
57bed39e71
|
app für de angelo initial commit
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
|
2025-08-19 16:51:24 +02:00 |
|
|
|
e4d12b995c
|
cert
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
|
2025-08-07 13:15:33 +02:00 |
|
|
|
ac2650311c
|
Merge pull request 'Add carculator service' (#4) from sacchi_r/WebHosting:add-carculator into main
Reviewed-on: linux/WebHosting#4
Reviewed-by: bruhn_b <basil.bruhn@psi.ch>
|
2025-08-05 10:36:47 +02:00 |
|
romainsacchi
|
0e38bd84aa
|
Change server_name to carculator-api-test.psi.ch for test deployment
|
2025-08-05 10:35:34 +02:00 |
|
romainsacchi
|
2d34b1f194
|
Add carculator service
|
2025-08-05 10:35:34 +02:00 |
|
|
|
7c1077b074
|
Merge pull request 'sinq changes' (#5) from sinqstatus into main
Reviewed-on: linux/WebHosting#5
Reviewed-by: ebner <simon.ebner@psi.ch>
|
2025-08-04 10:41:38 +02:00 |
|
|
|
5215aad1e4
|
sinq changes
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
|
2025-08-04 10:21:50 +02:00 |
|
|
|
b56d946a8f
|
Merge pull request 'sinqstatus-test.psi.ch' (#3) from sinqstatus into main
Reviewed-on: linux/WebHosting#3
Reviewed-by: ebner <simon.ebner@psi.ch>
|
2025-07-29 15:18:40 +02:00 |
|
|
|
0f6dcbdb86
|
comments
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
|
2025-07-28 15:22:30 +02:00 |
|
