|
@@ -11,6 +11,8 @@ parser.add_argument('--name', help='Name of the docker host to request certifica
|
11
|
11
|
parser.add_argument('--etcd-port', type=int, help='Port to connect to etcd on', default=2379)
|
12
|
12
|
parser.add_argument('--etcd-host', help='Host to connect to etcd on', default='etcd')
|
13
|
13
|
parser.add_argument('--etcd-prefix', help='Prefix to use when retrieving keys from etcd', default='/docker')
|
|
14
|
+parser.add_argument('--cert-path', help='Path to use for certificates. Use "%s" for hostname', default='/letsencrypt/certs/%s/fullchain.pem')
|
|
15
|
+parser.add_argument('--cert-key-path', help='Path to use for certificate private keys. Use "%s" for hostname', default='/letsencrypt/certs/%s/privkey.pem')
|
14
|
16
|
args = parser.parse_args()
|
15
|
17
|
|
16
|
18
|
jinja_env = jinja2.Environment(loader=jinja2.FileSystemLoader('/'))
|
|
@@ -19,15 +21,17 @@ fetcher = etcdlib.Connection(args.etcd_host, args.etcd_port, args.etcd_prefix)
|
19
|
21
|
|
20
|
22
|
while True:
|
21
|
23
|
services = []
|
22
|
|
- domains = fetcher.get_label('com.chameth.vhost')
|
|
24
|
+ domains = {k: v.split(',') for k, v in fetcher.get_label('com.chameth.vhost').items()}
|
23
|
25
|
protocols = fetcher.get_label('com.chameth.proxy.protocol')
|
24
|
26
|
for container, values in fetcher.get_label('com.chameth.proxy').items():
|
25
|
27
|
networks = fetcher.get_networks(container)
|
26
|
28
|
services.append({
|
27
|
29
|
'protocol': protocols[container] if container in protocols else 'http',
|
28
|
|
- 'vhosts': domains[container].split(','),
|
|
30
|
+ 'vhosts': domains[container],
|
29
|
31
|
'host': next(iter(networks.values())), # TODO: Pick a bridge sensibly?
|
30
|
|
- 'port': values
|
|
32
|
+ 'port': values,
|
|
33
|
+ 'certificate': args.cert_path % domains[container][0],
|
|
34
|
+ 'certificate_key': args.cert_key_path % domains[container][0]
|
31
|
35
|
})
|
32
|
36
|
|
33
|
37
|
print(template.render(services=services)) # TODO: Actually write it out
|