automated letsencrypt

diff --git a/files/etc/init.d/request-letsencrypt/DEFAULT b/files/etc/init.d/request-letsencrypt/DEFAULT
index b0081a059f9f6adddf30f0c0bd2785fb2d1f0de3..f7d2d904dae892864b523ad5b0a958f6c40a6bd0 100755 (executable)
--- a/files/etc/init.d/request-letsencrypt/DEFAULT
+++ b/files/etc/init.d/request-letsencrypt/DEFAULT
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #!/bin/bash
 

-if [ ! -d /etc/letsencrypt/archive/$HOSTNAME ]; then
+if [ ! -d /etc/letsencrypt/archive/HOSTNAME_TOKEN ]; then

     cd /srv/letsencrypt
     cd /srv/letsencrypt

-    /letsencrypt-auto certonly --standalone --agree-tos --email $LETSENCRYPT_EMAIL -d $HOSTNAME -d $SERVERNAME
+    /letsencrypt-auto certonly --standalone --agree-tos --email LETSENCRYPT_EMAIL_TOKEN -d HOSTNAME_TOKEN -d SERVERNAME_TOKEN

 fi
 
 fi
 

diff --git a/scripts/LETSENCRYPT/00_fetch.sh b/scripts/LETSENCRYPT/00_fetch.sh
index 0d0c45f45f1fd958506e2bcb1748436d773a7015..3fc39a629207dd245830b11b99756e5aeea84d35 100755 (executable)
--- a/scripts/LETSENCRYPT/00_fetch.sh
+++ b/scripts/LETSENCRYPT/00_fetch.sh
@@ -5,4 +5,10 @@ if [ ! -d $LETSENCRYPT_PATH/letsencrypt ]; then
     git clone https://github.com/letsencrypt/letsencrypt
 fi
 fcopy -Bv /etc/init.d/request-letsencrypt
     git clone https://github.com/letsencrypt/letsencrypt
 fi
 fcopy -Bv /etc/init.d/request-letsencrypt

+
+$ROOTCMD sed 's^LETSENCRYPT_EMAIL_TOKEN^'$LETSENCRYPT_EMAIL'^g' -i /etc/init.d/request-letsencrypt
+$ROOTCMD sed 's^SERVERNAME_TOKEN^'$SERVERNAME'^g' -i /etc/init.d/request-letsencrypt
+$ROOTCMD sed 's^HOSTNAME_TOKEN^'$HOSTNAME'^g' -i /etc/init.d/request-letsencrypt
+
+

 $ROOTCMD update-rc.d request-letsencrypt defaults
 $ROOTCMD update-rc.d request-letsencrypt defaults