| 1 |
diff -Nur smeserver-freepbx-0.1.old/root/etc/e-smith/db/configuration/defaults/fop/access smeserver-freepbx-0.1/root/etc/e-smith/db/configuration/defaults/fop/access |
| 2 |
--- smeserver-freepbx-0.1.old/root/etc/e-smith/db/configuration/defaults/fop/access 2016-05-16 04:06:16.238000000 -0400 |
| 3 |
+++ smeserver-freepbx-0.1/root/etc/e-smith/db/configuration/defaults/fop/access 1969-12-31 19:00:00.000000000 -0500 |
| 4 |
@@ -1 +0,0 @@ |
| 5 |
-private |
| 6 |
diff -Nur smeserver-freepbx-0.1.old/root/etc/e-smith/db/configuration/defaults/fop/status smeserver-freepbx-0.1/root/etc/e-smith/db/configuration/defaults/fop/status |
| 7 |
--- smeserver-freepbx-0.1.old/root/etc/e-smith/db/configuration/defaults/fop/status 2016-05-16 04:06:16.238000000 -0400 |
| 8 |
+++ smeserver-freepbx-0.1/root/etc/e-smith/db/configuration/defaults/fop/status 1969-12-31 19:00:00.000000000 -0500 |
| 9 |
@@ -1 +0,0 @@ |
| 10 |
-enabled |
| 11 |
diff -Nur smeserver-freepbx-0.1.old/root/etc/e-smith/db/configuration/defaults/fop/TCPPort smeserver-freepbx-0.1/root/etc/e-smith/db/configuration/defaults/fop/TCPPort |
| 12 |
--- smeserver-freepbx-0.1.old/root/etc/e-smith/db/configuration/defaults/fop/TCPPort 2016-05-16 04:06:16.238000000 -0400 |
| 13 |
+++ smeserver-freepbx-0.1/root/etc/e-smith/db/configuration/defaults/fop/TCPPort 1969-12-31 19:00:00.000000000 -0500 |
| 14 |
@@ -1 +0,0 @@ |
| 15 |
-4445 |
| 16 |
diff -Nur smeserver-freepbx-0.1.old/root/etc/e-smith/db/configuration/migrate/freepbx smeserver-freepbx-0.1/root/etc/e-smith/db/configuration/migrate/freepbx |
| 17 |
--- smeserver-freepbx-0.1.old/root/etc/e-smith/db/configuration/migrate/freepbx 2016-05-16 04:06:16.273000000 -0400 |
| 18 |
+++ smeserver-freepbx-0.1/root/etc/e-smith/db/configuration/migrate/freepbx 2016-05-16 05:18:24.335000000 -0400 |
| 19 |
@@ -10,16 +10,9 @@ |
| 20 |
my $aripass = $freepbx->prop('AriPassword') || |
| 21 |
$freepbx->set_prop('AriPassword', `/usr/bin/openssl rand -base64 10 | /usr/bin/tr -c -d '[:alnum:]'`); |
| 22 |
|
| 23 |
-my $fop = $DB->get('fop') || $DB->new_record('fop', {type => 'service'}); |
| 24 |
- |
| 25 |
-my $foppass = $fop->prop('Password') || ''; |
| 26 |
-if ($foppass eq ''){ |
| 27 |
- $fopass = $freepbx->prop('FopPassword') || ''; |
| 28 |
- if ($foppass eq ''){ |
| 29 |
- $foppass = `/usr/bin/openssl rand -base64 5 | /usr/bin/tr -c -d '[:alnum:]'`; |
| 30 |
- } |
| 31 |
-} |
| 32 |
-$fop->set_prop('Password', $foppass); |
| 33 |
+# FOP not compatible with latest astersisk |
| 34 |
+my $fop = $DB->get("fop"); |
| 35 |
+$fop->delete if $fop; |
| 36 |
|
| 37 |
# with freepbx 13, we have a new port |
| 38 |
my $UDPPorts = $freepbx->prop('UDPPorts') || '5060,5061,4569'; |
| 39 |
diff -Nur smeserver-freepbx-0.1.old/root/etc/e-smith/events/actions/freepbx-checkinstall smeserver-freepbx-0.1/root/etc/e-smith/events/actions/freepbx-checkinstall |
| 40 |
--- smeserver-freepbx-0.1.old/root/etc/e-smith/events/actions/freepbx-checkinstall 2016-05-16 04:06:16.266000000 -0400 |
| 41 |
+++ smeserver-freepbx-0.1/root/etc/e-smith/events/actions/freepbx-checkinstall 2016-05-16 05:54:21.731000000 -0400 |
| 42 |
@@ -13,8 +13,6 @@ |
| 43 |
|
| 44 |
if [ -e /usr/share/freepbx/sources/freepbx/installlib/SQL/asterisk.sql ]; then |
| 45 |
mysql $DBNAME < /usr/share/freepbx/sources/freepbx/installlib/SQL/asterisk.sql |
| 46 |
- mysql $DBNAME -e "UPDATE freepbx_settings SET value=0 where keyword='CHECKREFERER';" |
| 47 |
- mysql $DBNAME -e "UPDATE freepbx_settings SET value='webserver' where keyword='AUTHTYPE';" |
| 48 |
else |
| 49 |
echo "Error: file /usr/share/freepbx/sources/freepbx/installlib/SQL/asterisk.sql doesn't exists" |
| 50 |
exit 1 |
| 51 |
diff -Nur smeserver-freepbx-0.1.old/root/etc/e-smith/templates/etc/e-smith/sql/init/30freepbx_mysql_create_database smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/30freepbx_mysql_create_database |
| 52 |
--- smeserver-freepbx-0.1.old/root/etc/e-smith/templates/etc/e-smith/sql/init/30freepbx_mysql_create_database 2016-05-16 04:06:16.266000000 -0400 |
| 53 |
+++ smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/30freepbx_mysql_create_database 2016-05-16 06:30:57.288000000 -0400 |
| 54 |
@@ -5,6 +5,7 @@ |
| 55 |
my $dbuser = $freepbx{'DbUser'} || 'freepbxuser'; |
| 56 |
my $dbpass = $freepbx{'DbPassword'} || 'secret'; |
| 57 |
my $cdrdbpass = $freepbx{'CdrDbPassword'} || 'secret'; |
| 58 |
+my $ManagerPassword = $freepbx{'ManagerPassword'} || 'secret'; |
| 59 |
|
| 60 |
$OUT .= << "HERE"; |
| 61 |
#! /bin/sh |
| 62 |
@@ -14,8 +15,6 @@ |
| 63 |
|
| 64 |
if [ -e /usr/share/freepbx/sources/freepbx/installlib/SQL/asterisk.sql ]; then |
| 65 |
mysql $dbname < /usr/share/freepbx/sources/freepbx/installlib/SQL/asterisk.sql |
| 66 |
- mysql $dbname -e "UPDATE freepbx_settings SET value=0 where keyword='CHECKREFERER';" |
| 67 |
- mysql $dbname -e "UPDATE freepbx_settings SET value='webserver' where keyword='AUTHTYPE';" |
| 68 |
else |
| 69 |
echo "Error: file /usr/share/freepbx/sources/freepbx/installlib/SQL/asterisk.sql doesn't exists" |
| 70 |
exit 1 |
| 71 |
@@ -32,6 +31,10 @@ |
| 72 |
fi |
| 73 |
fi |
| 74 |
|
| 75 |
+/usr/bin/mysql $dbname -e 'INSERT INTO `admin` (`variable`, `value`) VALUES ("email", "admin\@$DomainName") ON DUPLICATE KEY UPDATE `value` = "admin\@$DomainName";' |
| 76 |
+/usr/bin/mysql $dbname -e 'INSERT INTO `ampusers` (`username`, `password_sha1`, `extension_low`, `extension_high`, `deptname`, `sections`) VALUES |
| 77 |
+("admin", sha1("$ManagerPassword"), "", "", "", 0x2a) ON DUPLICATE KEY UPDATE `password_sha1` = sha1("$ManagerPassword");' |
| 78 |
+ |
| 79 |
/usr/bin/mysql <<EOF |
| 80 |
USE mysql; |
| 81 |
|
Parent Directory
| 
Revision Log
| 
Revision Graph
