X-Git-Url: https://git.donarmstrong.com/?p=bin.git;a=blobdiff_plain;f=add_openvpn_host;h=4d5e54ce8f901368afb790dc8d31bc4de4a2e750;hp=0b9e311aad9a967b20c886a2a4bcf85455b059ea;hb=4621d23526ccf936d1ad076ece0bc663510dfc52;hpb=0dcd3c9b7fd072c8c7a3cae569c8cafc79e7a00c

diff --git a/add_openvpn_host b/add_openvpn_host
index 0b9e311..4d5e54c 100755
--- a/add_openvpn_host
+++ b/add_openvpn_host
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 HOST="${1}"
 CONF="${2:-danet_client.conf}"
@@ -41,20 +41,21 @@ ORIGDIR=$(pwd);
 	perl -e 'print unpack(q(H*),pack(q(NN),time,$$)),qq(\n)' > serial
     fi;
     openssl ca -config "$TMPDIR"/config -policy policy_anything -keyfile "${ORIGDIR}"/"${CAKEY}" -cert "${ORIGDIR}"/"${CACERT}" \
-	-out "$TMPDIR"/"${HOST}".cert -outdir "$TMPDIR" -notext -days 9000 -batch -infiles "${HOST}".req; #> /dev/null 2>&1
+	-out "$TMPDIR"/"${HOST}".cert -outdir "$TMPDIR" -notext -days $(( ( $(date -d 'Tuesday, 18 January 2038' +%s) - $(date +%s) ) / 60 / 60 /24 )) -batch -infiles "${HOST}".req; #> /dev/null 2>&1
     chmod a+r "${HOST}".cert
     rm -f "${HOST}".req
-    ln -sf "${HOST}".cert "${CLIENT_CERT}"
-    ln -sf "${HOST}".pem "${CLIENT_KEY}"
+    mv "${HOST}".cert "${CLIENT_CERT}"
+    mv "${HOST}".pem "${CLIENT_KEY}"
 )
 
 cp "${CONF}" "${TMPDIR}"/;
 cp "${SERVER_CACERT}" "${TMPDIR}"/;
 
 tar -zcf "${HOST}".tar.gz -C "${TMPDIR}" \
-    "${HOST}".cert "${HOST}".pem "${CLIENT_CERT}" "${CONF}" \
+    "${CLIENT_CERT}" "${CONF}" \
     "${CLIENT_KEY}" "${SERVER_CACERT}"
 rm -rf "${TMPDIR}"
 
 cp ../ccd/__template__ ../ccd/"${HOST}";
+chmod 0644 ../ccd/"${HOST}";
 HOST="${HOST}" perl -pi -e 's/HOSTNAME/$ENV{HOST}/g' ../ccd/"${HOST}";