Compare commits
	
		
			1 Commits
		
	
	
		
			update-ngi
			...
			split-bbb-
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| f4edb06d53 | 
							
								
								
									
										2
									
								
								abra.sh
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								abra.sh
									
									
									
									
									
								
							@ -1,7 +1,7 @@
 | 
				
			|||||||
#!/bin/bash
 | 
					#!/bin/bash
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export FPM_TUNE_VERSION=v5
 | 
					export FPM_TUNE_VERSION=v5
 | 
				
			||||||
export NGINX_CONF_VERSION=v7
 | 
					export NGINX_CONF_VERSION=v6
 | 
				
			||||||
export MY_CNF_VERSION=v5
 | 
					export MY_CNF_VERSION=v5
 | 
				
			||||||
export ENTRYPOINT_VERSION=v3
 | 
					export ENTRYPOINT_VERSION=v3
 | 
				
			||||||
export CRONTAB_VERSION=v1
 | 
					export CRONTAB_VERSION=v1
 | 
				
			||||||
 | 
				
			|||||||
@ -1,24 +0,0 @@
 | 
				
			|||||||
authentik:
 | 
					 | 
				
			||||||
    uncomment:
 | 
					 | 
				
			||||||
        - compose.authentik.yml
 | 
					 | 
				
			||||||
        - AUTHENTIK_USER_PREFIX
 | 
					 | 
				
			||||||
        - AUTHENTIK_DOMAIN
 | 
					 | 
				
			||||||
        - SECRET_AUTHENTIK_SECRET_VERSION
 | 
					 | 
				
			||||||
        - SECRET_AUTHENTIK_ID_VERSION
 | 
					 | 
				
			||||||
    execute:
 | 
					 | 
				
			||||||
        - app set_authentik
 | 
					 | 
				
			||||||
    shared_secrets:
 | 
					 | 
				
			||||||
        nextcloud_secret: authentik_secret
 | 
					 | 
				
			||||||
        nextcloud_id: authentik_id
 | 
					 | 
				
			||||||
onlyoffice:
 | 
					 | 
				
			||||||
    uncomment:
 | 
					 | 
				
			||||||
        - compose.onlyoffice.yml
 | 
					 | 
				
			||||||
        - ONLYOFFICE_URL
 | 
					 | 
				
			||||||
        - SECRET_ONLYOFFICE_JWT_VERSION
 | 
					 | 
				
			||||||
    execute:
 | 
					 | 
				
			||||||
        - app install_onlyoffice
 | 
					 | 
				
			||||||
collabora:
 | 
					 | 
				
			||||||
    uncomment:
 | 
					 | 
				
			||||||
        - COLLABORA_URL
 | 
					 | 
				
			||||||
    execute:
 | 
					 | 
				
			||||||
        - app install_collabora
 | 
					 | 
				
			||||||
@ -2,7 +2,7 @@ version: "3.8"
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
services:
 | 
					services:
 | 
				
			||||||
  elasticsearch:
 | 
					  elasticsearch:
 | 
				
			||||||
    image: "docker.elastic.co/elasticsearch/elasticsearch:8.11.4"
 | 
					    image: "docker.elastic.co/elasticsearch/elasticsearch:8.11.3"
 | 
				
			||||||
    environment:
 | 
					    environment:
 | 
				
			||||||
      - cluster.name=docker-cluster
 | 
					      - cluster.name=docker-cluster
 | 
				
			||||||
      - bootstrap.memory_lock=true
 | 
					      - bootstrap.memory_lock=true
 | 
				
			||||||
@ -29,7 +29,7 @@ services:
 | 
				
			|||||||
        mode: 0600
 | 
					        mode: 0600
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  searchindexer:
 | 
					  searchindexer:
 | 
				
			||||||
    image: nextcloud:29.0.1-fpm
 | 
					    image: nextcloud:28.0.5-fpm
 | 
				
			||||||
    volumes:
 | 
					    volumes:
 | 
				
			||||||
      - nextcloud:/var/www/html/
 | 
					      - nextcloud:/var/www/html/
 | 
				
			||||||
      - nextapps:/var/www/html/custom_apps:cached
 | 
					      - nextapps:/var/www/html/custom_apps:cached
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										10
									
								
								compose.yml
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								compose.yml
									
									
									
									
									
								
							@ -1,7 +1,7 @@
 | 
				
			|||||||
