Move acme-client.conf to examples. Since we no longer store the

agreement url in here we no longer need to updated it all the time.
OK deraadt

3 files changed, 22 insertions, 23 deletions

diff --git a/etc/Makefile b/etc/Makefile
index d233ab07903..f0043223424 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.465 2018/07/24 18:15:30 jasper Exp $
+#	$OpenBSD: Makefile,v 1.466 2019/01/08 07:14:10 florian Exp $
 
 .include <bsd.own.mk>
 
@@ -39,13 +39,13 @@ kernels: ${ALL_KERNELS}
 # -rw-r--r--
 BINOWN= root
 BINGRP= wheel
-MUTABLE=acme-client.conf changelist daily etc.${MACHINE}/disktab \
+MUTABLE=changelist daily etc.${MACHINE}/disktab \
 	etc.${MACHINE}/login.conf ftpusers gettytab group ksh.kshrc locate.rc \
 	mailer.conf moduli monthly netstart newsyslog.conf ntpd.conf \
 	pf.os protocols rc rc.conf rpc services shells syslog.conf weekly
 
 # -rw-r--r--
-EXAMPLES=chio.conf dhclient.conf dhcpd.conf exports \
+EXAMPLES=acme-client.conf chio.conf dhclient.conf dhcpd.conf exports \
 	httpd.conf ifstated.conf inetd.conf man.conf mixerctl.conf \
 	mrouted.conf ntpd.conf printcap rad.conf rbootd.conf \
 	remote sensorsd.conf wsconsctl.conf
diff --git a/etc/acme-client.conf b/etc/acme-client.conf
deleted file mode 100644
index 1fdd4a52b43..00000000000
--- a/etc/acme-client.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# $OpenBSD: acme-client.conf,v 1.7 2018/04/13 08:24:38 ajacoutot Exp $
-#
-authority letsencrypt {
-	api url "https://acme-v01.api.letsencrypt.org/directory"
-	account key "/etc/acme/letsencrypt-privkey.pem"
-}
-
-authority letsencrypt-staging {
-	api url "https://acme-staging.api.letsencrypt.org/directory"
-	account key "/etc/acme/letsencrypt-staging-privkey.pem"
-}
-
-#domain example.com {
-#	alternative names { secure.example.com }
-#	domain key "/etc/ssl/private/example.com.key"
-#	domain certificate "/etc/ssl/example.com.crt"
-#	domain full chain certificate "/etc/ssl/example.com.fullchain.pem"
-#	sign with letsencrypt
-#}
diff --git a/etc/examples/acme-client.conf b/etc/examples/acme-client.conf
new file mode 100644
index 00000000000..53bc65e17f3
--- /dev/null
+++ b/etc/examples/acme-client.conf
@@ -0,0 +1,19 @@
+#
+# $OpenBSD: acme-client.conf,v 1.1 2019/01/08 07:14:10 florian Exp $
+#
+authority letsencrypt {
+	api url "https://acme-v01.api.letsencrypt.org/directory"
+	account key "/etc/acme/letsencrypt-privkey.pem"
+}
+
+authority letsencrypt-staging {
+	api url "https://acme-staging.api.letsencrypt.org/directory"
+	account key "/etc/acme/letsencrypt-staging-privkey.pem"
+}
+
+domain example.com {
+	alternative names { secure.example.com }
+	domain key "/etc/ssl/private/example.com.key"
+	domain full chain certificate "/etc/ssl/example.com.fullchain.pem"
+	sign with letsencrypt
+}