smeserver-freepbx/contribs9/smeserver-freepbx-0.1-Sme9Ast13Fpbx13-2.patch

diff -Nur smeserver-freepbx-0.1.old/createlinks smeserver-freepbx-0.1/createlinks
--- smeserver-freepbx-0.1.old/createlinks       2016-05-15 10:32:46.431000000 -0400
+++ smeserver-freepbx-0.1/createlinks   2016-05-15 10:38:53.789000000 -0400
@@ -30,7 +30,7 @@
 # Events links
 
 my $event = 'freepbx-update';
-templates2events("/etc/amportal.conf", qw(freepbx-update bootstrap-console-save));
+#templates2events("/etc/amportal.conf", qw(freepbx-update bootstrap-console-save));
 templates2events("/etc/asterisk/asterisk.conf", qw(freepbx-update bootstrap-console-save));
 templates2events("/etc/asterisk/cdr_mysql.conf", qw(freepbx-update bootstrap-console-save));
 templates2events("/etc/asterisk/manager.conf", qw(freepbx-update bootstrap-console-save));
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
--- smeserver-freepbx-0.1.old/root/etc/e-smith/events/actions/freepbx-checkinstall      2016-05-15 10:32:46.441000000 -0400
+++ smeserver-freepbx-0.1/root/etc/e-smith/events/actions/freepbx-checkinstall  2016-05-15 10:51:00.196000000 -0400
@@ -13,6 +13,8 @@
 
         if [ -e /usr/share/freepbx/sources/freepbx/installlib/SQL/asterisk.sql ]; then
                 mysql $DBNAME < /usr/share/freepbx/sources/freepbx/installlib/SQL/asterisk.sql
+                mysql $DBNAME -e "UPDATE freepbx_settings SET value=0 where keyword='CHECKREFERER';"
+                mysql $DBNAME -e "UPDATE freepbx_settings SET value='webserver' where keyword='AUTHTYPE';"
         else
                 echo "Error: file /usr/share/freepbx/sources/freepbx/installlib/SQL/asterisk.sql doesn't exists"
                 exit 1
@@ -31,6 +33,9 @@
         fi
 fi
 
+# Chown dir to allow user asterisk to create its files
+chown asterisk:asterisk /var/lib/asterisk
+
 # Run the install script only if it's a new install
 # Upgrades have to be done through freePBX and the online repository
 if [ ! -d /opt/freepbx/admin ]; then
@@ -41,7 +46,7 @@
         ./start_asterisk start >> /root/freepbx_install.log 2>&1
        echo "" >> /root/freepbx_install.log
        echo "Installing FreePBX..." >> /root/freepbx_install.log
-       echo "a" | ./install -n >> /root/freepbx_install.log 2>&1
+       echo "a" | ./install --webroot="/opt/freepbx" --dbengine="mysql" --dbname="freepbxdb" --dbuser="freepbxuser" --dbpass="$DBPASS" -n >> /root/freepbx_install.log 2>&1
        else
                echo "error: /usr/share/freepbx/sources/freepbx/ dosen't exists"
                exit 1
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
--- smeserver-freepbx-0.1.old/root/etc/e-smith/templates/etc/e-smith/sql/init/30freepbx_mysql_create_database   2016-05-15 10:32:46.441000000 -0400
+++ smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/30freepbx_mysql_create_database       2016-05-15 10:52:37.116000000 -0400
@@ -14,6 +14,8 @@
 
     if [ -e /usr/share/freepbx/sources/freepbx/installlib/SQL/asterisk.sql ]; then
         mysql $dbname < /usr/share/freepbx/sources/freepbx/installlib/SQL/asterisk.sql
+       mysql $DBNAME -e "UPDATE freepbx_settings SET value=0 where keyword='CHECKREFERER';"
+       mysql $DBNAME -e "UPDATE freepbx_settings SET value='webserver' where keyword='AUTHTYPE';"
     else
         echo "Error: file /usr/share/freepbx/sources/freepbx/installlib/SQL/asterisk.sql doesn't exists"
         exit 1
