Compare commits
	
		
			21 Commits
		
	
	
		
			3.4.2+v3.4
			...
			3.6.2+v3.4
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 7ede5f7cc6 | |||
| 8b06144f54 | |||
| 6c6b5c66ca | |||
| 993ed9cf09 | |||
| 1c2302b288 | |||
| 27d5c092de | |||
| 88e1a67146 | |||
| 7e7422a593 | |||
| 304915a396 | |||
| a3ab012d55 | |||
| f2e746344e | |||
| 1ec509eee8 | |||
| 52c2cbf7ec | |||
| b8303290de | |||
| 445feab87c | |||
| b8aa102a01 | |||
| 2db1a03d94 | |||
| c7e510fbad | |||
| f7087646b1 | |||
| 8d7f9bd6a2 | |||
| 01c5b2a3a4 | 
							
								
								
									
										16
									
								
								.env.sample
									
									
									
									
									
								
							
							
						
						
									
										16
									
								
								.env.sample
									
									
									
									
									
								
							| @ -10,6 +10,7 @@ LETS_ENCRYPT_EMAIL=certs@example.com | ||||
| # DASHBOARD_ENABLED=true | ||||
| # WARN, INFO etc. | ||||
| LOG_LEVEL=WARN | ||||
| LOG_MAX_AGE=1 | ||||
|  | ||||
| # This is here so later lines can extend it; you likely don't wanna edit | ||||
| COMPOSE_FILE="compose.yml" | ||||
| @ -58,6 +59,17 @@ COMPOSE_FILE="compose.yml" | ||||
| #DIGITALOCEAN_ENABLED=1 | ||||
| #SECRET_DIGITALOCEAN_AUTH_TOKEN_VERSION=v1 | ||||
|  | ||||
| ## Azure, https://azure.com | ||||
| ## To insert your Azure client secret: | ||||
| ## abra app secret insert {myapp.example.coop} azure_secret v1 "<CLIENT_SECRET>" | ||||
| #COMPOSE_FILE="$COMPOSE_FILE:compose.azure.yml" | ||||
| #AZURE_ENABLED=1 | ||||
| #AZURE_TENANT_ID= | ||||
| #AZURE_CLIENT_ID= | ||||
| #AZURE_SUBSCRIPTION_ID= | ||||
| #AZURE_RESOURCE_GROUP= | ||||
| #SECRET_AZURE_SECRET_VERSION=v1 | ||||
|  | ||||
| ##################################################################### | ||||
| # Manual wildcard certificate insertion                             # | ||||
| ##################################################################### | ||||
| @ -151,3 +163,7 @@ COMPOSE_FILE="compose.yml" | ||||
| ## Matrix | ||||
| #COMPOSE_FILE="$COMPOSE_FILE:compose.irc.yml" | ||||
| #IRC_ENABLED=1 | ||||
|  | ||||
| ## Garage | ||||
| #COMPOSE_FILE="$COMPOSE_FILE:compose.garage.yml" | ||||
| #GARAGE_RPC_ENABLED=1 | ||||
							
								
								
									
										4
									
								
								abra.sh
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								abra.sh
									
									
									
									
									
								
							| @ -1,3 +1,3 @@ | ||||
