From 0fb1da0490d840eddccf87668a4c095d8905325c Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 26 Jan 2017 15:41:56 +0100
Subject: Move and adapt letsencrypt.sh → dehydrated.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
dehydrated/conf.d/secp384r1.sh | 2 ++
dehydrated/conf.d/staging.sh | 2 ++
dehydrated/cron.weekly/local-dehydrated | 23 +++++++++++++++++++++++
letsencrypt.sh/conf.d/secp384r1.sh | 2 --
letsencrypt.sh/conf.d/staging.sh | 2 --
letsencrypt.sh/cron.weekly/local-letsencrypt.sh | 23 -----------------------
6 files changed, 27 insertions(+), 27 deletions(-)
create mode 100644 dehydrated/conf.d/secp384r1.sh
create mode 100644 dehydrated/conf.d/staging.sh
create mode 100755 dehydrated/cron.weekly/local-dehydrated
delete mode 100644 letsencrypt.sh/conf.d/secp384r1.sh
delete mode 100644 letsencrypt.sh/conf.d/staging.sh
delete mode 100755 letsencrypt.sh/cron.weekly/local-letsencrypt.sh
diff --git a/dehydrated/conf.d/secp384r1.sh b/dehydrated/conf.d/secp384r1.sh
new file mode 100644
index 0000000..7969796
--- /dev/null
+++ b/dehydrated/conf.d/secp384r1.sh
@@ -0,0 +1,2 @@
+# Use NIST P-384 as public key algorithm
+KEY_ALGO=secp384r1
diff --git a/dehydrated/conf.d/staging.sh b/dehydrated/conf.d/staging.sh
new file mode 100644
index 0000000..edf55e9
--- /dev/null
+++ b/dehydrated/conf.d/staging.sh
@@ -0,0 +1,2 @@
+# Use staging service
+CA="https://acme-staging.api.letsencrypt.org/directory"
diff --git a/dehydrated/cron.weekly/local-dehydrated b/dehydrated/cron.weekly/local-dehydrated
new file mode 100755
index 0000000..e07e5d9
--- /dev/null
+++ b/dehydrated/cron.weekly/local-dehydrated
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# Renew letsencrypt certificates
+
+set -eu
+
+# update certdomain certs
+dehydrated --cron
+
+# update non-EC maildomain cert if resolvable and not clashing with certdomain
+maildomain=$(cat /etc/local-REDPILL/$(cat /etc/local-ORG/realm)/mailhost)
+fqdn=$(hostname --fqdn)
+[ -z "$fqdn" ] \
+ || [ "$maildomain" = "$fqdn" ] \
+ || extradomains=${extradomains:+$extradomains }$fqdn
+domain=$(hostname --domain)
+[ -z "$domain" ] \
+ || [ "$maildomain" = "$domain" ] \
+ || [ "$fqdn" = "$domain" ] \
+ || extradomains=${extradomains:+$extradomains }$domain
+[ -z "$maildomain" ] \
+ || grep ^"$maildomain" /etc/dehydrated/domains.txt \
+ || dehydrated --cron --domain "$maildomain $extradomains" --algo rsa
diff --git a/letsencrypt.sh/conf.d/secp384r1.sh b/letsencrypt.sh/conf.d/secp384r1.sh
deleted file mode 100644
index 7969796..0000000
--- a/letsencrypt.sh/conf.d/secp384r1.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-# Use NIST P-384 as public key algorithm
-KEY_ALGO=secp384r1
diff --git a/letsencrypt.sh/conf.d/staging.sh b/letsencrypt.sh/conf.d/staging.sh
deleted file mode 100644
index a2e050d..0000000
--- a/letsencrypt.sh/conf.d/staging.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-# Use stafing service
-CA="https://acme-staging.api.letsencrypt.org/directory"
diff --git a/letsencrypt.sh/cron.weekly/local-letsencrypt.sh b/letsencrypt.sh/cron.weekly/local-letsencrypt.sh
deleted file mode 100755
index 0600730..0000000
--- a/letsencrypt.sh/cron.weekly/local-letsencrypt.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-#
-# Renew letsencrypt certificates
-
-set -eu
-
-# update certdomain certs
-letsencrypt.sh --cron
-
-# update non-EC maildomain cert if resolvable and not clashing with certdomain
-maildomain=$(cat /etc/local-REDPILL/$(cat /etc/local-ORG/realm)/mailhost)
-fqdn=$(hostname --fqdn)
-[ -z "$fqdn" ] \
- || [ "$maildomain" = "$fqdn" ] \
- || extradomains=${extradomains:+$extradomains }$fqdn
-domain=$(hostname --domain)
-[ -z "$domain" ] \
- || [ "$maildomain" = "$domain" ] \
- || [ "$fqdn" = "$domain" ] \
- || extradomains=${extradomains:+$extradomains }$domain
-[ -z "$maildomain" ] \
- || grep ^"$maildomain" /etc/letsencrypt.sh/domains.txt \
- || letsencrypt.sh --cron --domain "$maildomain $extradomains" --algo rsa
--
cgit v1.2.3