Compare commits
	
		
			1 Commits
		
	
	
		
			feature/ir
			...
			qbit
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 2814f36676 | 
| @ -34,7 +34,7 @@ steps: | |||||||
|         from_secret: drone_abra-bot_token |         from_secret: drone_abra-bot_token | ||||||
|       fork: true |       fork: true | ||||||
|       repositories: |       repositories: | ||||||
|         - toolshed/auto-recipes-catalogue-json |         - coop-cloud/auto-recipes-catalogue-json | ||||||
|  |  | ||||||
| trigger: | trigger: | ||||||
|   event: tag |   event: tag | ||||||
|  | |||||||
| @ -148,6 +148,6 @@ COMPOSE_FILE="compose.yml" | |||||||
| #COMPOSE_FILE="$COMPOSE_FILE:compose.web-alt.yml" | #COMPOSE_FILE="$COMPOSE_FILE:compose.web-alt.yml" | ||||||
| #WEB_ALT_ENABLED=1 | #WEB_ALT_ENABLED=1 | ||||||
|  |  | ||||||
| ## Matrix | ## Qbit | ||||||
| #COMPOSE_FILE="$COMPOSE_FILE:compose.irc.yml" | #COMPOSE_FILE="$COMPOSE_FILE:compose.qbit.yml" | ||||||
| #IRC_ENABLED=1 | #QBIT_ENABLED=1 | ||||||
|  | |||||||
| @ -1,7 +0,0 @@ | |||||||
| version: "3.8" |  | ||||||
| services: |  | ||||||
|   app: |  | ||||||
|     environment: |  | ||||||
|       - IRC_ENABLED |  | ||||||
|     ports: |  | ||||||
|       - "6697:6697" |  | ||||||
							
								
								
									
										8
									
								
								compose.qbit.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										8
									
								
								compose.qbit.yml
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,8 @@ | |||||||
|  | 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.25" |     image: "traefik:v2.11.10" | ||||||
|     # 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 | ||||||
| @ -47,14 +47,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=3.1.1+v2.11.25" |         - "coop-cloud.${STACK_NAME}.version=2.8.0+v2.11.10" | ||||||
|         - "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-ls30 |     image: lscr.io/linuxserver/socket-proxy:1.26.2-r0-ls26 | ||||||
|     deploy: |  | ||||||
|       endpoint_mode: dnsrr |  | ||||||
|     environment: |     environment: | ||||||
|       - ALLOW_START=0 |       - ALLOW_START=0 | ||||||
|       - ALLOW_STOP=0 |       - ALLOW_STOP=0 | ||||||
|  | |||||||
| @ -1 +0,0 @@ | |||||||
| Closes Security Issue https://github.com/traefik/traefik/security/advisories/GHSA-h924-8g65-j9wg |  | ||||||
| @ -1 +0,0 @@ | |||||||
| Reverts max log retention |  | ||||||
| @ -1,2 +0,0 @@ | |||||||
| socket-proxy: switch to endpoint-mode dnsrr instead of vip |  | ||||||
| See https://git.coopcloud.tech/coop-cloud/traefik/pulls/50. |  | ||||||
| @ -68,10 +68,6 @@ entrypoints: | |||||||
|   compy: |   compy: | ||||||
|     address: ":9999" |     address: ":9999" | ||||||
|   {{ end }} |   {{ end }} | ||||||
|   {{ if eq (env "IRC_ENABLED") "1" }} |  | ||||||
|   irc: |  | ||||||
|     address: ":6697" |  | ||||||
|   {{ end }} |  | ||||||
|   {{ if eq (env "METRICS_ENABLED") "1" }} |   {{ if eq (env "METRICS_ENABLED") "1" }} | ||||||
|   metrics: |   metrics: | ||||||
|     address: ":8082" |     address: ":8082" | ||||||
| @ -83,6 +79,12 @@ 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
	