Merge branch 'master' into debian

3 files changed, 15 insertions, 15 deletions

diff --git a/config/letsencrypt-accountd.conf b/config/lacme-accountd.conf
index c372190..0a8b81a 100644
--- a/config/letsencrypt-accountd.conf
+++ b/config/lacme-accountd.conf
@@ -17,10 +17,10 @@
 # for signature requests from the ACME client.  An error is raised if
 # the path exists exists or if its parent directory is writable by other
 # users.
-# Default: "$XDG_RUNTIME_DIR/S.letsencrypt" if the XDG_RUNTIME_DIR
+# Default: "$XDG_RUNTIME_DIR/S.lacme" if the XDG_RUNTIME_DIR
 # environment variable is set.
 #
-#socket = /run/user/1000/S.letsencrypt
+#socket = /run/user/1000/S.lacme
 
 # Be quiet.  Possible values: "Yes"/"No".
 #
diff --git a/config/letsencrypt-certs.conf b/config/lacme-certs.conf
index 2ee9b20..fbce5e2 100644
--- a/config/letsencrypt-certs.conf
+++ b/config/lacme-certs.conf
@@ -26,7 +26,7 @@
 # Path to the issuer's certificate.  This is used for certificate-chain
 # and to verify the validity of each issued certificate.  Specifying an
 # empty value skip certificate validation.
-#CAfile = /usr/share/letsencrypt-tiny/lets-encrypt-x3-cross-signed.pem
+#CAfile = /usr/share/lacme/lets-encrypt-x3-cross-signed.pem
 
 # Subject field of the Certificate Signing Request.  This option is
 # required.
diff --git a/config/letsencrypt.conf b/config/lacme.conf
index 1502020..edcbbb0 100644
--- a/config/letsencrypt.conf
+++ b/config/lacme.conf
@@ -1,23 +1,23 @@
 # For certificate issuance (new-cert command), specify the certificate
 # configuration file to use
 #
-#config-certs = config/letsencrypt-certs.conf
+#config-certs = config/lacme-certs.conf
 
 [client]
-# The value of "socket" specifies the letsencrypt-accountd(1)
-# UNIX-domain socket to connect to for signature requests from the ACME
-# client.  letsencrypt aborts if the socket is readable or writable by
-# other users, or if its parent directory is writable by other users.
-# Default: "$XDG_RUNTIME_DIR/S.letsencrypt" if the XDG_RUNTIME_DIR
-# environment variable is set.
+# The value of "socket" specifies the lacme-accountd(1) UNIX-domain
+# socket to connect to for signature requests from the ACME client.
+# lacme aborts if the socket is readable or writable by other users, or
+# if its parent directory is writable by other users.
+# Default: "$XDG_RUNTIME_DIR/S.lacme" if the XDG_RUNTIME_DIR environment
+# variable is set.
 #
-#socket = /run/user/1000/S.letsencrypt
+#socket = /run/user/1000/S.lacme
 
 # username to drop privileges to (setting both effective and real uid).
 # Preserve root privileges if the value is empty (not recommended).
 # Default: "nobody".
 #
-#user = letsencrypt
+#user = lacme
 
 # groupname to drop privileges to (setting both effective and real gid,
 # and also setting the list of supplementary gids to that single group).
@@ -26,7 +26,7 @@
 #group = nogroup
 
 # Path to the ACME client executable.
-#command = /usr/lib/letsencrypt-tiny/client
+#command = /usr/lib/lacme/client
 
 # Root URI of the ACME server.  NOTE: Use the staging server for testing
 # as it has relaxed ratelimit.
@@ -75,11 +75,11 @@
 #user = www-data
 
 # Path to the ACME webserver executable.
-#command = /usr/lib/letsencrypt-tiny/webserver
+#command = /usr/lib/lacme/webserver
 
 # Whether to automatically install iptables(1) rules to open the
 # ADDRESS[:PORT] specified with listen.  Theses rules are automatically
-# removed once letsencrypt exits.
+# removed once lacme(1) exits.
 #
 #iptables = Yes