version: "3.8"
 | 
					version: "3.8"
 | 
				
			||||||
services:
 | 
					services:
 | 
				
			||||||
  web:
 | 
					  web:
 | 
				
			||||||
    image: nginx:1.26.1
 | 
					    image: nginx:1.25.3
 | 
				
			||||||
    depends_on:
 | 
					    depends_on:
 | 
				
			||||||
      - app
 | 
					      - app
 | 
				
			||||||
    configs:
 | 
					    configs:
 | 
				
			||||||
@ -46,7 +46,7 @@ services:
 | 
				
			|||||||
      start_period: 5m
 | 
					      start_period: 5m
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  app:
 | 
					  app:
 | 
				
			||||||
    image: nextcloud:29.0.1-fpm
 | 
					    image: nextcloud:28.0.5-fpm
 | 
				
			||||||
    depends_on:
 | 
					    depends_on:
 | 
				
			||||||
      - db
 | 
					      - db
 | 
				
			||||||
    configs:
 | 
					    configs:
 | 
				
			||||||
@ -91,7 +91,7 @@ services:
 | 
				
			|||||||
        failure_action: rollback
 | 
					        failure_action: rollback
 | 
				
			||||||
        order: start-first
 | 
					        order: start-first
 | 
				
			||||||
      labels:
 | 
					      labels:
 | 
				
			||||||
        - "coop-cloud.${STACK_NAME}.version=8.0.0+29.0.1-fpm"
 | 
					        - "coop-cloud.${STACK_NAME}.version=6.0.5+28.0.5-fpm"
 | 
				
			||||||
        - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
 | 
					        - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
 | 
				
			||||||
        - "backupbot.backup=true"
 | 
					        - "backupbot.backup=true"
 | 
				
			||||||
        - "backupbot.backup.path=/var/www/html/config/,/var/www/html/data/,/var/www/html/custom_apps/"
 | 
					        - "backupbot.backup.path=/var/www/html/config/,/var/www/html/data/,/var/www/html/custom_apps/"
 | 
				
			||||||
@ -103,7 +103,7 @@ services:
 | 
				
			|||||||
      start_period: 15m
 | 
					      start_period: 15m
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  cron:
 | 
					  cron:
 | 
				
			||||||
    image: nextcloud:29.0.1-fpm
 | 
					    image: nextcloud:28.0.5-fpm
 | 
				
			||||||
    volumes:
 | 
					    volumes:
 | 
				
			||||||
      - nextcloud:/var/www/html/
 | 
					      - nextcloud:/var/www/html/
 | 
				
			||||||
      - nextapps:/var/www/html/custom_apps:cached
 | 
					      - nextapps:/var/www/html/custom_apps:cached
 | 
				
			||||||
@ -119,7 +119,7 @@ services:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  cache:
 | 
					  cache:
 | 
				
			||||||
    image: redis:7.2.5-alpine
 | 
					    image: redis:7.2.4-alpine
 | 
				
			||||||
    networks:
 | 
					    networks:
 | 
				
			||||||
      - internal
 | 
					      - internal
 | 
				
			||||||
    volumes:
 | 
					    volumes:
 | 
				
			||||||
 | 
				
			|||||||
