From 2828f4083f4c93e5d4b69288a82127bdba55ed0a Mon Sep 17 00:00:00 2001 From: TheFJcurve Date: Wed, 22 Oct 2025 18:40:00 -0400 Subject: [PATCH 1/3] adding new view commits --- src/view | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/view b/src/view index 510b7fc..833f90f 160000 --- a/src/view +++ b/src/view @@ -1 +1 @@ -Subproject commit 510b7fc7799f5cdd9d62879d4b5e14f02e88964f +Subproject commit 833f90f7eb25389b0043de5e8c040b44c3fbacdc From b36c0fca9230ec36dccfc67908a42f5ef9e41bc5 Mon Sep 17 00:00:00 2001 From: TheFJcurve Date: Wed, 22 Oct 2025 22:05:57 -0400 Subject: [PATCH 2/3] working on collabora only --- docker-compose.yml | 13 +--------- nginx.conf | 59 ++++++++++++++++++++++++++++++---------------- 2 files changed, 40 insertions(+), 32 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 563436e..a14d056 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,19 +12,9 @@ services: networks: - app-network depends_on: - - nextcloud - collabora_online - skopeo_controller - nextcloud: - image: nextcloud:latest - container_name: nextcloud - restart: always - volumes: - - nextcloud_data:/var/www/html - networks: - - app-network - collabora_online: build: context: . @@ -35,11 +25,10 @@ services: cap_add: - SYS_ADMIN environment: - - extra_params=--o:ssl.enable=false --o:ssl.termination=true --o:storage.wopi.host=nextcloud --o:server_name=localhost --o:storage.wopi.host_allow_list=nextcloud,localhost + - extra_params=--o:ssl.enable=false --o:ssl.termination=true --o:storage.wopi.host=office.localhost --o:server_name=office.localhost --o:storage.wopi.host_allow_list=office.localhost networks: - app-network depends_on: - - nextcloud - skopeo_controller skopeo_controller: diff --git a/nginx.conf b/nginx.conf index fbb7e19..77892af 100644 --- a/nginx.conf +++ b/nginx.conf @@ -9,10 +9,8 @@ http { client_max_body_size 10G; server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - - server_name localhost; + listen 443 ssl; + server_name office.localhost; ssl_certificate /etc/nginx/certs/fullchain.pem; ssl_certificate_key /etc/nginx/certs/privkey.pem; @@ -20,15 +18,6 @@ http { ssl_session_cache shared:SSL:10m; ssl_session_tickets off; - location / { - proxy_pass http://nextcloud/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Forwarded-Host $host; - } - location /ws-chat/ { proxy_pass http://skopeo_controller:9000/; proxy_http_version 1.1; @@ -38,13 +27,43 @@ http { proxy_read_timeout 86400; } - location ~ ^/(hosting|loleaflet|lool|browser) { - proxy_pass http://collabora_online:9980; - proxy_set_header Host $host; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - } + location ^~ /browser { + proxy_pass http://collabora_online:9980; + proxy_set_header Host $host; + } + + location ^~ /hosting/discovery { + proxy_pass http://collabora_online:9980; + proxy_set_header Host $host; + } + + location ^~ /hosting/capabilities { + proxy_pass http://collabora_online:9980; + proxy_set_header Host $host; + } + + location ~ ^/cool/(.*)/ws$ { + proxy_pass http://collabora_online:9980; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + proxy_set_header Host $host; + proxy_read_timeout 36000s; + } + + location ~ ^/(c|l)ool { + proxy_pass http://collabora_online:9980; + proxy_set_header Host $host; + } + + location ^~ /cool/adminws { + proxy_pass http://collabora_online:9980; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + proxy_set_header Host $host; + proxy_read_timeout 36000s; + } } server { From f7f02cbc78a0538ed69a9934edc18f6d63aaa114 Mon Sep 17 00:00:00 2001 From: Sargun Singh Bhatti Date: Fri, 24 Oct 2025 15:30:53 -0400 Subject: [PATCH 3/3] ui changes load in collabora --- docker-compose.yml | 20 ++---------- nginx.conf | 79 ---------------------------------------------- src/view | 2 +- 3 files changed, 4 insertions(+), 97 deletions(-) delete mode 100644 nginx.conf diff --git a/docker-compose.yml b/docker-compose.yml index a14d056..e3e7131 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,20 +1,4 @@ services: - nginx_proxy: - image: nginx:latest - container_name: nginx_proxy - restart: always - ports: - - "80:80" - - "443:443" - volumes: - - ./nginx.conf:/etc/nginx/nginx.conf:ro - - ./certs:/etc/nginx/certs:ro - networks: - - app-network - depends_on: - - collabora_online - - skopeo_controller - collabora_online: build: context: . @@ -22,10 +6,12 @@ services: image: collabora:latest container_name: collabora_online restart: always + ports: + - "9980:9980" cap_add: - SYS_ADMIN environment: - - extra_params=--o:ssl.enable=false --o:ssl.termination=true --o:storage.wopi.host=office.localhost --o:server_name=office.localhost --o:storage.wopi.host_allow_list=office.localhost + - extra_params=--o:ssl.enable=false --o:ssl.termination=true networks: - app-network depends_on: diff --git a/nginx.conf b/nginx.conf deleted file mode 100644 index 77892af..0000000 --- a/nginx.conf +++ /dev/null @@ -1,79 +0,0 @@ -worker_processes auto; - -events { - worker_connections 1024; -} - -http { - include /etc/nginx/mime.types; - client_max_body_size 10G; - - server { - listen 443 ssl; - server_name office.localhost; - - ssl_certificate /etc/nginx/certs/fullchain.pem; - ssl_certificate_key /etc/nginx/certs/privkey.pem; - ssl_session_timeout 1d; - ssl_session_cache shared:SSL:10m; - ssl_session_tickets off; - - location /ws-chat/ { - proxy_pass http://skopeo_controller:9000/; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_set_header Host $host; - proxy_read_timeout 86400; - } - - location ^~ /browser { - proxy_pass http://collabora_online:9980; - proxy_set_header Host $host; - } - - location ^~ /hosting/discovery { - proxy_pass http://collabora_online:9980; - proxy_set_header Host $host; - } - - location ^~ /hosting/capabilities { - proxy_pass http://collabora_online:9980; - proxy_set_header Host $host; - } - - location ~ ^/cool/(.*)/ws$ { - proxy_pass http://collabora_online:9980; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_set_header Host $host; - proxy_read_timeout 36000s; - } - - location ~ ^/(c|l)ool { - proxy_pass http://collabora_online:9980; - proxy_set_header Host $host; - } - - location ^~ /cool/adminws { - proxy_pass http://collabora_online:9980; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_set_header Host $host; - proxy_read_timeout 36000s; - } - } - - server { - listen 80; - listen [::]:80; - - server_name localhost; - - location / { - return 301 https://$host$request_uri; - } - } -} diff --git a/src/view b/src/view index 833f90f..31b73f3 160000 --- a/src/view +++ b/src/view @@ -1 +1 @@ -Subproject commit 833f90f7eb25389b0043de5e8c040b44c3fbacdc +Subproject commit 31b73f3ec20ce4ff59e754ca4d362e5e4463d263