From 98b0361fcf8e4efa687b9b354ae5fc1c1e06091e Mon Sep 17 00:00:00 2001 From: gabrc52 Date: Mon, 9 Nov 2020 13:08:37 -0600 Subject: [PATCH 1/4] Correct script file name in README The README suggests running a script called `quick-jibri-installer.sh`, but it doesn't exist. What exists is `quick_jibri_installer.sh`. I've also added `sudo` since it asks for root permissions. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 111df8b..6886f99 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Login into your clean server, clone git repository and run the installer, ``` git clone https://github.com/switnet-ltd/quick-jibri-installer cd quick-jibri-installer -bash quick-jibri-installer.sh +sudo bash quick_jibri_installer.sh ``` ### Add Jibri node -- 2.34.1 From 6c23e67632fa413e9c640d084eb15d6b0b2dbec2 Mon Sep 17 00:00:00 2001 From: Luis Guzman Date: Wed, 12 May 2021 13:40:20 -0500 Subject: [PATCH 2/4] Create FUNDING.yml --- .github/FUNDING.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..611be71 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,3 @@ +# These are supported funding model platforms + +custom: ["https://www.paypal.me/switnet", switnet.net] -- 2.34.1 From 777bdea36af207b075a31820f7c36a9752867260 Mon Sep 17 00:00:00 2001 From: Ark74 Date: Fri, 4 Jun 2021 04:53:51 -0500 Subject: [PATCH 3/4] Update README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 8498125..5a041c3 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,8 @@ git clone https://github.com/switnet-ltd/quick-jibri-installer cd quick-jibri-installer sudo bash quick_jibri_installer.sh ``` +![QJI - Setup](https://raw.githubusercontent.com/wiki/switnet-ltd/quick-jibri-installer/images/qji-diagram-setup.png) + If your server meet the necessary resources, then at the end on the installer you should have a working Jitsi Meet Server along with a Jibri server ready to record. Additional jibris need to be set on separate servers, only necesary on simultaneous recordings for that please use add-jibri-node.sh. -- 2.34.1 From 6f910c107a286576e5e715f9f7818a3a3b2a1774 Mon Sep 17 00:00:00 2001 From: Ark74 Date: Fri, 2 Jul 2021 19:56:45 -0500 Subject: [PATCH 4/4] Prevent to duplicate crontab Make start-over.sh remove the certbot cron job installed --- quick_jibri_installer.sh | 6 +++++- tools/start-over.sh | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/quick_jibri_installer.sh b/quick_jibri_installer.sh index 2c42137..9d862b6 100644 --- a/quick_jibri_installer.sh +++ b/quick_jibri_installer.sh @@ -706,7 +706,11 @@ if [ "$LE_SSL" = "yes" ]; then sed -i "s|/etc/jitsi/meet/$3.key|/etc/letsencrypt/live/$3/privkey.pem|" $4 systemctl restart $1 #Add cron - crontab -l | { cat; echo "@weekly certbot renew --${2} > $LE_RENEW_LOG 2>&1"; } | crontab - + if [ $(crontab -l|sed 's|#.*$||g'|grep -c 'weekly certbot renew') = 0 ];then + crontab -l | { cat; echo "@weekly certbot renew --${2} > $LE_RENEW_LOG 2>&1"; } | crontab - + else + echo "Crontab seems to be already in place, skipping." + fi crontab -l fi } diff --git a/tools/start-over.sh b/tools/start-over.sh index a9667ee..0cdc991 100644 --- a/tools/start-over.sh +++ b/tools/start-over.sh @@ -133,7 +133,12 @@ if [ ! -z $SYNC_USER ]; then fi if [ -d /home/jibri ]; then deluser --remove-home jibri + rm -r /home/jibri fi groupdel jibri +#Remove crontab +crontab -l | grep -v '@weekly certbot renew --nginx' | crontab - +crontab -l + echo "We are done..." -- 2.34.1