| export TRAEFIK_YML_VERSION=v23 | ||||
| export TRAEFIK_YML_VERSION=v24 | ||||
| export FILE_PROVIDER_YML_VERSION=v10 | ||||
| export ENTRYPOINT_VERSION=v4 | ||||
| export ENTRYPOINT_VERSION=v5 | ||||
|  | ||||
							
								
								
									
										17
									
								
								compose.azure.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										17
									
								
								compose.azure.yml
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,17 @@ | ||||
| version: "3.8" | ||||
|  | ||||
| services: | ||||
|   app: | ||||
|     environment: | ||||
|       - AZURE_TENANT_ID | ||||
|       - AZURE_CLIENT_ID | ||||
|       - AZURE_SUBSCRIPTION_ID | ||||
|       - AZURE_RESOURCE_GROUP | ||||
|       - AZURE_CLIENT_SECRET_FILE=/run/secrets/azure_secret | ||||
|     secrets: | ||||
|       - azure_secret | ||||
|  | ||||
| secrets: | ||||
|   azure_secret: | ||||
|     name: ${STACK_NAME}_azure_secret_${SECRET_AZURE_SECRET_VERSION} | ||||
|     external: true | ||||
							
								
								
									
										7
									
								
								compose.garage.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								compose.garage.yml
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,7 @@ | ||||
| version: "3.8" | ||||
| services: | ||||
|   app: | ||||
|     environment: | ||||
|       - GARAGE_RPC_ENABLED | ||||
|     ports: | ||||
|       - "3901:3901" | ||||
| @ -27,6 +27,7 @@ services: | ||||
|     environment: | ||||
|       - DASHBOARD_ENABLED | ||||
|       - LOG_LEVEL | ||||
|       - ${LOG_MAX_AGE:-0} | ||||
|     healthcheck: | ||||
|       test: ["CMD", "traefik", "healthcheck"] | ||||
|       interval: 30s | ||||
| @ -47,7 +48,7 @@ services: | ||||
|         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}" | ||||
|         - "traefik.http.routers.${STACK_NAME}.service=api@internal" | ||||
|         - "traefik.http.routers.${STACK_NAME}.middlewares=security@file" | ||||
|         - "coop-cloud.${STACK_NAME}.version=3.4.2+v3.4.5" | ||||
|         - "coop-cloud.${STACK_NAME}.version=3.6.2+v3.4.5" | ||||
|         - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}" | ||||
|         - "backupbot.backup=${ENABLE_BACKUPS:-true}" | ||||
|  | ||||
|  | ||||
| @ -11,4 +11,8 @@ export OVH_APPLICATION_SECRET=$(cat "$OVH_APPLICATION_SECRET_FILE") | ||||
| export DO_AUTH_TOKEN=$(cat "$DO_AUTH_TOKEN_FILE") | ||||
| {{ end }} | ||||
|  | ||||
| {{ if eq (env "AZURE_ENABLED") "1" }} | ||||
| export AZURE_CLIENT_SECRET=$(cat "$AZURE_CLIENT_SECRET_FILE") | ||||
| {{ end }} | ||||
|  | ||||
| /entrypoint.sh "$@" | ||||
|  | ||||
							
								
								
									
										1
									
								
								release/3.5.0+v3.4.5
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								release/3.5.0+v3.4.5
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1 @@ | ||||
| Add support to azure DNS-01 acme challenge | ||||
							
								
								
									
										1
									
								
								release/3.6.0+v3.4.5
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								release/3.6.0+v3.4.5
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1 @@ | ||||
| Expose log_max_age option. This option controls Traefik's maximum retention for log files in number of days. By default (when LOG_MAX_AGE=0), files are not removed based on age. | ||||
| @ -4,6 +4,7 @@ core: | ||||
|   | ||||
| log: | ||||
|   level: {{ env "LOG_LEVEL" }} | ||||
|   maxAge: {{ env "LOG_MAX_AGE" }} | ||||
|  | ||||
| providers: | ||||
|   swarm: | ||||
| @ -36,6 +37,10 @@ entrypoints: | ||||
|   gitea-ssh: | ||||
|     address: ":2222" | ||||
|   {{ end }} | ||||
|   {{ if eq (env "GARAGE_RPC_ENABLED") "1" }} | ||||
|   garage-rpc: | ||||
|     address: ":3901" | ||||
|   {{ end }} | ||||
|   {{ if eq (env "FOODSOFT_SMTP_ENABLED") "1" }} | ||||
|   foodsoft-smtp: | ||||
|     address: ":2525" | ||||
|  | ||||
		Reference in New Issue
	
	Block a user