@ -10,7 +10,11 @@ events {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
http {
 | 
					http {
 | 
				
			||||||
    include mime.types;
 | 
					    include       /etc/nginx/mime.types;
 | 
				
			||||||
 | 
					    # See https://github.com/nextcloud/forms/issues/1838#issuecomment-1860497200
 | 
				
			||||||
 | 
					    types {
 | 
				
			||||||
 | 
					        application/javascript js mjs;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
    default_type  application/octet-stream;
 | 
					    default_type  application/octet-stream;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
 | 
					    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
 | 
				
			||||||
@ -22,17 +26,8 @@ http {
 | 
				
			|||||||
    sendfile        on;
 | 
					    sendfile        on;
 | 
				
			||||||
    #tcp_nopush     on;
 | 
					    #tcp_nopush     on;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # Prevent nginx HTTP Server Detection
 | 
					 | 
				
			||||||
    server_tokens   off;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    keepalive_timeout  65;
 | 
					    keepalive_timeout  65;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # Set the `immutable` cache control options only for assets with a cache busting `v` argument
 | 
					 | 
				
			||||||
    map $arg_v $asset_immutable {
 | 
					 | 
				
			||||||
        "" "";
 | 
					 | 
				
			||||||
    default "immutable";
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    #gzip  on;
 | 
					    #gzip  on;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    upstream php-handler {
 | 
					    upstream php-handler {
 | 
				
			||||||
@ -50,15 +45,10 @@ http {
 | 
				
			|||||||
        # could take several months.
 | 
					        # could take several months.
 | 
				
			||||||
        #add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;" always;
 | 
					        #add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;" always;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        # set max upload size and increase upload timeout:
 | 
					 | 
				
			||||||
        client_max_body_size 512M;
 | 
					 | 
				
			||||||
        client_body_timeout 300s;
 | 
					 | 
				
			||||||
        fastcgi_buffers 64 4K;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
        # The settings allows you to optimize the HTTP2 bandwidth.
 | 
					        # set max upload size
 | 
				
			||||||
        # See https://blog.cloudflare.com/delivering-http-2-upload-speed-improvements/
 | 
					        client_max_body_size 512M;
 | 
				
			||||||
        # for tuning hints
 | 
					        fastcgi_buffers 64 4K;
 | 
				
			||||||
        client_body_buffer_size 512k;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
        # Enable gzip but do not remove ETag headers
 | 
					        # Enable gzip but do not remove ETag headers
 | 
				
			||||||
        gzip on;
 | 
					        gzip on;
 | 
				
			||||||
@ -66,7 +56,7 @@ http {
 | 
				
			|||||||
        gzip_comp_level 4;
 | 
					        gzip_comp_level 4;
 | 
				
			||||||
        gzip_min_length 256;
 | 
					        gzip_min_length 256;
 | 
				
			||||||
        gzip_proxied expired no-cache no-store private no_last_modified no_etag auth;
 | 
					        gzip_proxied expired no-cache no-store private no_last_modified no_etag auth;
 | 
				
			||||||
        gzip_types application/atom+xml text/javascript application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/wasm application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy;
 | 
					        gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        # Pagespeed is not supported by Nextcloud, so if your server is built
 | 
					        # Pagespeed is not supported by Nextcloud, so if your server is built
 | 
				
			||||||
        # with the `ngx_pagespeed` module, uncomment this line to disable it.
 | 
					        # with the `ngx_pagespeed` module, uncomment this line to disable it.
 | 
				
			||||||
@ -75,6 +65,7 @@ http {
 | 
				
			|||||||
        # HTTP response headers borrowed from Nextcloud `.htaccess`
 | 
					        # HTTP response headers borrowed from Nextcloud `.htaccess`
 | 
				
			||||||
        add_header Referrer-Policy                      "no-referrer"       always;
 | 
					        add_header Referrer-Policy                      "no-referrer"       always;
 | 
				
			||||||
        add_header X-Content-Type-Options               "nosniff"           always;
 | 
					        add_header X-Content-Type-Options               "nosniff"           always;
 | 
				
			||||||
 | 
					        add_header X-Download-Options                   "noopen"            always;
 | 
				
			||||||
        add_header X-Permitted-Cross-Domain-Policies    "none"              always;
 | 
					        add_header X-Permitted-Cross-Domain-Policies    "none"              always;
 | 
				
			||||||
        add_header X-Robots-Tag                         "noindex, nofollow" always;
 | 
					        add_header X-Robots-Tag                         "noindex, nofollow" always;
 | 
				
			||||||
        add_header X-XSS-Protection                     "1; mode=block"     always;
 | 
					        add_header X-XSS-Protection                     "1; mode=block"     always;
 | 
				
			||||||
@ -145,9 +136,6 @@ http {
 | 
				
			|||||||
        # then Nginx will encounter an infinite rewriting loop when it prepends `/index.php`
 | 
					        # then Nginx will encounter an infinite rewriting loop when it prepends `/index.php`
 | 
				
			||||||
        # to the URI, resulting in a HTTP 500 error response.
 | 
					        # to the URI, resulting in a HTTP 500 error response.
 | 
				
			||||||
        location ~ \.php(?:$|/) {
 | 
					        location ~ \.php(?:$|/) {
 | 
				
			||||||
            # Required for legacy support
 | 
					 | 
				
			||||||
            rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|.+\/richdocumentscode(_arm64)?\/proxy) /index.php$request_uri;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            fastcgi_split_path_info ^(.+?\.php)(/.*)$;
 | 
					            fastcgi_split_path_info ^(.+?\.php)(/.*)$;
 | 
				
			||||||
            set $path_info $fastcgi_path_info;
 | 
					            set $path_info $fastcgi_path_info;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -164,32 +152,12 @@ http {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
            fastcgi_intercept_errors on;
 | 
					            fastcgi_intercept_errors on;
 | 
				
			||||||
            fastcgi_request_buffering off;
 | 
					            fastcgi_request_buffering off;
 | 
				
			||||||
 | 
					 | 
				
			||||||
            fastcgi_max_temp_file_size 0;
 | 
					 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        # Javascript mimetype fixes for nginx
 | 
					        location ~ \.(?:css|js|svg|gif)$ {
 | 
				
			||||||
        # Note: The block below should be removed, and the js|mjs section should be
 | 
					 | 
				
			||||||
        # added to the block below this one. This is a temporary fix until Nginx 
 | 
					 | 
				
			||||||
        # upstream fixes the js mime-type
 | 
					 | 
				
			||||||
        location ~* \.(?:js|mjs)$ {
 | 
					 | 
				
			||||||
            types { 
 | 
					 | 
				
			||||||
                text/javascript js mjs;
 | 
					 | 
				
			||||||
            } 
 | 
					 | 
				
			||||||
            try_files $uri /index.php$request_uri;
 | 
					            try_files $uri /index.php$request_uri;
 | 
				
			||||||
            add_header Cache-Control "public, max-age=15778463, $asset_immutable";
 | 
					            expires 6M;         # Cache-Control policy borrowed from `.htaccess`
 | 
				
			||||||
            access_log off;
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        # Serve static files
 | 
					 | 
				
			||||||
        location ~ \.(?:css|svg|gif|png|jpg|ico|wasm|tflite|map|ogg|flac)$ {
 | 
					 | 
				
			||||||
            try_files $uri /index.php$request_uri;
 | 
					 | 
				
			||||||
            add_header Cache-Control "public, max-age=15778463, $asset_immutable";
 | 
					 | 
				
			||||||
            access_log off;     # Optional: Don't log access to assets
 | 
					            access_log off;     # Optional: Don't log access to assets
 | 
				
			||||||
 | 
					 | 
				
			||||||
            location ~ \.wasm$ {
 | 
					 | 
				
			||||||
                default_type application/wasm;
 | 
					 | 
				
			||||||
            }
 | 
					 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        location ~ \.woff2?$ {
 | 
					        location ~ \.woff2?$ {
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										1
									
								
								release/6.0.5+28.0.5-fpm
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								release/6.0.5+28.0.5-fpm
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1 @@
 | 
				
			|||||||
 | 
					BREAKING CHANGE: compose.apps.yml was split to compose.bbb.yml and compose.onlyoffice.yml, configuration update is required!
 | 
				
			||||||
@ -1 +0,0 @@
 | 
				
			|||||||
BREAKING CHANGE: compose.apps.yml is now split for bbb and onlyoffice, configs must be updated
 | 
					 | 
				
			||||||
		Reference in New Issue
	
	Block a user