move more config into the script

diff --git a/le.conf.skel b/le.conf.skel
index d3c61bfe1315a9024531451d3bc53dd7e02f1308..9bf327256ee0d60fec65bde384f27241c4251a5c 100644 (file)
--- a/le.conf.skel
+++ b/le.conf.skel
@@ -1,8 +1,3 @@
 ### -*-conf-*-
 
 email = mdw@distorted.org.uk
-text = true
-authenticator = webroot
-
-config-dir = /var/lib/letsencrypt/etc
-logs-dir = /var/lib/letsencrypt/log

diff --git a/lib/lib.sh b/lib/lib.sh
index 7b4aab1775014c49624fde3dcf2d15171230568f..7c80b680b0c986491c4f9eebfe62370a087dadf0 100644 (file)
--- a/lib/lib.sh
+++ b/lib/lib.sh
@@ -26,6 +26,8 @@ prepare_tmp () {
 
 make_le_conf () {
   { cat $home/le.conf.skel
+    echo "config-dir = $home/etc"
+    echo "logs-dir = $home/log"
     echo "work-dir = $tmp"
     echo
     case $# in