Remove /etc/ssl/acme/. We don't need it now that we have a default acme-conf(5)

that direclty uses /etc/ssl/{,private} by default. Adapt the httpd.conf example
accordingly.

ok florian@ benno@ millert@

diff --git a/etc/examples/httpd.conf b/etc/examples/httpd.conf
index 2b5a125..c26d4ce 100644 (file)
--- a/etc/examples/httpd.conf
+++ b/etc/examples/httpd.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: httpd.conf,v 1.16 2016/09/17 20:05:59 tj Exp $
+# $OpenBSD: httpd.conf,v 1.17 2017/04/16 08:50:49 ajacoutot Exp $
 
 #
 # Macros
@@ -50,8 +50,8 @@ server "secure.example.com" {
        listen on 127.0.0.1 tls port 443
 
        # TLS certificate and key files created with acme-client(1)             
-       tls certificate "/etc/ssl/acme/fullchain.pem"
-       tls key "/etc/ssl/acme/private/privkey.pem"
+       tls certificate "/etc/ssl/example.com.fullchain.pem"
+       tls key "/etc/ssl/private/example.com.key"
 
        # Define server-specific log files relative to /logs
        log { access "secure-access.log", error "secure-error.log" }

diff --git a/etc/mtree/4.4BSD.dist b/etc/mtree/4.4BSD.dist
index 1507cf9..ee827c7 100644 (file)
--- a/etc/mtree/4.4BSD.dist
+++ b/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-#      $OpenBSD: 4.4BSD.dist,v 1.294 2017/02/12 08:56:17 landry Exp $
+#      $OpenBSD: 4.4BSD.dist,v 1.295 2017/04/16 08:50:49 ajacoutot Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 
@@ -105,10 +105,6 @@ etc
         ..
         lib
         ..
-        acme
-            private            uname=root mode=0700
-            ..
-        ..
     ..
 ..