Merge pull request #70 from jjijack/patch-1

Update deploy_freenas.py

Author: danb35

deploy_config.example

@@ -24,12 +24,12 @@ password = YourSuperSecurePassword#@#$*
 
 # privkey_path is the path to the certificate private key on your system.  Default
 # assumes you're using acme.sh:
-# /root/.acme.sh/cert_fqdn/cert_fqdn.key
+# /root/.acme.sh/cert_fqdn/cert_fqdn.key or /root/.acme.sh/cert_fqdn_ecc/cert_fqdn.key
 # privkey_path = /some/other/path
 
 # fullchain_path is the path to the full chain (leaf cert + intermediate certs)
 # on your system.  Default assumes you're using acme.sh:
-# /root/.acme.sh/cert_fqdn/fullchain.cer
+# /root/.acme.sh/cert_fqdn/fullchain.cer or /root/.acme.sh/cert_fqdn_ecc/fullchain.cer
 # fullchain_path = /some/other/other/path
 
 # protocol sets the connection protocol, http or https.  Include '://' at the end.

deploy_freenas.py

@@ -50,7 +50,11 @@
 FREENAS_ADDRESS = deploy.get('connect_host','localhost')
 VERIFY = deploy.getboolean('verify',fallback=False)
 PRIVATEKEY_PATH = deploy.get('privkey_path',"/root/.acme.sh/" + DOMAIN_NAME + "/" + DOMAIN_NAME + ".key")
+if os.path.isfile(PRIVATEKEY_PATH)==False:
+  PRIVATEKEY_PATH = deploy.get('privkey_path',"/root/.acme.sh/" + DOMAIN_NAME + "_ecc/" + DOMAIN_NAME + ".key")
 FULLCHAIN_PATH = deploy.get('fullchain_path',"/root/.acme.sh/" + DOMAIN_NAME + "/fullchain.cer")
+if os.path.isfile(FULLCHAIN_PATH)==False:
+  FULLCHAIN_PATH = deploy.get('fullchain_path',"/root/.acme.sh/" + DOMAIN_NAME + "_ecc/fullchain.cer")
 PROTOCOL = deploy.get('protocol','http://')
 PORT = deploy.get('port','80')
 UI_CERTIFICATE_ENABLED = deploy.getboolean('ui_certificate_enabled',fallback=True)