Switch to running dehydrated.

[distorted-letsencrypt] / lib / lib.sh

diff --git a/lib/lib.sh b/lib/lib.sh
index 467f1ca..de5ac44 100644 (file)
--- a/lib/lib.sh
+++ b/lib/lib.sh
@@ -15,31 +15,13 @@ run_as_user () {
   PATH=$home/bin:/usr/local/bin:/bin:/usr/bin; export PATH
 }
 
+sanitize () { echo "$1" | tr -c 'A-Za-z0-9-\n' _; }
+
 prepare_tmp () {
   tag=$1
 
-  tmp=$home/tmp/$tag.$$
+  tmp=$home/tmp/$(sanitize "$tag").$$
   rm -rf $tmp
   mkdir $tmp
   trap 'cd $home; rm -rf $tmp' EXIT INT TERM
 }
-
-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
-      0) ;;
-      *)
-       map="webroot-map = {" sep=" "
-       for san in "$@"; do
-         map="$map$sep\"$san\": \"$home/webroot\"" sep=", "
-       done
-       map="$map }"
-       echo "$map"
-       ;;
-    esac
-  } >$tmp/le.conf
-}
\ No newline at end of file