1	diff -Nur smeserver-freepbx-0.1.old/createlinks smeserver-freepbx-0.1/createlinks
2	--- smeserver-freepbx-0.1.old/createlinks 2016-05-15 10:32:46.431000000 -0400
3	+++ smeserver-freepbx-0.1/createlinks 2016-05-15 10:38:53.789000000 -0400
4	@@ -30,7 +30,7 @@
5	# Events links
6
7	my $event = 'freepbx-update';
8	-templates2events("/etc/amportal.conf", qw(freepbx-update bootstrap-console-save));
9	+#templates2events("/etc/amportal.conf", qw(freepbx-update bootstrap-console-save));
10	templates2events("/etc/asterisk/asterisk.conf", qw(freepbx-update bootstrap-console-save));
11	templates2events("/etc/asterisk/cdr_mysql.conf", qw(freepbx-update bootstrap-console-save));
12	templates2events("/etc/asterisk/manager.conf", qw(freepbx-update bootstrap-console-save));
13	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
14	--- smeserver-freepbx-0.1.old/root/etc/e-smith/events/actions/freepbx-checkinstall 2016-05-15 10:32:46.441000000 -0400
15	+++ smeserver-freepbx-0.1/root/etc/e-smith/events/actions/freepbx-checkinstall 2016-05-15 10:51:00.196000000 -0400
16	@@ -13,6 +13,8 @@
17
18	if [ -e /usr/share/freepbx/sources/freepbx/installlib/SQL/asterisk.sql ]; then
19	mysql $DBNAME < /usr/share/freepbx/sources/freepbx/installlib/SQL/asterisk.sql
20	+ mysql $DBNAME -e "UPDATE freepbx_settings SET value=0 where keyword='CHECKREFERER';"
21	+ mysql $DBNAME -e "UPDATE freepbx_settings SET value='webserver' where keyword='AUTHTYPE';"
22	else
23	echo "Error: file /usr/share/freepbx/sources/freepbx/installlib/SQL/asterisk.sql doesn't exists"
24	exit 1
25	@@ -31,6 +33,9 @@
26	fi
27	fi
28
29	+# Chown dir to allow user asterisk to create its files
30	+chown asterisk:asterisk /var/lib/asterisk
31	+
32	# Run the install script only if it's a new install
33	# Upgrades have to be done through freePBX and the online repository
34	if [ ! -d /opt/freepbx/admin ]; then
35	@@ -41,7 +46,7 @@
36	./start_asterisk start >> /root/freepbx_install.log 2>&1
37	echo "" >> /root/freepbx_install.log
38	echo "Installing FreePBX..." >> /root/freepbx_install.log
39	- echo "a" \| ./install -n >> /root/freepbx_install.log 2>&1
40	+ echo "a" \| ./install --webroot="/opt/freepbx" --dbengine="mysql" --dbname="freepbxdb" --dbuser="freepbxuser" --dbpass="$DBPASS" -n >> /root/freepbx_install.log 2>&1
41	else
42	echo "error: /usr/share/freepbx/sources/freepbx/ dosen't exists"
43	exit 1
44	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
45	--- smeserver-freepbx-0.1.old/root/etc/e-smith/templates/etc/e-smith/sql/init/30freepbx_mysql_create_database 2016-05-15 10:32:46.441000000 -0400
46	+++ smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/30freepbx_mysql_create_database 2016-05-15 10:52:37.116000000 -0400
47	@@ -14,6 +14,8 @@
48
49	if [ -e /usr/share/freepbx/sources/freepbx/installlib/SQL/asterisk.sql ]; then
50	mysql $dbname < /usr/share/freepbx/sources/freepbx/installlib/SQL/asterisk.sql
51	+ mysql $DBNAME -e "UPDATE freepbx_settings SET value=0 where keyword='CHECKREFERER';"
52	+ mysql $DBNAME -e "UPDATE freepbx_settings SET value='webserver' where keyword='AUTHTYPE';"
53	else
54	echo "Error: file /usr/share/freepbx/sources/freepbx/installlib/SQL/asterisk.sql doesn't exists"
55	exit 1