From fba83415c7b51b9a0c12ea5c2d22320b7ecda6b0 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Tue, 1 Jun 2021 16:52:52 +0200 Subject: [PATCH] bundles/letsencrypt: prepare for arch linux --- bundles/letsencrypt/items.py | 5 +++-- bundles/letsencrypt/metadata.py | 10 ++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/bundles/letsencrypt/items.py b/bundles/letsencrypt/items.py index 9a6f0ca..585cf8e 100644 --- a/bundles/letsencrypt/items.py +++ b/bundles/letsencrypt/items.py @@ -1,7 +1,8 @@ repo.libs.tools.require_bundle(node, 'nginx', 'letsencrypt bundle needs nginx for http challenge') -pkg_apt = { - 'dehydrated': {}, +directories = { + '/etc/dehydrated/conf.d': {}, + '/var/lib/dehydrated/acme-challenges': {}, } actions = { diff --git a/bundles/letsencrypt/metadata.py b/bundles/letsencrypt/metadata.py index 9e22365..d735ccb 100644 --- a/bundles/letsencrypt/metadata.py +++ b/bundles/letsencrypt/metadata.py @@ -1,6 +1,16 @@ defaults = { + 'apt': { + 'packages': { + 'dehydrated': {}, + }, + }, 'cron': { 'letsencrypt_renew': '{} 4 * * * root /usr/bin/dehydrated --cron --accept-terms --challenge http-01 > /dev/null'.format((node.magic_number % 60)), 'letsencrypt_cleanup': '{} 4 * * 0 root /usr/bin/dehydrated --cleanup > /dev/null'.format((node.magic_number % 60)), }, + 'pacman': { + 'packages': { + 'dehydrated': {}, + }, + }, }