jpp/ansible-roles
1
0
Fork 0
mirror of https://git.lapiole.org/dani/ansible-roles.git synced 2025-07-27 00:05:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to 2021-12-01 19:13

Browse Source
This commit is contained in:
Daniel Berteaud
2021-12-01 19:13:34 +01:00
commit 4c4556c660
2153 changed files with 60999 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
roles/freepbx/files/patches/install_dbhost.patch Normal file
View File

@@ -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..");

21
roles/freepbx/files/patches/webrtc_proxy.patch Normal file
View File

@@ -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");