Update to 2021-12-01 19:13

roles/freepbx/files/agi/jitsi_conf_pin

@@ -0,0 +1,23 @@
+#!/usr/bin/perl
+
+use warnings;
+use strict;
+use LWP::UserAgent;
+use JSON;
+
+my $ret = 'error';
+
+my $url = $ARGV[0] . '?id=' . $ARGV[1];
+my $ua = LWP::UserAgent->new(timeout => 10);
+$ua->env_proxy;
+
+my $response = $ua->get($url);
+if ($response->is_success){
+  my $json = from_json($response->content);
+  if (defined $json and defined $json->{conference}){
+    $ret = $json->{conference};
+    $ret =~ s/@.*//;
+  }
+}
+
+print "SET VARIABLE JITSI_ROOM $ret\n";

roles/freepbx/files/patches/install_dbhost.patch

@@ -0,0 +1,32 @@
+--- ./installlib/installcommand.class.php.orig	2019-05-24 18:06:10.587719554 +0200
++++ ./installlib/installcommand.class.php	2019-05-24 18:09:43.226443972 +0200
+@@ -17,6 +17,10 @@
+ 			'default' => 'mysql',
+ 	 		'description' => 'Database engine'
+ 		),
++		'dbhost' => array(
++			'default' => 'localhost',
++			'description' => 'Database server'
++		),
+ 		'dbname' => array(
+ 			'default' => 'asterisk',
+ 	 		'description' => 'Database name'
+@@ -366,6 +370,9 @@
+ 		if (isset($answers['dbengine'])) {
+ 			$amp_conf['AMPDBENGINE'] = $answers['dbengine'];
+ 		}
++		if (isset($answers['dbhost'])) {
++			$amp_conf['AMPDBHOST'] = $answers['dbhost'];
++		}
+ 		if (isset($answers['dbname'])) {
+ 			$amp_conf['AMPDBNAME'] = $answers['dbname'];
+ 		}
+@@ -415,7 +422,7 @@
+ 
+ 			$amp_conf['AMPDBUSER'] = $answers['dbuser'];
+ 			$amp_conf['AMPDBPASS'] = $answers['dbpass'];
+-			$amp_conf['AMPDBHOST'] = 'localhost';
++			$amp_conf['AMPDBHOST'] = $answers['dbhost'];
+ 
+ 			if($dbroot) {
+ 				$output->write("Database Root installation checking credentials and permissions..");

roles/freepbx/files/patches/webrtc_proxy.patch

@@ -0,0 +1,21 @@
+--- /opt/freepbx/web/admin/modules/webrtc/Webrtc.class.php.orig	2019-11-12 14:47:05.904759608 +0100
++++ /opt/freepbx/web/admin/modules/webrtc/Webrtc.class.php	2019-11-12 14:55:46.392864447 +0100
+@@ -374,13 +374,14 @@
+ 		$prefix = $this->FreePBX->Config->get('HTTPPREFIX');
+ 		$suffix = !empty($prefix) ? "/".$prefix."/ws" : "/ws";
+ 
+-		if($secure && !$this->FreePBX->Config->get('HTTPTLSENABLE')) {
+-			return array("status" => false, "message" => _("HTTPS is not enabled for Asterisk"));
+-		}
++		//if($secure && !$this->FreePBX->Config->get('HTTPTLSENABLE')) {
++		//	return array("status" => false, "message" => _("HTTPS is not enabled for Asterisk"));
++		//}
+ 
+ 		$type = ($this->FreePBX->Config->get('HTTPTLSENABLE') && $secure) ? 'wss' : 'ws';
+ 		$port = ($this->FreePBX->Config->get('HTTPTLSENABLE') && $secure) ? $this->FreePBX->Config->get('HTTPTLSBINDPORT') : $this->FreePBX->Config->get('HTTPBINDPORT');
+-		$results['websocket'] = !empty($results['websocket']) ? $results['websocket'] : $type.'://'.$sip_server.':'.$port.$suffix;
++		//$results['websocket'] = !empty($results['websocket']) ? $results['websocket'] : $type.'://'.$sip_server.':'.$port.$suffix;
++		$results['websocket'] = !empty($results['websocket']) ? $results['websocket'] : 'wss://'.$_SERVER['HTTP_HOST'].'/'.$this->FreePBX->Config->get('HTTPPREFIX').'/ws';
+ 		try {
+ 			$stunaddr = $this->FreePBX->Sipsettings->getConfig("webrtcstunaddr");
+ 			$stunaddr = !empty($stunaddr) ? $stunaddr : $this->FreePBX->Sipsettings->getConfig("stunaddr");

roles/freepbx/files/safe_asterisk

@@ -0,0 +1,228 @@
+#!/bin/sh
+
+ASTETCDIR="/etc/asterisk"
+ASTSBINDIR="/usr/sbin"
+ASTVARRUNDIR="/var/run/asterisk"
+ASTVARLOGDIR="/var/log/asterisk"
+
+CLIARGS="$*"			# Grab any args passed to safe_asterisk
+TTY=9				# TTY (if you want one) for Asterisk to run on
+CONSOLE=yes			# Whether or not you want a console
+#NOTIFY=root@localhost		# Who to notify about crashes
+#EXEC=/path/to/somescript	# Run this command if Asterisk crashes
+#LOGFILE="${ASTVARLOGDIR}/safe_asterisk.log"	# Where to place the normal logfile (disabled if blank)
+#SYSLOG=local0			# Which syslog facility to use (disabled if blank)
+MACHINE=`hostname`		# To specify which machine has crashed when getting the mail
+DUMPDROP="${DUMPDROP:-/tmp}"
+RUNDIR="${RUNDIR:-/tmp}"
+SLEEPSECS=4
+ASTPIDFILE="${ASTVARRUNDIR}/asterisk.pid"
+
+# comment this line out to have this script _not_ kill all mpg123 processes when
+# asterisk exits
+KILLALLMPG123=1
+
+# run asterisk with this priority
+PRIORITY=0
+
+# set system filemax on supported OSes if this variable is set
+# SYSMAXFILES=262144
+
+# Asterisk allows full permissions by default, so set a umask, if you want
+# restricted permissions.
+#UMASK=022
+
+# set max files open with ulimit. On linux systems, this will be automatically
+# set to the system's maximum files open devided by two, if not set here.
+# MAXFILES=32768
+
+message() {
+	if test -n "$TTY" && test "$TTY" != "no"; then
+		echo "$1" >/dev/${TTY}
+	fi
+	if test -n "$SYSLOG"; then
+		logger -p "${SYSLOG}.warn" -t safe_asterisk[$$] "$1"
+	fi
+	if test -n "$LOGFILE"; then
+		echo "safe_asterisk[$$]: $1" >>"$LOGFILE"
+	fi
+}
+
+# Check if Asterisk is already running.  If it is, then bug out, because
+# starting safe_asterisk when Asterisk is running is very bad.
+VERSION=`"${ASTSBINDIR}/asterisk" -nrx 'core show version' 2>/dev/null`
+if test "`echo $VERSION | cut -c 1-8`" = "Asterisk"; then
+	message "Asterisk is already running.  $0 will exit now."
+	exit 1
+fi
+
+# since we're going to change priority and open files limits, we need to be
+# root. if running asterisk as other users, pass that to asterisk on the command
+# line.
+# if we're not root, fall back to standard everything.
+if test `id -u` != 0; then
+	echo "Oops. I'm not root. Falling back to standard prio and file max." >&2
+	echo "This is NOT suitable for large systems." >&2
+	PRIORITY=0
+	message "safe_asterisk was started by `id -n` (uid `id -u`)."
+else
+	if `uname -s | grep Linux >/dev/null 2>&1`; then
+		# maximum number of open files is set to the system maximum
+		# divided by two if MAXFILES is not set.
+		if test -z "$MAXFILES"; then
+			# just check if file-max is readable
+			if test -r /proc/sys/fs/file-max; then
+				MAXFILES=$((`cat /proc/sys/fs/file-max` / 2))
+				# don't exceed upper limit of 2^20 for open
+				# files on systems where file-max is > 2^21
+				if test $MAXFILES -gt 1048576; then
+					MAXFILES=1048576
+				fi
+			fi
+		fi
+		SYSCTL_MAXFILES="fs.file-max"
+	elif `uname -s | grep Darwin /dev/null 2>&1`; then
+		SYSCTL_MAXFILES="kern.maxfiles"
+	fi
+
+
+	if test -n "$SYSMAXFILES"; then
+		if test -n "$SYSCTL_MAXFILES"; then
+			sysctl -w $SYSCTL_MAXFILES=$SYSMAXFILES
+		fi
+	fi
+
+	# set the process's filemax to whatever set above
+	ulimit -n $MAXFILES
+
+	if test ! -d "${ASTVARRUNDIR}"; then
+		mkdir -p "${ASTVARRUNDIR}"
+		chmod 770 "${ASTVARRUNDIR}"
+	fi
+
+fi
+
+if test -n "$UMASK"; then
+	umask $UMASK
+fi
+
+#
+# Let Asterisk dump core
+#
+ulimit -c unlimited
+
+#
+# Don't fork when running "safely"
+#
+ASTARGS=""
+if test -n "$TTY" && test "$TTY" != "no"; then
+	if test -c /dev/tty${TTY}; then
+		TTY=tty${TTY}
+	elif test -c /dev/vc/${TTY}; then
+		TTY=vc/${TTY}
+	elif test "$TTY" = "9"; then  # ignore default if it was untouched
+		# If there is no /dev/tty9 and not /dev/vc/9 we don't
+		# necessarily want to die at this point. Pretend that
+		# TTY wasn't set.
+		TTY=
+	else
+		message "Cannot find specified TTY (${TTY})"
+		exit 1
+	fi
+	if test -n "$TTY"; then
+		ASTARGS="${ASTARGS} -vvvg"
+		if test "$CONSOLE" != "no"; then
+			ASTARGS="${ASTARGS} -c"
+		fi
+	fi
+fi
+
+if test ! -d "${RUNDIR}"; then
+	message "${RUNDIR} does not exist, creating"
+	if ! mkdir -p "${RUNDIR}"; then
+		message "Unable to create ${RUNDIR}"
+		exit 1
+	fi
+fi
+
+if test ! -w "${DUMPDROP}"; then
+	message "Cannot write to ${DUMPDROP}"
+	exit 1
+fi
+
+#
+# Don't die if stdout/stderr can't be written to
+#
+trap '' PIPE
+
+#
+# Run scripts to set any environment variables or do any other system-specific setup needed
+#
+
+if test -d "${ASTETCDIR}/startup.d"; then
+	for script in "${ASTETCDIR}/startup.d/"*.sh; do
+		if test -r "${script}"; then
+			. "${script}"
+		fi
+	done
+fi
+
+run_asterisk()
+{
+	while :; do
+		if test -n "$TTY" && test "$TTY" != "no"; then
+			cd "${RUNDIR}"
+			stty sane </dev/${TTY}
+			nice -n $PRIORITY "${ASTSBINDIR}/asterisk" -f ${CLIARGS} ${ASTARGS} >/dev/${TTY} 2>&1 </dev/${TTY}
+		else
+			cd "${RUNDIR}"
+			nice -n $PRIORITY "${ASTSBINDIR}/asterisk" -f ${CLIARGS} ${ASTARGS} >/dev/null 2>&1 </dev/null
+		fi
+		EXITSTATUS=$?
+		message "Asterisk ended with exit status $EXITSTATUS"
+		if test $EXITSTATUS -eq 0; then
+			# Properly shutdown....
+			message "Asterisk shutdown normally."
+			exit 0
+		elif test $EXITSTATUS -gt 128; then
+			EXITSIGNAL=$((EXITSTATUS - 128))
+			message "Asterisk exited on signal $EXITSIGNAL."
+			if test -n "$NOTIFY"; then
+				echo "Asterisk on $MACHINE exited on signal $EXITSIGNAL.  Might want to take a peek." | \
+				mail -s "Asterisk on $MACHINE died (sig $EXITSIGNAL)" $NOTIFY
+			fi
+			if test -n "$EXEC"; then
+				$EXEC
+			fi
+
+			PID=`cat ${ASTPIDFILE}`
+			DATE=`date "+%Y-%m-%dT%H:%M:%S%z"`
+			if test -f "${RUNDIR}/core.${PID}"; then
+				mv "${RUNDIR}/core.${PID}" "${DUMPDROP}/core.`hostname`-$DATE" &
+			elif test -f "${RUNDIR}/core"; then
+				mv "${RUNDIR}/core" "${DUMPDROP}/core.`hostname`-$DATE" &
+			fi
+		else
+			message "Asterisk died with code $EXITSTATUS."
+
+			PID=`cat ${ASTPIDFILE}`
+			DATE=`date "+%Y-%m-%dT%H:%M:%S%z"`
+			if test -f "${RUNDIR}/core.${PID}"; then
+				mv "${RUNDIR}/core.${PID}" "${DUMPDROP}/core.`hostname`-$DATE" &
+			elif test -f "${RUNDIR}/core"; then
+				mv "${RUNDIR}/core" "${DUMPDROP}/core.`hostname`-$DATE" &
+			fi
+		fi
+		message "Automatically restarting Asterisk."
+		sleep $SLEEPSECS
+		if test "0$KILLALLMPG123" -gt 0; then
+			pkill -9 mpg123
+		fi
+	done
+}
+
+if test -n "$ASTSAFE_FOREGROUND"; then
+	run_asterisk
+else
+	run_asterisk &
+fi