1 |
diff -Nur --no-dereference smeserver-freepbx-13.old/createlinks smeserver-freepbx-13/createlinks |
diff -Nur --no-dereference smeserver-freepbx-13.old/createlinks smeserver-freepbx-13/createlinks |
2 |
--- smeserver-freepbx-13.old/createlinks 2022-03-24 23:13:37.415000000 -0400 |
--- smeserver-freepbx-13.old/createlinks 2022-03-24 23:13:37.415000000 -0400 |
3 |
+++ smeserver-freepbx-13/createlinks 2022-03-27 16:19:38.048000000 -0400 |
+++ smeserver-freepbx-13/createlinks 2022-03-27 21:28:09.866000000 -0400 |
4 |
@@ -4,23 +4,23 @@ |
@@ -2,25 +2,12 @@ |
5 |
|
|
6 |
# Start and stop links |
use esmith::Build::CreateLinks qw(:all); |
7 |
|
|
8 |
|
-# Start and stop links |
9 |
|
+# force default php to php56 |
10 |
|
+safe_symlink("/usr/bin/php56", "root/usr/sbin/php"); |
11 |
|
+safe_symlink("/usr/bin/php56", "/usr/local/sbin/php"); |
12 |
|
|
13 |
-service_link_enhanced("freepbx", "S98", "7"); |
-service_link_enhanced("freepbx", "S98", "7"); |
14 |
-service_link_enhanced("freepbx", "K10", "6"); |
-service_link_enhanced("freepbx", "K10", "6"); |
24 |
-service_link_enhanced("dahdi", "K16", "6"); |
-service_link_enhanced("dahdi", "K16", "6"); |
25 |
-service_link_enhanced("dahdi", "K16", "0"); |
-service_link_enhanced("dahdi", "K16", "0"); |
26 |
-service_link_enhanced("dahdi", "K16", "1"); |
-service_link_enhanced("dahdi", "K16", "1"); |
27 |
+#service_link_enhanced("freepbx", "S98", "7"); |
- |
|
+#service_link_enhanced("freepbx", "K10", "6"); |
|
|
+#service_link_enhanced("freepbx", "K10", "0"); |
|
|
+#service_link_enhanced("freepbx", "K10", "1"); |
|
|
+ |
|
|
+#service_link_enhanced("httpd-fpbx", "S86", "7"); |
|
|
+#service_link_enhanced("httpd-fpbx", "K15", "6"); |
|
|
+#service_link_enhanced("httpd-fpbx", "K15", "0"); |
|
|
+#service_link_enhanced("httpd-fpbx", "K15", "1"); |
|
|
+ |
|
|
+#service_link_enhanced("dahdi", "S09", "7"); |
|
|
+#service_link_enhanced("dahdi", "K16", "6"); |
|
|
+#service_link_enhanced("dahdi", "K16", "0"); |
|
|
+#service_link_enhanced("dahdi", "K16", "1"); |
|
|
|
|
28 |
-safe_symlink("../daemontools" , 'root/etc/rc.d/init.d/supervise/httpd-fpbx'); |
-safe_symlink("../daemontools" , 'root/etc/rc.d/init.d/supervise/httpd-fpbx'); |
29 |
-safe_symlink("/var/service/httpd-fpbx" , 'root/service/httpd-fpbx'); |
-safe_symlink("/var/service/httpd-fpbx" , 'root/service/httpd-fpbx'); |
30 |
+#safe_symlink("../daemontools" , 'root/etc/rc.d/init.d/supervise/httpd-fpbx'); |
+#safe_symlink("../daemontools" , 'root/etc/rc.d/init.d/supervise/httpd-fpbx'); |
32 |
|
|
33 |
# Panel links |
# Panel links |
34 |
|
|
35 |
@@ -37,6 +37,8 @@ |
@@ -37,6 +24,8 @@ |
36 |
templates2events("/etc/httpd/conf/httpd.conf", $event); |
templates2events("/etc/httpd/conf/httpd.conf", $event); |
37 |
templates2events("/etc/httpd/fpbx-conf/httpd.conf", qw(freepbx-update bootstrap-console-save conf-userpanel)); |
templates2events("/etc/httpd/fpbx-conf/httpd.conf", qw(freepbx-update bootstrap-console-save conf-userpanel)); |
38 |
templates2events("/etc/e-smith/sql/init/30freepbx_mysql_create_database", qw(freepbx-update bootstrap-console-save)); |
templates2events("/etc/e-smith/sql/init/30freepbx_mysql_create_database", qw(freepbx-update bootstrap-console-save)); |
41 |
|
|
42 |
event_link("freepbx-checkinstall", $event, "10"); |
event_link("freepbx-checkinstall", $event, "10"); |
43 |
event_link("freepbx-checkinstall-backup", $event, "11"); |
event_link("freepbx-checkinstall-backup", $event, "11"); |
44 |
@@ -48,17 +50,46 @@ |
@@ -48,17 +37,46 @@ |
45 |
safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysql.init"); |
safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysql.init"); |
46 |
safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); |
safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); |
47 |
safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-fpbx"); |
safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-fpbx"); |
91 |
+event_link("systemd-default", $event, "88"); |
+event_link("systemd-default", $event, "88"); |
92 |
+event_link("systemd-reload", $event, "89"); |
+event_link("systemd-reload", $event, "89"); |
93 |
+ |
+ |
|
diff -Nur --no-dereference smeserver-freepbx-13.old/root/etc/e-smith/events/actions/freepbx-amportal.conf smeserver-freepbx-13/root/etc/e-smith/events/actions/freepbx-amportal.conf |
|
|
--- smeserver-freepbx-13.old/root/etc/e-smith/events/actions/freepbx-amportal.conf 2022-03-24 23:13:37.422000000 -0400 |
|
|
+++ smeserver-freepbx-13/root/etc/e-smith/events/actions/freepbx-amportal.conf 2022-03-27 16:11:55.606000000 -0400 |
|
|
@@ -1,4 +1,5 @@ |
|
|
#!/bin/bash |
|
|
+. /opt/remi/php56/enable |
|
|
|
|
|
# Change FreePBX database settings that should have come from /etc/amportal.conf, |
|
|
# this is a dynamic template for FreePBX > 1.9 as it update the file on the fly, and also the db |
|
94 |
diff -Nur --no-dereference smeserver-freepbx-13.old/root/etc/e-smith/events/actions/freepbx-checkinstall smeserver-freepbx-13/root/etc/e-smith/events/actions/freepbx-checkinstall |
diff -Nur --no-dereference smeserver-freepbx-13.old/root/etc/e-smith/events/actions/freepbx-checkinstall smeserver-freepbx-13/root/etc/e-smith/events/actions/freepbx-checkinstall |
95 |
--- smeserver-freepbx-13.old/root/etc/e-smith/events/actions/freepbx-checkinstall 2022-03-24 23:13:37.431000000 -0400 |
--- smeserver-freepbx-13.old/root/etc/e-smith/events/actions/freepbx-checkinstall 2022-03-24 23:13:37.431000000 -0400 |
96 |
+++ smeserver-freepbx-13/root/etc/e-smith/events/actions/freepbx-checkinstall 2022-03-27 16:11:55.183000000 -0400 |
+++ smeserver-freepbx-13/root/etc/e-smith/events/actions/freepbx-checkinstall 2022-03-27 21:53:33.588000000 -0400 |
97 |
@@ -1,26 +1,28 @@ |
@@ -4,23 +4,24 @@ |
|
#!/bin/bash |
|
|
+. /opt/remi/php56/enable |
|
|
|
|
|
DBNAME=$(/sbin/e-smith/db configuration getprop freepbx DbName) |
|
98 |
DBUSER=$(/sbin/e-smith/db configuration getprop freepbx DbUser) |
DBUSER=$(/sbin/e-smith/db configuration getprop freepbx DbUser) |
99 |
DBPASS=$(/sbin/e-smith/db configuration getprop freepbx DbPassword) |
DBPASS=$(/sbin/e-smith/db configuration getprop freepbx DbPassword) |
100 |
CDRDBNAME=$(/sbin/e-smith/db configuration getprop freepbx CdrDbName) |
CDRDBNAME=$(/sbin/e-smith/db configuration getprop freepbx CdrDbName) |
125 |
mysql -e "grant all privileges on $CDRDBNAME.* to '$DBUSER'@'localhost' identified by '$DBPASS';" |
mysql -e "grant all privileges on $CDRDBNAME.* to '$DBUSER'@'localhost' identified by '$DBPASS';" |
126 |
mysql -e 'flush privileges;' |
mysql -e 'flush privileges;' |
127 |
if [ -e /usr/share/freepbx/sources/freepbx/installlib/SQL/cdr.sql ]; then |
if [ -e /usr/share/freepbx/sources/freepbx/installlib/SQL/cdr.sql ]; then |
128 |
@@ -31,8 +33,19 @@ |
@@ -31,9 +32,21 @@ |
129 |
fi |
fi |
130 |
fi |
fi |
131 |
|
|
136 |
+ |
+ |
137 |
# Chown dir to allow user asterisk to create its files |
# Chown dir to allow user asterisk to create its files |
138 |
chown asterisk:asterisk /var/lib/asterisk |
chown asterisk:asterisk /var/lib/asterisk |
|
+# workaround as freepbx is expecting them in /var not /usr/share |
|
|
+pushd /var/lib/asterisk |
|
|
+if [[ ! -d /usr/share/asterisk/documentation ]]; then ln -s /usr/share/asterisk/documentation ; fi |
|
|
+if [[ ! -d /usr/share/asterisk/moh ]]; then ln -s /usr/share/asterisk/moh ; fi |
|
|
+if [[ ! -d /usr/share/asterisk/sounds ]]; then ln -s /usr/share/asterisk/sounds/ ; fi |
|
|
+popd |
|
139 |
|
|
140 |
|
+# workaround as freepbx is expecting them in /var not /usr/share |
141 |
|
+#pushd /var/lib/asterisk |
142 |
|
+#if [[ ! -d /var/lib/asterisk/documentation ]]; then ln -s /usr/share/asterisk/documentation ; fi |
143 |
|
+#if [[ ! -d /var/lib/asterisk/moh ]]; then ln -s /usr/share/asterisk/moh ; fi |
144 |
|
+#if [[ ! -d /var/lib/asterisk/sounds ]]; then ln -s /usr/share/asterisk/sounds/ ; fi |
145 |
|
+#popd |
146 |
|
+ |
147 |
# Run the install script only if it's a new install |
# Run the install script only if it's a new install |
148 |
# Upgrades have to be done through freePBX and the online repository |
# Upgrades have to be done through freePBX and the online repository |
149 |
|
if [ ! -d /opt/freepbx/admin ]; then |
150 |
@@ -44,7 +57,11 @@ |
@@ -44,7 +57,11 @@ |
151 |
./start_asterisk start >> /root/freepbx_install.log 2>&1 |
./start_asterisk start >> /root/freepbx_install.log 2>&1 |
152 |
echo "" >> /root/freepbx_install.log |
echo "" >> /root/freepbx_install.log |
160 |
else |
else |
161 |
echo "error: /usr/share/freepbx/sources/freepbx/ doesn't exists" |
echo "error: /usr/share/freepbx/sources/freepbx/ doesn't exists" |
162 |
exit 1 |
exit 1 |
163 |
@@ -73,5 +90,6 @@ |
@@ -72,6 +89,6 @@ |
164 |
|
# update modules |
165 |
/usr/sbin/fwconsole ma upgrade framework |
/usr/sbin/fwconsole ma upgrade framework |
166 |
/usr/sbin/fwconsole ma upgradeall -R standard -R extended |
/usr/sbin/fwconsole ma upgradeall -R standard -R extended |
167 |
/usr/sbin/fwconsole ma refreshsignatures |
-/usr/sbin/fwconsole ma refreshsignatures |
168 |
- |
- |
169 |
+/usr/sbin/fwconsole ma download ucp |
+/usr/sbin/fwconsole ma refreshsignatures |
170 |
+/usr/sbin/fwconsole ma install ucp |
+/usr/sbin/fwconsole ma downloadinstall userman certman ucp |
171 |
exit 0 |
exit 0 |
172 |
diff -Nur --no-dereference smeserver-freepbx-13.old/root/etc/e-smith/events/actions/freepbx-checkinstall-backup smeserver-freepbx-13/root/etc/e-smith/events/actions/freepbx-checkinstall-backup |
diff -Nur --no-dereference smeserver-freepbx-13.old/root/etc/e-smith/templates/etc/asterisk/asterisk.conf/10dirs smeserver-freepbx-13/root/etc/e-smith/templates/etc/asterisk/asterisk.conf/10dirs |
173 |
--- smeserver-freepbx-13.old/root/etc/e-smith/events/actions/freepbx-checkinstall-backup 2022-03-24 23:13:37.418000000 -0400 |
--- smeserver-freepbx-13.old/root/etc/e-smith/templates/etc/asterisk/asterisk.conf/10dirs 2016-06-13 08:03:08.000000000 -0400 |
174 |
+++ smeserver-freepbx-13/root/etc/e-smith/events/actions/freepbx-checkinstall-backup 2022-03-27 16:11:54.985000000 -0400 |
+++ smeserver-freepbx-13/root/etc/e-smith/templates/etc/asterisk/asterisk.conf/10dirs 2022-03-27 21:39:15.866000000 -0400 |
175 |
@@ -1,4 +1,5 @@ |
@@ -3,7 +3,8 @@ |
176 |
#!/bin/sh |
astmoddir => { return '/usr/lib64/asterisk/modules' if -d '/usr/lib64/asterisk/modules'; |
177 |
+. /opt/remi/php56/enable |
return '/usr/lib/asterisk/modules' if -d '/usr/lib/asterisk/modules'; } |
178 |
|
astvarlibdir => /var/lib/asterisk |
179 |
DBNAME=$(/sbin/e-smith/db configuration getprop freepbx DbName) |
-astdatadir => /var/lib/asterisk |
180 |
backuppath='/home/e-smith/files/freepbx' |
+astdatadir => { return '/var/lib/asterisk' if -d '/var/lib/asterisk/documentation' ; |
181 |
diff -Nur --no-dereference smeserver-freepbx-13.old/root/etc/e-smith/events/actions/freepbx-dump-astdb smeserver-freepbx-13/root/etc/e-smith/events/actions/freepbx-dump-astdb |
+ return '/usr/share/asterisk' if -d '/usr/share/asterisk/documentation';} |
182 |
--- smeserver-freepbx-13.old/root/etc/e-smith/events/actions/freepbx-dump-astdb 2022-03-24 23:13:37.403000000 -0400 |
astagidir => /var/lib/asterisk/agi-bin |
183 |
+++ smeserver-freepbx-13/root/etc/e-smith/events/actions/freepbx-dump-astdb 2022-03-27 16:11:55.380000000 -0400 |
astspooldir => /var/spool/asterisk |
184 |
@@ -1,4 +1,4 @@ |
astrundir => /var/run/asterisk |
|
-#!/usr/bin/env php |
|
|
+#!/usr/bin/env php56 |
|
|
<?php |
|
|
// No use outputting anything, as env forces php headers to appear. Sigh. |
|
|
|
|
185 |
diff -Nur --no-dereference smeserver-freepbx-13.old/root/etc/e-smith/templates/etc/e-smith/sql/init/30freepbx_mysql_create_database smeserver-freepbx-13/root/etc/e-smith/templates/etc/e-smith/sql/init/30freepbx_mysql_create_database |
diff -Nur --no-dereference smeserver-freepbx-13.old/root/etc/e-smith/templates/etc/e-smith/sql/init/30freepbx_mysql_create_database smeserver-freepbx-13/root/etc/e-smith/templates/etc/e-smith/sql/init/30freepbx_mysql_create_database |
186 |
--- smeserver-freepbx-13.old/root/etc/e-smith/templates/etc/e-smith/sql/init/30freepbx_mysql_create_database 2016-06-13 08:03:08.000000000 -0400 |
--- smeserver-freepbx-13.old/root/etc/e-smith/templates/etc/e-smith/sql/init/30freepbx_mysql_create_database 2016-06-13 08:03:08.000000000 -0400 |
187 |
+++ smeserver-freepbx-13/root/etc/e-smith/templates/etc/e-smith/sql/init/30freepbx_mysql_create_database 2022-03-27 16:11:55.804000000 -0400 |
+++ smeserver-freepbx-13/root/etc/e-smith/templates/etc/e-smith/sql/init/30freepbx_mysql_create_database 2022-03-27 16:11:55.804000000 -0400 |