|
@@ -22,23 +22,30 @@ fetcher = etcdlib.Connection(args.etcd_host, args.etcd_port, args.etcd_prefix)
|
22
|
22
|
|
23
|
23
|
while True:
|
24
|
24
|
wroteConfig = False;
|
25
|
|
- services = []
|
|
25
|
+ services = {}
|
26
|
26
|
domains = {k: v.split(',') for k, v in fetcher.get_label('com.chameth.vhost').items()}
|
27
|
27
|
protocols = fetcher.get_label('com.chameth.proxy.protocol')
|
28
|
28
|
defaults = fetcher.get_label('com.chameth.proxy.default')
|
|
29
|
+ loadbalance = fetcher.get_label('com.chameth.proxy.loadbalance')
|
29
|
30
|
for container, values in fetcher.get_label('com.chameth.proxy').items():
|
30
|
31
|
networks = fetcher.get_networks(container)
|
31
|
32
|
certfile = args.cert_path % domains[container][0];
|
|
33
|
+ up = 'lb_' + loadbalance[container] if container in loadbalance else 'ct_' + container
|
32
|
34
|
if os.path.isfile(certfile):
|
33
|
|
- services.append({
|
34
|
|
- 'protocol': protocols[container] if container in protocols else 'http',
|
35
|
|
- 'vhosts': domains[container],
|
|
35
|
+ if not up in services:
|
|
36
|
+ services[up] = {
|
|
37
|
+ 'protocol': protocols[container] if container in protocols else 'http',
|
|
38
|
+ 'vhosts': domains[container],
|
|
39
|
+ 'hosts': [],
|
|
40
|
+ 'certificate': args.cert_path % domains[container][0],
|
|
41
|
+ 'trusted_certificate': args.trusted_cert_path % domains[container][0],
|
|
42
|
+ 'certificate_key': args.cert_key_path % domains[container][0],
|
|
43
|
+ 'default': container in defaults,
|
|
44
|
+ }
|
|
45
|
+
|
|
46
|
+ services[up]['hosts'].append({
|
36
|
47
|
'host': next(iter(networks.values())), # TODO: Pick a bridge sensibly?
|
37
|
48
|
'port': values,
|
38
|
|
- 'certificate': args.cert_path % domains[container][0],
|
39
|
|
- 'trusted_certificate': args.trusted_cert_path % domains[container][0],
|
40
|
|
- 'certificate_key': args.cert_key_path % domains[container][0],
|
41
|
|
- 'default': container in defaults,
|
42
|
49
|
})
|
43
|
50
|
|
44
|
51
|
if wroteConfig or len(services) > 0 or not os.path.isfile('/nginx-config/vhosts.conf'):
|