Merge pull request #1 from Estivador/fix/upgrade_to_traeffik_2

Fix/upgrade to traeffik 2

LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 Daniel Huisman
+Copyright (c) 2018 Daniel Huisman, (c) 2020 Reinholds Zviedris
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,6 +1,6 @@
 # Traefik Certificate Extractor
 
-Tool to extract Let's Encrypt certificates from [Traefik](https://traefik.io/)'s ACME storage file. Can automatically restart containers using the Docker API.
+Tool to extract Let's Encrypt certificates from [Traefik](https://traefik.io/)'s ACME storage file. Compatible with Traefik v1 and v2. Can automatically restart containers using the Docker API.
 
 Originaly developed by [Daniel Huisman](https://github.com/DanielHuisman/traefik-certificate-extractor) and improved by [Marc Brückner](https://github.com/SnowMB).
 

extractor.py

@@ -89,6 +89,15 @@ def createCerts(args):
     # Read JSON file
     data = json.loads(open(args.certificate).read())
 
+    # Determine Traefik version, extract data dictonary
+    key = 'Account'
+    if not key in data:
+        root_key = list(data.keys())[0]
+        data = data[root_key]
+        traefik_version = 2
+    else:
+        traefik_version = 1
+
     # Determine ACME version
     acme_version = 2 if 'acme-v02' in data['Account']['Registration']['uri'] else 1
 
@@ -107,11 +116,19 @@ def createCerts(args):
             privatekey = c['Certificate']['PrivateKey']
             fullchain = c['Certificate']['Certificate']
             sans = c['Domains']['SANs']
-        elif acme_version == 2:
+        elif acme_version == 2 and traefik_version == 1:
             name = c['Domain']['Main']
             privatekey = c['Key']
             fullchain = c['Certificate']
             sans = c['Domain']['SANs']
+        elif acme_version and traefik_version == 2:
+            name = c['domain']['main']
+            privatekey = c['key']
+            fullchain = c['certificate']
+            if 'sans' in c['domain']:
+                sans = c['domain']['sans']
+            else:
+                sans = None
 
         if (args.include and name not in args.include) or (args.exclude and name in args.exclude):
             continue

start_extractor.bash

@@ -0,0 +1,7 @@
+#!/usr/bin/bash
+
+docker run --name extractor -d \
+  -v /opt/traefik:/app/data \
+  -v ${PWD}/certs:/app/certs \
+  -v /var/run/docker.socket:/var/run/docker.socket \
+  estivadorio/traefik-certificate-extractor