diff --git a/src/etc/Makefile b/src/etc/Makefile index d233ab07..f0043223 100644 --- a/src/etc/Makefile +++ b/src/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 @@ -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/src/etc/acme-client.conf b/src/etc/acme-client.conf deleted file mode 100644 index 1fdd4a52..00000000 --- a/src/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/src/etc/examples/acme-client.conf b/src/etc/examples/acme-client.conf new file mode 100644 index 00000000..53bc65e1 --- /dev/null +++ b/src/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 +}