moepman/acertmgr
1
0
Fork 0
mirror of https://github.com/moepman/acertmgr.git synced 2024-11-14 17:25:26 +01:00
Code Releases Activity

Make key location dynamic

Browse Source 
Besides the fact that this removes redundant code, hard coded location
of file is generally no good idea

Also adapt README.md and provide a default location for key files.

Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
This commit is contained in:
Ralf Ramsauer 2016-04-10 01:10:33 +02:00
parent f6f3180617
commit 35d9d39b26
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -52,6 +52,12 @@ All configuration files use yaml syntax.
mode: webdir mode: webdir
#mode: standalone #mode: standalone
#port: 13135 #port: 13135
# Optional: account_key location. This defaults to "/etc/acme/account.key"
account_key: "/etc/acme/acc.key"
# Optional: server_key location. This defaults to "/etc/acme/server.key"
server_key: "/etc/acme/serv.key"
webdir: /var/www/acme-challenge/ webdir: /var/www/acme-challenge/
authority: "https://acme-v01.api.letsencrypt.org" authority: "https://acme-v01.api.letsencrypt.org"
#authority: "https://acme-staging.api.letsencrypt.org" #authority: "https://acme-staging.api.letsencrypt.org"

19
acertmgr.py
View File

@ -24,6 +24,8 @@ ACME_DIR="/etc/acme"
ACME_CONF=os.path.join(ACME_DIR, "acme.conf") ACME_CONF=os.path.join(ACME_DIR, "acme.conf")
ACME_CONFD=os.path.join(ACME_DIR, "domains.d") ACME_CONFD=os.path.join(ACME_DIR, "domains.d")
ACME_DEFAULT_SERVER_KEY = os.path.join(ACME_DIR, "server.key")
ACME_DEFAULT_ACCOUNT_KEY = os.path.join(ACME_DIR, "account.key")
class FileNotFoundError(OSError): class FileNotFoundError(OSError):
pass pass
@ -71,11 +73,11 @@ def cert_get(domains, settings):
domain = domains.split(' ')[0] domain = domains.split(' ')[0]
print("Getting certificate for %s." % domain) print("Getting certificate for %s." % domain)
key_file = os.path.join(ACME_DIR, "server.key") key_file = settings['server_key']
if not os.path.isfile(key_file): if not os.path.isfile(key_file):
raise FileNotFoundError("The server key file (%s) is missing!" % key_file) raise FileNotFoundError("The server key file (%s) is missing!" % key_file)
acc_file = os.path.join(ACME_DIR, "account.key") acc_file = settings['account_key']
if not os.path.isfile(acc_file): if not os.path.isfile(acc_file):
raise FileNotFoundError("The account key file (%s) is missing!" % acc_file) raise FileNotFoundError("The account key file (%s) is missing!" % acc_file)
@ -131,7 +133,7 @@ def cert_put(domain, settings):
crt_format = settings['format'].split(",") crt_format = settings['format'].split(",")
crt_action = settings['action'] crt_action = settings['action']
key_file = os.path.join(ACME_DIR, "server.key") key_file = settings['server_key']
crt_final = os.path.join(ACME_DIR, ("%s.crt" % domain.split(' ')[0])) crt_final = os.path.join(ACME_DIR, ("%s.crt" % domain.split(' ')[0]))
with open(crt_path, "w+") as crt_fd: with open(crt_path, "w+") as crt_fd:
@ -173,8 +175,9 @@ def cert_put(domain, settings):
# @param domainconfig the domain configuration # @param domainconfig the domain configuration
# @param defaults the default configuration # @param defaults the default configuration
# @return the augmented configuration # @return the augmented configuration
def complete_config(domainconfig, defaults): def complete_config(domainconfig, globalconfig):
if defaults: defaults = globalconfig['defaults']
domainconfig['server_key'] = globalconfig['server_key']
for name, value in defaults.items(): for name, value in defaults.items():
if name not in domainconfig: if name not in domainconfig:
domainconfig[name] = value domainconfig[name] = value
@ -192,6 +195,10 @@ if __name__ == "__main__":
config = {} config = {}
if 'defaults' not in config: if 'defaults' not in config:
config['defaults'] = {} config['defaults'] = {}
if 'server_key' not in config:
config['server_key'] = ACME_DEFAULT_SERVER_KEY
if 'account_key' not in config:
config['account_key'] = ACME_DEFAULT_ACCOUNT_KEY
config['domains'] = [] config['domains'] = []
# load domain configuration # load domain configuration
@ -214,7 +221,7 @@ if __name__ == "__main__":
if not cert_isValid(crt_file, ttl_days): if not cert_isValid(crt_file, ttl_days):
cert_get(domains, config) cert_get(domains, config)
for domaincfg in domaincfgs: for domaincfg in domaincfgs:
cfg = complete_config(domaincfg, config['defaults']) cfg = complete_config(domaincfg, config)
if not target_isCurrent(cfg['path'], crt_file): if not target_isCurrent(cfg['path'], crt_file):
actions.add(cert_put(domains, cfg)) actions.add(cert_put(domains, cfg))