diff -Nur smeserver-freepbx-0.1.old/root/etc/e-smith/db/configuration/defaults/freepbx/UDPPorts smeserver-freepbx-0.1/root/etc/e-smith/db/configuration/defaults/freepbx/UDPPorts
--- smeserver-freepbx-0.1.old/root/etc/e-smith/db/configuration/defaults/freepbx/UDPPorts 2008-09-19 20:05:14.000000000 -0400
+++ smeserver-freepbx-0.1/root/etc/e-smith/db/configuration/defaults/freepbx/UDPPorts 2016-05-15 23:42:16.090000000 -0400
@@ -1 +1 @@
-5060,4569
+5060,5061,4569
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
--- smeserver-freepbx-0.1.old/root/etc/e-smith/db/configuration/migrate/freepbx 2016-05-15 12:39:43.688000000 -0400
+++ smeserver-freepbx-0.1/root/etc/e-smith/db/configuration/migrate/freepbx 2016-05-16 00:11:52.509000000 -0400
@@ -21,5 +21,13 @@
}
$fop->set_prop('Password', $foppass);
+# with freepbx 13, we have a new port
+my $UDPPorts = $freepbx->prop('UDPPorts') || '5060,5061,4569';
+my @UDPlist= split(',',$UDPPorts);
+unless ('5061' ~~ @UDPlist){
+ $UDPPorts = "$UDPPorts,5061";
+ $freepbx->set_prop('UDPPorts',$UDPPorts);
+}
+
}
diff -Nur smeserver-freepbx-0.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28FreePBXProxyPass smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28FreePBXProxyPass
--- smeserver-freepbx-0.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28FreePBXProxyPass 2016-05-15 12:39:43.662000000 -0400
+++ smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28FreePBXProxyPass 2016-05-15 23:34:20.627000000 -0400
@@ -9,12 +9,15 @@
if (($port eq "80") && ($haveSSL eq 'yes')){
$OUT .= " RewriteRule ^/freepbx(/.*|\$) https://%{HTTP_HOST}/freepbx\$1 [L,R]\n";
+ $OUT .= " RewriteRule ^/ucp(/.*|\$) https://%{HTTP_HOST}/ucp\$1 [L,R]\n";
}
else{
$OUT .= " ProxyPass /freepbx http://127.0.0.1:${'httpd-fpbx'}{TCPPort}/freepbx\n";
$OUT .= " ProxyPassReverse /freepbx http://127.0.0.1:${'httpd-fpbx'}{TCPPort}/freepbx\n";
+ $OUT .= " ProxyPass /ucp http://127.0.0.1:${'httpd-fpbx'}{TCPPort}/ucp\n";
+ $OUT .= " ProxyPassReverse /ucp http://127.0.0.1:${'httpd-fpbx'}{TCPPort}/ucp\n";
}
- foreach my $url qw(panel recordings){
+ foreach my $url qw(recordings){
$OUT .= " RewriteRule ^/$url(.*|\$) /freepbx/$url\$1 [L,R]\n";
}
@@ -33,18 +36,18 @@
allow from $localAccess $externalSSLAccess
-
- order deny,allow
- deny from all
- allow from $localAccess
-
-
order deny,allow
deny from all
allow from all
+
+ SSLRequireSSL on
+ order deny,allow
+ deny from all
+ allow from $localAccess $externalSSLAccess
+
HERE
}
diff -Nur smeserver-freepbx-0.1.old/root/etc/e-smith/templates/etc/httpd/fpbx-conf/httpd.conf/90FreePBX10Alias smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/httpd/fpbx-conf/httpd.conf/90FreePBX10Alias
--- smeserver-freepbx-0.1.old/root/etc/e-smith/templates/etc/httpd/fpbx-conf/httpd.conf/90FreePBX10Alias 2008-08-25 17:44:50.000000000 -0400
+++ smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/httpd/fpbx-conf/httpd.conf/90FreePBX10Alias 2016-05-15 23:30:22.037000000 -0400
@@ -1,3 +1,4 @@
Alias /freepbx /opt/freepbx/
+Alias /ucp /opt/freepbx/ucp/
diff -Nur smeserver-freepbx-0.1.old/root/etc/e-smith/templates/etc/httpd/fpbx-conf/httpd.conf/90FreePBX20Root smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/httpd/fpbx-conf/httpd.conf/90FreePBX20Root
--- smeserver-freepbx-0.1.old/root/etc/e-smith/templates/etc/httpd/fpbx-conf/httpd.conf/90FreePBX20Root 2016-05-15 12:39:43.698000000 -0400
+++ smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/httpd/fpbx-conf/httpd.conf/90FreePBX20Root 2016-05-15 23:30:58.304000000 -0400
@@ -1,7 +1,8 @@
AddType application/x-httpd-php .php
- AllowOverride None
+ Options +followSymlinks
+ AllowOverride All
order deny,allow
deny from all
allow from 127.0.0.1
diff -Nur smeserver-freepbx-0.1.old/root/etc/e-smith/templates/etc/httpd/fpbx-conf/httpd.conf/90FreePBX30Admin smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/httpd/fpbx-conf/httpd.conf/90FreePBX30Admin
--- smeserver-freepbx-0.1.old/root/etc/e-smith/templates/etc/httpd/fpbx-conf/httpd.conf/90FreePBX30Admin 2016-05-15 12:39:43.704000000 -0400
+++ smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/httpd/fpbx-conf/httpd.conf/90FreePBX30Admin 2016-05-15 23:29:37.573000000 -0400
@@ -2,7 +2,7 @@
Options +followSymlinks
php_admin_flag allow_url_fopen On
- php_admin_value memory_limit 100M
+ php_admin_value memory_limit 256M
php_admin_value upload_max_filesize 100M
php_admin_value post_max_size 100M
php_admin_flag file_upload On
diff -Nur smeserver-freepbx-0.1.old/root/etc/e-smith/templates/etc/httpd/fpbx-conf/httpd.conf/90FreePBX40Panel smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/httpd/fpbx-conf/httpd.conf/90FreePBX40Panel
--- smeserver-freepbx-0.1.old/root/etc/e-smith/templates/etc/httpd/fpbx-conf/httpd.conf/90FreePBX40Panel 2016-05-15 12:39:43.704000000 -0400
+++ smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/httpd/fpbx-conf/httpd.conf/90FreePBX40Panel 1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-
-
- AuthType Basic
- TKTAuthLoginURL /server-common/cgi-bin/login
- require user admin {getUsersList('fop');}
- SetEnv IMGHDR_SRC "/server-common/server-manager.jpg"
- Satisfy all
- php_admin_value memory_limit {
-my $ml = $php{MemoryLimit} || "100M";
-$OUT .= "$ml";
-}
-
-