Compare commits
	
		
			8 Commits
		
	
	
		
			qbit
			...
			revert-log
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 5e4ba7f327 | |||
| e21dbc655a | |||
| b9d825b5c5 | |||
| 74b3ee6716 | |||
| 14d5d79520 | |||
| 7185e6ab43 | |||
| 85d0c159b0 | |||
| 6294944952 | 
@ -10,6 +10,7 @@ LETS_ENCRYPT_EMAIL=certs@example.com
 | 
				
			|||||||
# DASHBOARD_ENABLED=true
 | 
					# DASHBOARD_ENABLED=true
 | 
				
			||||||
# WARN, INFO etc.
 | 
					# WARN, INFO etc.
 | 
				
			||||||
LOG_LEVEL=WARN
 | 
					LOG_LEVEL=WARN
 | 
				
			||||||
 | 
					LOG_MAX_AGE=0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# This is here so later lines can extend it; you likely don't wanna edit
 | 
					# This is here so later lines can extend it; you likely don't wanna edit
 | 
				
			||||||
COMPOSE_FILE="compose.yml"
 | 
					COMPOSE_FILE="compose.yml"
 | 
				
			||||||
@ -147,7 +148,3 @@ COMPOSE_FILE="compose.yml"
 | 
				
			|||||||
# NOTE(3wc): as of 2024-04-01 only the `icecast` recipe uses this
 | 
					# NOTE(3wc): as of 2024-04-01 only the `icecast` recipe uses this
 | 
				
			||||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.web-alt.yml"
 | 
					#COMPOSE_FILE="$COMPOSE_FILE:compose.web-alt.yml"
 | 
				
			||||||
#WEB_ALT_ENABLED=1
 | 
					#WEB_ALT_ENABLED=1
 | 
				
			||||||
 | 
					 | 
				
			||||||
## Qbit
 | 
					 | 
				
			||||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.qbit.yml"
 | 
					 | 
				
			||||||
#QBIT_ENABLED=1
 | 
					 | 
				
			||||||
 | 
				
			|||||||
@ -1,8 +0,0 @@
 | 
				
			|||||||
version: "3.8"
 | 
					 | 
				
			||||||
services:
 | 
					 | 
				
			||||||
  app:
 | 
					 | 
				
			||||||
    environment:
 | 
					 | 
				
			||||||
      - QBIT_ENABLED
 | 
					 | 
				
			||||||
    ports:
 | 
					 | 
				
			||||||
      - "6881:6881/udp"
 | 
					 | 
				
			||||||
      - "6881:6881/tcp"
 | 
					 | 
				
			||||||
@ -3,7 +3,7 @@ version: "3.8"
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
services:
 | 
					services:
 | 
				
			||||||
  app:
 | 
					  app:
 | 
				
			||||||
    image: "traefik:v2.11.10"
 | 
					    image: "traefik:v2.11.14"
 | 
				
			||||||
    # Note(decentral1se): *please do not* add any additional ports here.
 | 
					    # Note(decentral1se): *please do not* add any additional ports here.
 | 
				
			||||||
    # Doing so could break new installs with port conflicts. Please use
 | 
					    # Doing so could break new installs with port conflicts. Please use
 | 
				
			||||||
    # the usual `compose.$app.yml` approach for any additional ports
 | 
					    # the usual `compose.$app.yml` approach for any additional ports
 | 
				
			||||||
@ -27,6 +27,7 @@ services:
 | 
				
			|||||||
    environment:
 | 
					    environment:
 | 
				
			||||||
      - DASHBOARD_ENABLED
 | 
					      - DASHBOARD_ENABLED
 | 
				
			||||||
      - LOG_LEVEL
 | 
					      - LOG_LEVEL
 | 
				
			||||||
 | 
					      - LOG_MAX_AGE=${LOG_MAX_AGE:0}
 | 
				
			||||||
    healthcheck:
 | 
					    healthcheck:
 | 
				
			||||||
      test: ["CMD", "traefik", "healthcheck"]
 | 
					      test: ["CMD", "traefik", "healthcheck"]
 | 
				
			||||||
      interval: 30s
 | 
					      interval: 30s
 | 
				
			||||||
@ -47,12 +48,12 @@ services:
 | 
				
			|||||||
        - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
 | 
					        - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
 | 
				
			||||||
        - "traefik.http.routers.${STACK_NAME}.service=api@internal"
 | 
					        - "traefik.http.routers.${STACK_NAME}.service=api@internal"
 | 
				
			||||||
        - "traefik.http.routers.${STACK_NAME}.middlewares=security@file"
 | 
					        - "traefik.http.routers.${STACK_NAME}.middlewares=security@file"
 | 
				
			||||||
        - "coop-cloud.${STACK_NAME}.version=2.8.0+v2.11.10"
 | 
					        - "coop-cloud.${STACK_NAME}.version=3.1.0+v2.11.14"
 | 
				
			||||||
        - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
 | 
					        - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
 | 
				
			||||||
        - "backupbot.backup=${ENABLE_BACKUPS:-true}"
 | 
					        - "backupbot.backup=${ENABLE_BACKUPS:-true}"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  socket-proxy:
 | 
					  socket-proxy:
 | 
				
			||||||
    image: lscr.io/linuxserver/socket-proxy:1.26.2-r0-ls26
 | 
					    image: lscr.io/linuxserver/socket-proxy:1.26.2-r0-ls30
 | 
				
			||||||
    environment:
 | 
					    environment:
 | 
				
			||||||
      - ALLOW_START=0
 | 
					      - ALLOW_START=0
 | 
				
			||||||
      - ALLOW_STOP=0
 | 
					      - ALLOW_STOP=0
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										1
									
								
								release/2.9.0+v2.11.14
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								release/2.9.0+v2.11.14
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1 @@
 | 
				
			|||||||
 | 
					Closes Security Issue https://github.com/traefik/traefik/security/advisories/GHSA-h924-8g65-j9wg
 | 
				
			||||||
							
								
								
									
										1
									
								
								release/3.1.0+v2.11.14
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								release/3.1.0+v2.11.14
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1 @@
 | 
				
			|||||||
 | 
					Adds log retention configuration option
 | 
				
			||||||
@ -1,6 +1,8 @@
 | 
				
			|||||||
---
 | 
					---
 | 
				
			||||||
log:
 | 
					log:
 | 
				
			||||||
  level: {{ env "LOG_LEVEL" }}
 | 
					  level: {{ env "LOG_LEVEL" }}
 | 
				
			||||||
 | 
					  maxAge: {{ env "LOG_MAX_AGE" }}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
providers:
 | 
					providers:
 | 
				
			||||||
  docker:
 | 
					  docker:
 | 
				
			||||||
@ -79,12 +81,6 @@ entrypoints:
 | 
				
			|||||||
  matrix-federation:
 | 
					  matrix-federation:
 | 
				
			||||||
    address: ":9001"
 | 
					    address: ":9001"
 | 
				
			||||||
  {{ end }}
 | 
					  {{ end }}
 | 
				
			||||||
  {{ if eq (env "QBIT_ENABLED") "1" }}
 | 
					 | 
				
			||||||
  qbit:
 | 
					 | 
				
			||||||
    address: ":6881"
 | 
					 | 
				
			||||||
  qbit-udp:
 | 
					 | 
				
			||||||
    address: ":6881/udp"
 | 
					 | 
				
			||||||
  {{ end }}
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
ping:
 | 
					ping:
 | 
				
			||||||
  entryPoint: web
 | 
					  entryPoint: web
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user