Merge pull request 'quick_jibri_installer.sh: add ssl cert failed step' (#123) from Ark74/quick-jibri-installer:disable_jvb_sip into master

Reviewed-on: #123

jra_nextcloud.sh

@@ -42,7 +42,7 @@ apt-get update -q2
 # Manually add prerequisites.
 apt-get install -y curl letsencrypt nginx
 
-MIN_PHP="8.2"
+MIN_PHP="8.3"
 DOMAIN="$(find /etc/prosody/conf.d/ -name \*.lua|awk -F'.cfg' '!/localhost/{print $1}'|xargs basename)"
 PSGVER="$(apt-cache madison postgresql|tr -d '[:blank:]'|awk -F'[|+]' 'NR==1{print $2}')"
 NC_NGINX_SSL_PORT="$(grep "listen 44" /etc/nginx/sites-available/"$DOMAIN".conf | awk '{print$2}')"

quick_jibri_installer.sh

@@ -766,7 +766,27 @@ INT_CONF_ETC="/etc/jitsi/meet/$DOMAIN-interface_config.js"
 ssl_wa() {
 if [ "$LE_SSL" = "yes" ]; then
   systemctl stop "$1"
-  certbot certonly --standalone --renew-by-default --agree-tos --email "$5" -d "$6" --non-interactive
+  if certbot certonly --standalone --renew-by-default \
+                      --agree-tos --email "$5" -d "$6" \
+                      --non-interactive
+  then
+    echo "> SSL cert issued correctly!"
+  else
+    echo "> SSL cert issued failed!"
+    sleep .1
+    while [ "$SSL_FAILED" != "yes" ] && [ "$SSL_FAILED" != "no" ]
+    do
+        read -p "> Do you want to continue regardless? This might make the installer to fail later on: (yes or no)$NL" -r SSL_FAILED
+        if [ "$SSL_FAILED" = "yes" ]; then
+            printf " - Continuing installation regardless failure to retrieve SSL certs.\n\n"
+        elif [ "$SSL_FAILED" = "no" ]; then
+            printf " - Stoping the installer.You might want to take a look at:\n"
+            printf "   - /var/log/letsencrypt/letsencrypt.log and / or\n"
+            printf "   - https://letsencrypt.status.io/\n\n"
+            exit 1
+        fi
+    done
+  fi
   sed -i "s|/etc/jitsi/meet/$3.crt|/etc/letsencrypt/live/$3/fullchain.pem|" "$4"
   sed -i "s|/etc/jitsi/meet/$3.key|/etc/letsencrypt/live/$3/privkey.pem|" "$4"
   systemctl restart "$1"
@@ -954,16 +974,17 @@ JVB_SECRET=$(g_conf_value JVB_SECRET=)
 JVB_OPTS=$(g_conf_value JVB_OPTS=)
 JAVA_SYS_PROPS=$(g_conf_value JAVA_SYS_PROPS=)
 
-g_sip_value() {
+#FIXME: - sip-communicator.properties - no longer exist
-  grep "$1" "$JVB2_SIP" |cut -d "=" -f2
+#g_sip_value() {
-}
+#  grep "$1" "$JVB2_SIP" |cut -d "=" -f2
-DISABLE_AWS_HARVESTER=$(g_sip_value DISABLE_AWS_HARVESTER=)
+#}
-STUN_MAPPING_HARVESTER_ADDRESSES=$(g_sip_value STUN_MAPPING_HARVESTER_ADDRESSES=)
+#DISABLE_AWS_HARVESTER=$(g_sip_value DISABLE_AWS_HARVESTER=)
-ENABLE_STATISTICS=$(g_sip_value ENABLE_STATISTICS=)
+#STUN_MAPPING_HARVESTER_ADDRESSES=$(g_sip_value STUN_MAPPING_HARVESTER_ADDRESSES=)
-SHARD_HOSTNAME=$(g_sip_value shard.HOSTNAME=)
+#ENABLE_STATISTICS=$(g_sip_value ENABLE_STATISTICS=)
-SHARD_DOMAIN=$(g_sip_value shard.DOMAIN=)
+#SHARD_HOSTNAME=$(g_sip_value shard.HOSTNAME=)
-SHARD_PASSWORD=$(g_sip_value shard.PASSWORD=)
+#SHARD_DOMAIN=$(g_sip_value shard.DOMAIN=)
-MUC_JID=$(g_sip_value MUC_JIDS=)
+#SHARD_PASSWORD=$(g_sip_value shard.PASSWORD=)
+#MUC_JID=$(g_sip_value MUC_JIDS=)
 
 ##-- Replacing on add-jvb2-node.sh
 sed -i "s|JVB_HOSTNAME=.*|JVB_HOSTNAME=$JVB_HOSTNAME|" add-jvb2-node.sh
@@ -972,14 +993,14 @@ sed -i "s|JVB_PORT=.*|JVB_PORT=$JVB_PORT|" add-jvb2-node.sh
 sed -i "s|JVB_SECRET=.*|JVB_SECRET=$JVB_SECRET|" add-jvb2-node.sh
 sed -i "s|JVB_OPTS=.*|JVB_OPTS=$JVB_OPTS|" add-jvb2-node.sh
 sed -i "s|SYS_PROPS=.*|SYS_PROPS=$JAVA_SYS_PROPS|" add-jvb2-node.sh
-#-
+#FIXME: - sip-communicator.properties - no longer exist
-sed -i "s|AWS_HARVEST=.*|AWS_HARVEST=$DISABLE_AWS_HARVESTER|" add-jvb2-node.sh
+#sed -i "s|AWS_HARVEST=.*|AWS_HARVEST=$DISABLE_AWS_HARVESTER|" add-jvb2-node.sh
-sed -i "s|STUN_MAPPING=.*|STUN_MAPPING=$STUN_MAPPING_HARVESTER_ADDRESSES|" add-jvb2-node.sh
+#sed -i "s|STUN_MAPPING=.*|STUN_MAPPING=$STUN_MAPPING_HARVESTER_ADDRESSES|" add-jvb2-node.sh
-sed -i "s|ENABLE_STATISTICS=.*|ENABLE_STATISTICS=$ENABLE_STATISTICS|" add-jvb2-node.sh
+#sed -i "s|ENABLE_STATISTICS=.*|ENABLE_STATISTICS=$ENABLE_STATISTICS|" add-jvb2-node.sh
-sed -i "s|SHARD_HOSTNAME=.*|SHARD_HOSTNAME=$SHARD_HOSTNAME|" add-jvb2-node.sh
+#sed -i "s|SHARD_HOSTNAME=.*|SHARD_HOSTNAME=$SHARD_HOSTNAME|" add-jvb2-node.sh
-sed -i "s|SHARD_DOMAIN=.*|SHARD_DOMAIN=$SHARD_DOMAIN|" add-jvb2-node.sh
+#sed -i "s|SHARD_DOMAIN=.*|SHARD_DOMAIN=$SHARD_DOMAIN|" add-jvb2-node.sh
-sed -i "s|SHARD_PASS=.*|SHARD_PASS=$SHARD_PASSWORD|" add-jvb2-node.sh
+#sed -i "s|SHARD_PASS=.*|SHARD_PASS=$SHARD_PASSWORD|" add-jvb2-node.sh
-sed -i "s|MUC_JID=.*|MUC_JID=$MUC_JID|" add-jvb2-node.sh
+#sed -i "s|MUC_JID=.*|MUC_JID=$MUC_JID|" add-jvb2-node.sh
 
 sed -i "s|MAIN_SRV_DIST=.*|MAIN_SRV_DIST=\"$DIST\"|" add-jvb2-node.sh
 sed -i "s|MAIN_SRV_REPO=.*|MAIN_SRV_REPO=\"$JITSI_REPO\"|" add-jvb2-node.sh

tools/prepare_php.sh

@@ -128,6 +128,7 @@ echo "opcache.revalidate_freq=1"
 echo "opcache.validate_timestamps=1"
 } >> "$PHP_INI"
 
+echo "# Stick to default system php version to avoid breaking any other system application"
 update-alternatives --set php           /usr/bin/php"$STABLE_PHP"
 update-alternatives --set php-fpm.sock  /run/php/php"$STABLE_PHP"-fpm.sock
 update-alternatives --set php-cgi      	/usr/bin/php-cgi"$STABLE_PHP"