Compare commits
	
		
			1 Commits
		
	
	
		
			nextcloud-
			...
			update-ngi
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 1ac43b6be6 | 
@ -44,13 +44,6 @@ DEFAULT_QUOTA="10 GB"
 | 
			
		||||
# MAIL_DOMAIN=
 | 
			
		||||
# SECRET_SMTP_PASSWORD_VERSION=v1
 | 
			
		||||
 | 
			
		||||
## Customization
 | 
			
		||||
# THEMING_COLOR=
 | 
			
		||||
# THEMING_SLOGAN=
 | 
			
		||||
# COPY_ASSETS="flow_background.jpg|app:/var/www/html/themes/"
 | 
			
		||||
# COPY_ASSETS="$COPY_ASSETS icon_left_brand.svg|app:/var/www/html/themes/"
 | 
			
		||||
# COPY_ASSETS="$COPY_ASSETS icon.png|app:/var/www/html/themes/"
 | 
			
		||||
 | 
			
		||||
# APPS="calendar"
 | 
			
		||||
 | 
			
		||||
# COLLABORA_URL=https://collabora.example.com
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										26
									
								
								abra.sh
									
									
									
									
									
								
							
							
						
						
									
										26
									
								
								abra.sh
									
									
									
									
									
								
							@ -52,27 +52,6 @@ set_logfile_stdout() {
 | 
			
		||||
    set_system_config logfile '/dev/stdout'
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
customize() {
 | 
			
		||||
    if [ -z "$1" ]
 | 
			
		||||
    then
 | 
			
		||||
            echo "Usage: ... customize <assets_path>"
 | 
			
		||||
            exit 1
 | 
			
		||||
    fi
 | 
			
		||||
    asset_dir=$1
 | 
			
		||||
    for asset in $COPY_ASSETS; do
 | 
			
		||||
        source=$(echo $asset | cut -d "|" -f1)
 | 
			
		||||
        target=$(echo $asset | cut -d "|" -f2)
 | 
			
		||||
        echo copy $source to $target
 | 
			
		||||
        abra app cp $APP_NAME $asset_dir/$source $target
 | 
			
		||||
    done
 | 
			
		||||
 | 
			
		||||
    abra app cmd -T $APP_NAME app set_app_config theming color \"$THEMING_COLOR\"
 | 
			
		||||
    abra app cmd -T $APP_NAME app set_app_config theming slogan \"$THEMING_SLOGAN\"
 | 
			
		||||
    abra app cmd -T $APP_NAME app run_occ '"theming:config background \"/var/www/html/themes/flow_background.jpg\""'
 | 
			
		||||
    abra app cmd -T $APP_NAME app run_occ '"theming:config logo \"/var/www/html/themes/icon_left_brand.svg\""'
 | 
			
		||||
    abra app cmd -T $APP_NAME app run_occ '"theming:config logoheader \"/var/www/html/themes/icon.png\""'
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
install_bbb() {
 | 
			
		||||
    install_apps bbb
 | 
			
		||||
    set_app_config bbb app.navigation true
 | 
			
		||||
@ -110,7 +89,6 @@ set_authentik() {
 | 
			
		||||
    install_apps sociallogin
 | 
			
		||||
    AUTHENTIK_SECRET=$(cat /run/secrets/authentik_secret)
 | 
			
		||||
    AUTHENTIK_ID=$(cat /run/secrets/authentik_id)
 | 
			
		||||
    set_system_config logo_url https://$AUTHENTIK_DOMAIN
 | 
			
		||||
    set_app_config sociallogin custom_providers "
 | 
			
		||||
{
 | 
			
		||||
    \"custom_oidc\":[
 | 
			
		||||
@ -143,7 +121,3 @@ set_authentik() {
 | 
			
		||||
    run_occ 'config:system:set allow_user_to_change_display_name --value=false'
 | 
			
		||||
    run_occ 'config:system:set lost_password_link --value=disabled'
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
disable_skeletondirectory() {
 | 
			
		||||
    run_occ "config:system:set skeletondirectory --value ''"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -5,7 +5,7 @@ authentik:
 | 
			
		||||
        - AUTHENTIK_DOMAIN
 | 
			
		||||
        - SECRET_AUTHENTIK_SECRET_VERSION
 | 
			
		||||
        - SECRET_AUTHENTIK_ID_VERSION
 | 
			
		||||
    initial-hooks:
 | 
			
		||||
    execute:
 | 
			
		||||
        - app set_authentik
 | 
			
		||||
    shared_secrets:
 | 
			
		||||
        nextcloud_secret: authentik_secret
 | 
			
		||||
@ -15,10 +15,10 @@ onlyoffice:
 | 
			
		||||
        - compose.onlyoffice.yml
 | 
			
		||||
        - ONLYOFFICE_URL
 | 
			
		||||
        - SECRET_ONLYOFFICE_JWT_VERSION
 | 
			
		||||
    initial-hooks:
 | 
			
		||||
    execute:
 | 
			
		||||
        - app install_onlyoffice
 | 
			
		||||
collabora:
 | 
			
		||||
    uncomment:
 | 
			
		||||
        - COLLABORA_URL
 | 
			
		||||
    initial-hooks:
 | 
			
		||||
    execute:
 | 
			
		||||
        - app install_collabora
 | 
			
		||||
 | 
			
		||||
@ -2,7 +2,7 @@ version: "3.8"
 | 
			
		||||
 | 
			
		||||
services:
 | 
			
		||||
  elasticsearch:
 | 
			
		||||
    image: "docker.elastic.co/elasticsearch/elasticsearch:8.15.0"
 | 
			
		||||
    image: "docker.elastic.co/elasticsearch/elasticsearch:8.11.4"
 | 
			
		||||
    environment:
 | 
			
		||||
      - cluster.name=docker-cluster
 | 
			
		||||
      - bootstrap.memory_lock=true
 | 
			
		||||
@ -29,7 +29,7 @@ services:
 | 
			
		||||
        mode: 0600
 | 
			
		||||
 | 
			
		||||
  searchindexer:
 | 
			
		||||
    image: nextcloud:28.0.10-fpm
 | 
			
		||||
    image: nextcloud:29.0.1-fpm
 | 
			
		||||
    volumes:
 | 
			
		||||
      - nextcloud:/var/www/html/
 | 
			
		||||
      - nextapps:/var/www/html/custom_apps:cached
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										10
									
								
								compose.yml
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								compose.yml
									
									
									
									
									
								
							@ -1,7 +1,7 @@
 | 
			
		||||
version: "3.8"
 | 
			
		||||
services:
 | 
			
		||||
  web:
 | 
			
		||||
    image: nginx:1.25.3
 | 
			
		||||
    image: nginx:1.26.1
 | 
			
		||||
    depends_on:
 | 
			
		||||
      - app
 | 
			
		||||
    configs:
 | 
			
		||||
@ -46,7 +46,7 @@ services:
 | 
			
		||||
      start_period: 5m
 | 
			
		||||
 | 
			
		||||
  app:
 | 
			
		||||
    image: nextcloud:28.0.10-fpm
 | 
			
		||||
    image: nextcloud:29.0.1-fpm
 | 
			
		||||
    depends_on:
 | 
			
		||||
      - db
 | 
			
		||||
    configs:
 | 
			
		||||
@ -91,7 +91,7 @@ services:
 | 
			
		||||
        failure_action: rollback
 | 
			
		||||
        order: start-first
 | 
			
		||||
      labels:
 | 
			
		||||
        - "coop-cloud.${STACK_NAME}.version=6.0.10+28.0.10-fpm"
 | 
			
		||||
        - "coop-cloud.${STACK_NAME}.version=8.0.0+29.0.1-fpm"
 | 
			
		||||
        - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
 | 
			
		||||
        - "backupbot.backup=true"
 | 
			
		||||
        - "backupbot.backup.path=/var/www/html/config/,/var/www/html/data/,/var/www/html/custom_apps/"
 | 
			
		||||
@ -103,7 +103,7 @@ services:
 | 
			
		||||
      start_period: 15m
 | 
			
		||||
 | 
			
		||||
  cron:
 | 
			
		||||
    image: nextcloud:28.0.10-fpm
 | 
			
		||||
    image: nextcloud:29.0.1-fpm
 | 
			
		||||
    volumes:
 | 
			
		||||
      - nextcloud:/var/www/html/
 | 
			
		||||
      - nextapps:/var/www/html/custom_apps:cached
 | 
			
		||||
@ -119,7 +119,7 @@ services:
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
  cache:
 | 
			
		||||
    image: redis:7.2.4-alpine
 | 
			
		||||
    image: redis:7.2.5-alpine
 | 
			
		||||
    networks:
 | 
			
		||||
      - internal
 | 
			
		||||
    volumes:
 | 
			
		||||
 | 
			
		||||
@ -10,11 +10,7 @@ events {
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
http {
 | 
			
		||||
    include       /etc/nginx/mime.types;
 | 
			
		||||
    # See https://github.com/nextcloud/forms/issues/1838#issuecomment-1860497200
 | 
			
		||||
    types {
 | 
			
		||||
        application/javascript js mjs;
 | 
			
		||||
    }
 | 
			
		||||
    include mime.types;
 | 
			
		||||
    default_type  application/octet-stream;
 | 
			
		||||
 | 
			
		||||
    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
 | 
			
		||||
@ -26,8 +22,17 @@ http {
 | 
			
		||||
    sendfile        on;
 | 
			
		||||
    #tcp_nopush     on;
 | 
			
		||||
 | 
			
		||||
    # Prevent nginx HTTP Server Detection
 | 
			
		||||
    server_tokens   off;
 | 
			
		||||
 | 
			
		||||
    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;
 | 
			
		||||
 | 
			
		||||
    upstream php-handler {
 | 
			
		||||
@ -45,18 +50,23 @@ http {
 | 
			
		||||
        # could take several months.
 | 
			
		||||
        #add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;" always;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
        # set max upload size
 | 
			
		||||
        # 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.
 | 
			
		||||
        # See https://blog.cloudflare.com/delivering-http-2-upload-speed-improvements/
 | 
			
		||||
        # for tuning hints
 | 
			
		||||
        client_body_buffer_size 512k;
 | 
			
		||||
 | 
			
		||||
        # Enable gzip but do not remove ETag headers
 | 
			
		||||
        gzip on;
 | 
			
		||||
        gzip_vary on;
 | 
			
		||||
        gzip_comp_level 4;
 | 
			
		||||
        gzip_min_length 256;
 | 
			
		||||
        gzip_proxied expired no-cache no-store private no_last_modified no_etag auth;
 | 
			
		||||
        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;
 | 
			
		||||
        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;
 | 
			
		||||
 | 
			
		||||
        # Pagespeed is not supported by Nextcloud, so if your server is built
 | 
			
		||||
        # with the `ngx_pagespeed` module, uncomment this line to disable it.
 | 
			
		||||
@ -65,7 +75,6 @@ http {
 | 
			
		||||
        # HTTP response headers borrowed from Nextcloud `.htaccess`
 | 
			
		||||
        add_header Referrer-Policy                      "no-referrer"       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-Robots-Tag                         "noindex, nofollow" always;
 | 
			
		||||
        add_header X-XSS-Protection                     "1; mode=block"     always;
 | 
			
		||||
@ -155,12 +164,32 @@ http {
 | 
			
		||||
 | 
			
		||||
            fastcgi_intercept_errors on;
 | 
			
		||||
            fastcgi_request_buffering off;
 | 
			
		||||
 | 
			
		||||
            fastcgi_max_temp_file_size 0;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        location ~ \.(?:css|js|svg|gif)$ {
 | 
			
		||||
        # Javascript mimetype fixes for nginx
 | 
			
		||||
        # 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;
 | 
			
		||||
            expires 6M;         # Cache-Control policy borrowed from `.htaccess`
 | 
			
		||||
            add_header Cache-Control "public, max-age=15778463, $asset_immutable";
 | 
			
		||||
            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
 | 
			
		||||
 | 
			
		||||
            location ~ \.wasm$ {
 | 
			
		||||
                default_type application/wasm;
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        location ~ \.woff2?$ {
 | 
			
		||||
 | 
			
		||||
@ -1 +0,0 @@
 | 
			
		||||
Added automated customization options. Config needs to be updated to be able to use it.
 | 
			
		||||
		Reference in New Issue
	
	Block a user