Update letsencrypt.sh

freebsd/resources/letsencrypt.sh

@@ -23,14 +23,6 @@ cd "$(dirname "$0")"
 read -p 'Domain Name: ' domain_name
 read -p 'Email Address: ' email_address
 
-#wildcard detection
-wilcard_domain=$(echo $domain_name | cut -c1-1)
-if [ "$wilcard_domain" = "*" ]; then
-        wilcard_domain="y"
-else
-        wilcard_domain="n"
-fi
-
 #get and install dehydrated
 pkg install dehydrated
 #cd /usr/src && git clone https://github.com/lukas2511/dehydrated.git
@@ -39,16 +31,6 @@ pkg install dehydrated
 #mkdir -p /usr/local/www/dehydrated
 #mkdir -p /usr/local/etc/dehydrated/certs
 
-#remove the wildcard and period
-if [ .$wilcard_domain = ."y" ]; then
-      domain_name=$(echo "$domain_name" | cut -c3-255)
-fi
-
-#create an alias when using wildcard dns
-#if [ .$wilcard_domain = ."y" ]; then
-#  echo "*.$domain_name > $domain_name" > /usr/local/etc/dehydrated/domains.txt
-#fi
-
 #manual dns hook
 cd /usr/src
 git clone https://github.com/owhen/dns-01-manual.git
@@ -67,13 +49,31 @@ cp docs/examples/config /usr/local/etc/dehydrated
 #accept the terms
 dehydrated --register --accept-terms --config /usr/local/etc/dehydrated/config
 
+#wildcard detection
+wilcard_domain=$(echo $domain_name | cut -c1-1)
+if [ "$wilcard_domain" = "*" ]; then
+        wilcard_domain="true"
+else
+        wilcard_domain="false"
+fi
+
+#remove the wildcard and period
+if [ .$wilcard_domain = ."true" ]; then
+      domain_name=$(echo "$domain_name" | cut -c3-255)
+fi
+
+#create an alias when using wildcard dns
+#if [ .$wilcard_domain = ."true" ]; then
+#  echo "*.$domain_name > $domain_name" > /usr/local/etc/dehydrated/domains.txt
+#fi
+
 #wildcard domain
-if [ .$wilcard_domain = ."y" ]; then
+if [ .$wilcard_domain = ."true" ]; then
   dehydrated --cron --domain *.$domain_name --alias $domain_name --config /usr/local/etc/dehydrated/config --out /usr/local/etc/dehydrated/certs --challenge dns-01 --hook /usr/local/etc/dehydrated/hook.sh
 fi
 
 #single domain
-if [ .$wilcard_domain = ."n" ]; then
+if [ .$wilcard_domain = ."false" ]; then
   dehydrated --cron --domain $domain_name --config /usr/local/etc/dehydrated/config --config /usr/local/etc/dehydrated/config --out /usr/local/etc/dehydrated/certs --challenge dns-01 --hook /usr/local/etc/dehydrated/hook.sh
 fi
 
@@ -90,6 +90,8 @@ cp /usr/local/etc/dehydrated/certs/$domain_name/privkey.pem /usr/local/etc/nginx
 #read the config
 /usr/local/sbin/nginx -t && /usr/local/sbin/nginx -s reload
 
+#setup freeswitch tls 
+if [ .$switch_tls = ."true" ]; then
         #make sure the freeswitch directory exists
         mkdir -p /usr/local/etc/freeswitch/tls
 
@@ -115,3 +117,4 @@ ln -s /usr/local/etc/freeswitch/tls/all.pem /usr/local/etc/freeswitch/tls/dtls-s
 
         #set the permissions
         chown -R www:www /usr/local/etc/freeswitch/tls
+fi