Compare commits
	
		
			2 Commits
		
	
	
		
			ef6b1d7495
			...
			3194573e2e
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 3194573e2e | |||
| f21a253ad0 | 
							
								
								
									
										49
									
								
								letsencrypt.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										49
									
								
								letsencrypt.json
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,49 @@ | ||||
| { | ||||
| 	"main": { | ||||
| 		"SERVICE_NAME": "letsencrypt", | ||||
| 		"DOMAIN": "null"  | ||||
| 	}, | ||||
| 	"networks": [ | ||||
| 		{ | ||||
| 			"NAME": "letsencrypt", | ||||
| 			"DRIVER": "bridge", | ||||
| 			"SUBNET": "172.18.254.0/24",	 | ||||
| 			"RANGE": "172.18.254.0/24", | ||||
| 			"GATEWAY": "172.18.254.1" | ||||
| 		} | ||||
| 	], | ||||
| 	"containers": [ | ||||
| 		{  | ||||
| 			"IMAGE": "registry.format.hu/neilpang/acme.sh", | ||||
| 			"NAME": "letsencrypt", | ||||
| 			"MEMORY": "64M", | ||||
| 			"IP": "172.18.254.254", | ||||
| 			"NETWORK": "letsencrypt", | ||||
| 			"VOLUMES": [ | ||||
| 				{ | ||||
| 				"SOURCE": "/etc/ssl/keys/", | ||||
| 				"DEST": "/acme.sh/", | ||||
| 				"TYPE": "rw" | ||||
| 				}, | ||||
| 				{	 | ||||
| 				"SOURCE": "/etc/user/config/domains", | ||||
| 				"DEST": "/domains", | ||||
| 				"TYPE": "ro" | ||||
| 				} | ||||
| 				], | ||||
| 			"PORTS": [ ], | ||||
| 			"ENV_FILES": [ "/etc/user/config/user.json" ], | ||||
| 			"READYNESS": [ | ||||
| 			        {"tcp": ""}, | ||||
| 			        {"HTTP": ""}, | ||||
| 				{"EXEC": "/ready.sh"} | ||||
| 				], | ||||
| 			"EXTRA": "", | ||||
| 			"DEPEND": "null", | ||||
| 			"START_ON_BOOT": "false", | ||||
| 			"CMD": "null", | ||||
| 			"PRE_START": "null", | ||||
| 			"POST_START": [ "firewall-29eexhrh" ] | ||||
| 		} | ||||
| 	] | ||||
| } | ||||
| @@ -3,15 +3,6 @@ | ||||
|                 "SERVICE_NAME": "proxy-scheduler", | ||||
|                 "DOMAIN": "null" | ||||
|         }, | ||||
|         "networks": [ | ||||
|                 { | ||||
|                         "NAME": "null", | ||||
|                         "DRIVER": "null", | ||||
|                         "SUBNET": "null", | ||||
|                         "RANGE": "null", | ||||
|                         "GATEWAY": "null" | ||||
|                 } | ||||
|         ], | ||||
|         "containers": [ | ||||
|                 { | ||||
|                         "IMAGE": "registry.format.hu/proxy-scheduler:latest", | ||||
| @@ -26,8 +17,13 @@ | ||||
|                                 "TYPE": "ro" | ||||
|                                 }, | ||||
|                                 { | ||||
|                                 "SOURCE": "/tmp/keys", | ||||
|                                 "SOURCE": "/etc/ssl/keys", | ||||
|                                 "DEST": "/keys", | ||||
|                                 "TYPE": "rw" | ||||
|                                 }, | ||||
|                                 { | ||||
|                                 "SOURCE": "/etc/ssl/certs/", | ||||
|                                 "DEST": "/etc/ssl/certs/", | ||||
|                                 "TYPE": "ro" | ||||
|                                 }, | ||||
|                                 { | ||||
| @@ -41,11 +37,6 @@ | ||||
|                                 "TYPE": "ro" | ||||
|                                 }, | ||||
|                                 { | ||||
|                                 "SOURCE": "/etc/ssl/certs", | ||||
|                                 "DEST": "/etc/ssl/certs", | ||||
|                                 "TYPE": "ro" | ||||
|                                 }, | ||||
|                                 { | ||||
|                                 "SOURCE": "/var/run/docker.sock", | ||||
|                                 "DEST": "/var/run/docker.sock", | ||||
|                                 "TYPE": "rw" | ||||
| @@ -54,11 +45,6 @@ | ||||
|                                 "SOURCE": "/usr/bin/docker", | ||||
|                                 "DEST": "/usr/bin/docker", | ||||
|                                 "TYPE": "ro" | ||||
|                                 }, | ||||
|                                 { | ||||
|                                 "SOURCE": "/home/gyurix/proxy-scheduler/scripts/scheduler.sh", | ||||
|                                 "DEST": "/scripts/scheduler.sh", | ||||
|                                 "TYPE": "ro" | ||||
|                                 } | ||||
|                                 ], | ||||
|                         "PORTS": [ ], | ||||
|   | ||||
| @@ -4,6 +4,7 @@ | ||||
| 	 | ||||
| 	DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL | ||||
| 	LETSENCRYPT_URL=$LETSENCRYPT_URL | ||||
| 	CERT_DIR=$CERT_DIR | ||||
| 	DOMAIN_DIR=$DOMAIN_DIR | ||||
| 	DOMAIN=$1 | ||||
| 	DOMAIN_CERT_DIR=$CERT_DIR/$DOMAIN | ||||
| @@ -19,8 +20,8 @@ fi | ||||
|  | ||||
| service_exec="docker run --rm \ | ||||
|  -w /services/ \ | ||||
|  -v /etc/user/config/user.json:/etc/user/config/user.json:ro \ | ||||
|  -v /etc/user/config/services/:/services/:ro \ | ||||
|  -v /etc/user/config/user.json:/etc/user/config/user.json:ro \ | ||||
|  -v /etc/user/config/services/tmp/:/services/tmp/:rw \ | ||||
|  -v /var/run/docker.sock:/var/run/docker.sock \ | ||||
|  -v /usr/bin/docker:/usr/bin/docker:ro $DOCKER_REGISTRY_URL$SETUP " | ||||
|   | ||||
| @@ -24,9 +24,9 @@ fi | ||||
|  | ||||
| service_exec="docker run --rm \ | ||||
|  -w /services/ \ | ||||
|  -v /etc/user/config/user.json:/etc/user/config/user.json:ro \ | ||||
|  -v /etc/user/config/services/:/services/:ro \ | ||||
|  -v /etc/user/config/services/tmp/:/services/tmp/:rw \ | ||||
|  -v /etc/user/config/user.json:/etc/user/config/user.json:ro \ | ||||
|  -v /var/run/docker.sock:/var/run/docker.sock \ | ||||
|  -v /usr/bin/docker:/usr/bin/docker:ro $DOCKER_REGISTRY_URL$SETUP " | ||||
|  | ||||
|   | ||||
| @@ -14,7 +14,7 @@ PROXY_CONFIG_DIR=$PROXY_CONFIG_DIR | ||||
|  | ||||
| unset IFS | ||||
|  | ||||
| inotifywait --exclude .sw -m -e CREATE,CLOSE_WRITE,DELETE -r $DOMAIN_DIR $CERT_DIR | \ | ||||
| inotifywait --exclude .sw -m -e CREATE,CLOSE_WRITE,DELETE -r $DOMAIN_DIR $CERT_DIR $PROXY_CONFIG_DIR | \ | ||||
| while read dir op file | ||||
|  | ||||
| do  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user