| 1 |
jpp |
1.1 |
diff -Nur --no-dereference smeserver-freepbx-14.old/createlinks smeserver-freepbx-14/createlinks |
| 2 |
|
|
--- smeserver-freepbx-14.old/createlinks 2022-12-14 23:37:45.763000000 -0500 |
| 3 |
|
|
+++ smeserver-freepbx-14/createlinks 2022-12-15 00:07:43.397000000 -0500 |
| 4 |
|
|
@@ -3,8 +3,8 @@ |
| 5 |
|
|
use esmith::Build::CreateLinks qw(:all); |
| 6 |
|
|
|
| 7 |
|
|
# force default php to php56 |
| 8 |
|
|
-safe_symlink("/usr/bin/php56", "root/usr/sbin/php"); |
| 9 |
|
|
-safe_symlink("/usr/bin/php56", "root/usr/local/sbin/php"); |
| 10 |
|
|
+safe_symlink("/usr/bin/php74", "root/usr/sbin/php"); |
| 11 |
|
|
+safe_symlink("/usr/bin/php74", "root/usr/local/sbin/php"); |
| 12 |
|
|
|
| 13 |
|
|
#safe_symlink("../daemontools" , 'root/etc/rc.d/init.d/supervise/httpd-fpbx'); |
| 14 |
|
|
#safe_symlink("/var/service/httpd-fpbx" , 'root/service/httpd-fpbx'); |
| 15 |
|
|
@@ -21,6 +21,7 @@ |
| 16 |
|
|
templates2events("/etc/asterisk/cdr_mysql.conf", qw(freepbx-update bootstrap-console-save)); |
| 17 |
|
|
templates2events("/etc/asterisk/manager.conf", qw(freepbx-update bootstrap-console-save)); |
| 18 |
|
|
templates2events("/etc/logrotate.d/asterisk", qw(freepbx-update bootstrap-console-save)); |
| 19 |
|
|
+templates2events("/etc/odbc.ini", qw(freepbx-update bootstrap-console-save)); |
| 20 |
|
|
templates2events("/etc/httpd/conf/httpd.conf", $event); |
| 21 |
|
|
templates2events("/etc/httpd/fpbx-conf/httpd.conf", qw(freepbx-update bootstrap-console-save conf-userpanel)); |
| 22 |
|
|
templates2events("/etc/e-smith/sql/init/30freepbx_mysql_create_database", qw(freepbx-update bootstrap-console-save)); |
| 23 |
|
|
@@ -67,7 +68,7 @@ |
| 24 |
|
|
templates2events("/etc/e-smith/sql/init/30freepbx_mysql_create_database", $event); |
| 25 |
|
|
#templates2events("/etc/opt/remi/php56/php-fpm.d/www.conf", $event); |
| 26 |
|
|
templates2events("/opt/remi/php56/root/etc/php-fpm.d/www.conf", $event); |
| 27 |
|
|
- |
| 28 |
|
|
+templates2events("/etc/odbc.ini", $event); |
| 29 |
|
|
|
| 30 |
|
|
event_link("freepbx-checkinstall", $event, "10"); |
| 31 |
|
|
event_link("freepbx-checkinstall-backup", $event, "11"); |
| 32 |
|
|
diff -Nur --no-dereference smeserver-freepbx-14.old/root/etc/e-smith/events/actions/freepbx-checkinstall smeserver-freepbx-14/root/etc/e-smith/events/actions/freepbx-checkinstall |
| 33 |
|
|
--- smeserver-freepbx-14.old/root/etc/e-smith/events/actions/freepbx-checkinstall 2022-12-14 23:37:45.781000000 -0500 |
| 34 |
|
|
+++ smeserver-freepbx-14/root/etc/e-smith/events/actions/freepbx-checkinstall 2022-12-14 23:40:43.021000000 -0500 |
| 35 |
|
|
@@ -53,6 +53,19 @@ |
| 36 |
|
|
# Upgrades have to be done through freePBX and the online repository |
| 37 |
|
|
if [ ! -d /opt/freepbx/admin ]; then |
| 38 |
|
|
mkdir -p /opt/freepbx |
| 39 |
|
|
+ # we need the right php version available |
| 40 |
|
|
+ version=$(/usr/bin/rpm -q freepbx-src --qf "%{version}"|cut -d. -f1) |
| 41 |
|
|
+ php="/usr/bin/php74" |
| 42 |
|
|
+ if [[ $version -ge 16 ]] |
| 43 |
|
|
+ then |
| 44 |
|
|
+ php="/usr/bin/php80" |
| 45 |
|
|
+ elif [[ $version -lt 15 ]] |
| 46 |
|
|
+ then |
| 47 |
|
|
+ php="/usr/bin/php56" |
| 48 |
|
|
+ fi |
| 49 |
|
|
+ ln -sf $php /usr/sbin/php |
| 50 |
|
|
+ ln -sf $php /usr/local/sbin/php |
| 51 |
|
|
+ |
| 52 |
|
|
if [ -e /usr/share/freepbx/sources/freepbx/ ]; then |
| 53 |
|
|
cd /usr/share/freepbx/sources/freepbx/ |
| 54 |
|
|
echo "Starting Asterisk..." > /root/freepbx_install.log |
| 55 |
|
|
@@ -101,7 +114,7 @@ |
| 56 |
|
|
php="/usr/bin/php56" |
| 57 |
|
|
fi |
| 58 |
|
|
ln -sf $php /usr/sbin/php |
| 59 |
|
|
- |
| 60 |
|
|
+ln -sf $php /usr/local/sbin/php |
| 61 |
|
|
|
| 62 |
|
|
# update modules |
| 63 |
|
|
/usr/sbin/e-smith/fwconsole ma upgrade framework |
| 64 |
|
|
diff -Nur --no-dereference smeserver-freepbx-14.old/root/etc/e-smith/templates/etc/odbc.ini/10freepbx smeserver-freepbx-14/root/etc/e-smith/templates/etc/odbc.ini/10freepbx |
| 65 |
|
|
--- smeserver-freepbx-14.old/root/etc/e-smith/templates/etc/odbc.ini/10freepbx 1969-12-31 19:00:00.000000000 -0500 |
| 66 |
|
|
+++ smeserver-freepbx-14/root/etc/e-smith/templates/etc/odbc.ini/10freepbx 2022-12-15 00:06:39.445000000 -0500 |
| 67 |
|
|
@@ -0,0 +1,12 @@ |
| 68 |
|
|
+[MySQL-{ ${freepbx}{CdrDbName} || 'asteriskcdrdb' }] |
| 69 |
|
|
+Description=MySQL connection to '{ ${freepbx}{CdrDbName} || 'asteriskcdrdb' }' database |
| 70 |
|
|
+driver=MySQL |
| 71 |
|
|
+server=localhost |
| 72 |
|
|
+database={ ${freepbx}{CdrDbName} || 'asteriskcdrdb' } |
| 73 |
|
|
+Port=3306 |
| 74 |
|
|
+Socket=/var/lib/mysql/mysql.sock |
| 75 |
|
|
+option=3 |
| 76 |
|
|
+Charset=utf8 |
| 77 |
|
|
+User = { ${freepbx}{DbUser} || 'freepbxuser'} |
| 78 |
|
|
+Password = { ${freepbx}{DbPassword} || 'freepbxuser'} |
| 79 |
|
|
+ |
Parent Directory
| 
Revision Log
| 
Revision Graph
