Updated cert-update for asterisk from centos to debian

diff --git a/mkntpwd b/mkntpwd
new file mode 100755 (executable)
index 0000000..5071f04
Binary files /dev/null and b/mkntpwd differ

diff --git a/update_certificate b/update_certificate
index 4f3469206ad38c0b3f73bdc766fe6bd630fdad95..b9cf405852afdf4a27f2ea3f496b157af5442401 100755 (executable)
--- a/update_certificate
+++ b/update_certificate
@@ -87,15 +87,18 @@ function update_asterisk () {
        echo " ------------------------------------ "
        HOST="asterisk.giorgioravera.it"
        USER="root"
-       COMMAND="cat $DST_TMP_FULLCHAIN > /etc/asterisk/keys/Asterisk.crt &&
-                cat $DST_TMP_KEY > /etc/asterisk/keys/Asterisk.key &&
-                cat $DST_TMP_FULLCHAIN > /etc/httpd/pki/webserver.crt &&
-                cat $DST_TMP_KEY > /etc/httpd/pki/webserver.key &&
+       COMMAND="cat $DST_FULLCHAIN > /etc/asterisk/keys/Asterisk.crt &&
+                cat $DST_KEY > /etc/asterisk/keys/Asterisk.key &&
+                cat $DST_SERVER > /etc/asterisk/keys/Asterisk.pem &&
+                cat $DST_FULLCHAIN > /etc/apache2/pki/webserver.crt &&
+                cat $DST_KEY > /etc/apache2/pki/webserver.key &&
+                cat $DST_SERVER > /etc/apache2/pki/webserver.pem &&
                 fwconsole certificate --import &&
                 fwconsole certificate --default=0 &&
                 fwconsole reload &&
-                systemctl reload httpd.service"
-       update_certificate
+                systemctl restart apache2"
+                #systemctl reload httpd.service"
+       copy_certificate
        echo ""
 }