[Astlinux-commits] SF.net SVN: astlinux:[8094] branches/1.0/package/acme/acme-client.sh

[<abe...@us...>]

Revision: 8094
          http://sourceforge.net/p/astlinux/code/8094
Author:   abelbeck
Date:     2017-01-14 19:46:18 +0000 (Sat, 14 Jan 2017)
Log Message:
-----------
acme, add account.opts support, no longer write to account.conf, add rc.conf ACME_ACCOUNT_EMAIL variable

Modified Paths:
--------------
    branches/1.0/package/acme/acme-client.sh

Modified: branches/1.0/package/acme/acme-client.sh
===================================================================
--- branches/1.0/package/acme/acme-client.sh	2017-01-14 16:23:16 UTC (rev 8093)
+++ branches/1.0/package/acme/acme-client.sh	2017-01-14 19:46:18 UTC (rev 8094)
@@ -8,7 +8,7 @@
 
 ACME_WORKING_DIR="/mnt/kd/acme"
 
-export LE_WORKING_DIR="$ACME_WORKING_DIR"
+ACME_OPTS="--home $ACME_WORKING_DIR --useragent AstLinux"
 
 LOCKFILE="/var/lock/acme-client.lock"
 
@@ -31,26 +31,41 @@
   exit 9
 fi
 
-gen_account_conf()
+add_account_opts()
 {
-  if [ -f "$ACME_WORKING_DIR/account.static" ]; then
-    echo "# Autogenerated.  Edit $ACME_WORKING_DIR/account.static file.
-"
-    cat "$ACME_WORKING_DIR/account.static"
-    return
-  fi
+  local file="$1" line opt value IFS
 
-  echo "# Autogenerated.  Do not edit.
-# A manually generated acme.sh config will use $ACME_WORKING_DIR/account.static if it exists.
-"
-  echo "USER_AGENT=\"AstLinux\""
+  IFS=$'\n'
+  for line in $(cat "$file" | sed -e 's/#.*//' -e 's/ *$//' -e '/^$/d'); do
+    opt="$(echo "$line" | awk -F' ' '/^[a-z]/ { print $1; }')"
+    value="$(echo "$line" | awk -F' ' '/^[a-z]/ { print $2; }')"
+    if [ -n "$opt" ]; then
+      if [ -n "$value" ]; then
+        ACME_OPTS="$ACME_OPTS --$opt $value"
+      else
+        ACME_OPTS="$ACME_OPTS --$opt"
+      fi
+    fi
+  done
 }
 
+accountemail="$ACME_ACCOUNT_EMAIL"
+
+# Extract from possible <a@b.tld> format
+accountemail="${accountemail##*<}"
+accountemail="${accountemail%%>*}"
+
+if [ -n "$accountemail" ]; then
+  ACME_OPTS="$ACME_OPTS --accountemail $accountemail"
+fi
+
+if [ -f "$ACME_WORKING_DIR/account.opts" ]; then
+  add_account_opts "$ACME_WORKING_DIR/account.opts"
+fi
+
 trap 'rm -f "$LOCKFILE"; exit $?' INT TERM EXIT
 
-gen_account_conf > "$ACME_WORKING_DIR/account.conf"
-
-$ACME_PROG "$@"
+$ACME_PROG $ACME_OPTS "$@"
 rtn=$?
 
 rm -f "$LOCKFILE"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.