diff --git a/docker-compose.yml b/docker-compose.yml index 563436e..e3e7131 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,30 +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: - - 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: . @@ -32,14 +6,15 @@ 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=nextcloud --o:server_name=localhost --o:storage.wopi.host_allow_list=nextcloud,localhost + - extra_params=--o:ssl.enable=false --o:ssl.termination=true networks: - app-network depends_on: - - nextcloud - skopeo_controller skopeo_controller: diff --git a/nginx.conf b/nginx.conf deleted file mode 100644 index fbb7e19..0000000 --- a/nginx.conf +++ /dev/null @@ -1,60 +0,0 @@ -worker_processes auto; - -events { - worker_connections 1024; -} - -http { - include /etc/nginx/mime.types; - client_max_body_size 10G; - - server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - - server_name 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 / { - 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; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_set_header Host $host; - 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"; - } - } - - server { - listen 80; - listen [::]:80; - - server_name localhost; - - location / { - return 301 https://$host$request_uri; - } - } -} diff --git a/src/view b/src/view index 510b7fc..31b73f3 160000 --- a/src/view +++ b/src/view @@ -1 +1 @@ -Subproject commit 510b7fc7799f5cdd9d62879d4b5e14f02e88964f +Subproject commit 31b73f3ec20ce4ff59e754ca4d362e5e4463d263