From 0256aa9c4958db235ad65522a82ddcd544b197ba Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 12 Sep 2022 19:56:23 -0400 Subject: [PATCH] add -i to sed instead of redirection fixing blank pjsip.conf --- resources/gonk.sh | 24 ++++++++++++------------ resources/reload.sh | 10 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/resources/gonk.sh b/resources/gonk.sh index 2161883..f594b49 100755 --- a/resources/gonk.sh +++ b/resources/gonk.sh @@ -31,29 +31,29 @@ else chown -R gonk:gonk /var/spool/asterisk echo " Pulling config files for the first time..." - curl -so /etc/asterisk/asterisk.conf https://ap5.gonknet.org/asterisk/$HOSTNAME/$GONK_KEY - curl -so /etc/asterisk/pjsip.conf https://ap5.gonknet.org/pjsip/$HOSTNAME/$GONK_KEY - curl -so /etc/asterisk/modules.conf https://ap5.gonknet.org/modules/$HOSTNAME/$GONK_KEY - curl -so /etc/asterisk/logger.conf https://ap5.gonknet.org/logger/$HOSTNAME/$GONK_KEY + curl -s https://ap5.gonknet.org/asterisk/$HOSTNAME/$GONK_KEY > /etc/asterisk/asterisk.conf + curl -s https://ap5.gonknet.org/pjsip/$HOSTNAME/$GONK_KEY > /etc/asterisk/pjsip.conf + curl -s https://ap5.gonknet.org/modules/$HOSTNAME/$GONK_KEY > /etc/asterisk/modules.conf + curl -s https://ap5.gonknet.org/logger/$HOSTNAME/$GONK_KEY > /etc/asterisk/logger.conf - sed "s/##EXTERNAL_IP##/$(curl https://ipv4.myip.wtf/text)/g" /etc/asterisk/pjsip.conf + sed -i "s/##EXTERNAL_IP##/$(curl -s https://ipv4.myip.wtf/text)/g" /etc/asterisk/pjsip.config - echo " Setting up auto reload config files..." - echo "26 * * * * /usr/bin/reload" >> /etc/cron.d/reload + echo " Setting up config updater cron..." + echo "26 * * * * gonk /usr/bin/reload" > /etc/cron.d/reload echo " Setting up VOIPBL..." echo " Downloading script..." - curl -so /usr/bin/voipbl.sh https://gonknet.org/static/voipbl.sh + curl -s https://gonknet.org/static/voipbl.sh > /usr/bin/voipbl.sh chmod 700 /usr/bin/voipbl.sh chmod +x /usr/bin/voipbl.sh - echo " Setting up cron..." - echo "13 */4 * * * /usr/bin/voipbl.sh" >> /etc/cron.d/voipbl + echo " Setting up VOIPBL cron..." + echo "13 */4 * * * root /usr/bin/voipbl.sh" > /etc/cron.d/voipbl echo " Setting up fail2ban" - curl -so /etc/fail2ban/jail.d/asterisk.conf https://ap5.gonknet.org/f2b/asterisk/$HOSTNAME/$GONK_KEY - curl -so /etc/fail2ban/action.d/voipbl.conf https://ap5.gonknet.org/f2b/voipbl/$HOSTNAME/$GONK_KEY + curl -s https://ap5.gonknet.org/f2b/asterisk/$HOSTNAME/$GONK_KEY > /etc/fail2ban/jail.d/asterisk.conf + curl -s https://ap5.gonknet.org/f2b/voipbl/$HOSTNAME/$GONK_KEY > /etc/fail2ban/action.d/voipbl.conf rm /etc/fail2ban/jail.d/defaults-debian.conf asterisk -U gonk -G gonk diff --git a/resources/reload.sh b/resources/reload.sh index 8854d8e..93f4f54 100644 --- a/resources/reload.sh +++ b/resources/reload.sh @@ -1,12 +1,12 @@ #! /bin/bash echo "Reloading config files..." -curl -so /etc/asterisk/asterisk.conf https://ap5.gonknet.org/asterisk/$HOSTNAME/$GONK_KEY -curl -so /etc/asterisk/pjsip.conf https://ap5.gonknet.org/pjsip/$HOSTNAME/$GONK_KEY -curl -so /etc/asterisk/modules.conf https://ap5.gonknet.org/modules/$HOSTNAME/$GONK_KEY -curl -so /etc/asterisk/logger.conf https://ap5.gonknet.org/logger/$HOSTNAME/$GONK_KEY +curl -s https://ap5.gonknet.org/asterisk/$HOSTNAME/$GONK_KEY > /etc/asterisk/asterisk.conf +curl -s https://ap5.gonknet.org/pjsip/$HOSTNAME/$GONK_KEY > /etc/asterisk/pjsip.conf +curl -s https://ap5.gonknet.org/modules/$HOSTNAME/$GONK_KEY > /etc/asterisk/modules.conf +curl -s https://ap5.gonknet.org/logger/$HOSTNAME/$GONK_KEY > /etc/asterisk/logger.conf -sed "s/##EXTERNAL_IP##/$(curl https://ipv4.myip.wtf/text)/g" /etc/asterisk/pjsip.conf +sed -i "s/##EXTERNAL_IP##/$(curl https://ipv4.myip.wtf/text)/g" /etc/asterisk/pjsip.conf asterisk -x "core restart when convenient" \ No newline at end of file