/[smecontribs]/rpms/smeserver-freepbx/contribs9/smeserver-freepbx-0.1-Sme9Ast13Fpbx13-5.patch
ViewVC logotype

Contents of /rpms/smeserver-freepbx/contribs9/smeserver-freepbx-0.1-Sme9Ast13Fpbx13-5.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.2 - (show annotations) (download)
Mon Jun 13 12:16:45 2016 UTC (7 years, 11 months ago) by unnilennium
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED 
bump to version 13
1 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
2 --- smeserver-freepbx-0.1.old/root/etc/e-smith/db/configuration/defaults/freepbx/UDPPorts 2008-09-19 20:05:14.000000000 -0400
3 +++ smeserver-freepbx-0.1/root/etc/e-smith/db/configuration/defaults/freepbx/UDPPorts 2016-05-15 23:42:16.090000000 -0400
4 @@ -1 +1 @@
5 -5060,4569
6 +5060,5061,4569
7 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
8 --- smeserver-freepbx-0.1.old/root/etc/e-smith/db/configuration/migrate/freepbx 2016-05-15 12:39:43.688000000 -0400
9 +++ smeserver-freepbx-0.1/root/etc/e-smith/db/configuration/migrate/freepbx 2016-05-16 00:11:52.509000000 -0400
10 @@ -21,5 +21,13 @@
11 }
12 $fop->set_prop('Password', $foppass);
13
14 +# with freepbx 13, we have a new port
15 +my $UDPPorts = $freepbx->prop('UDPPorts') || '5060,5061,4569';
16 +my @UDPlist= split(',',$UDPPorts);
17 +unless ('5061' ~~ @UDPlist){
18 + $UDPPorts = "$UDPPorts,5061";
19 + $freepbx->set_prop('UDPPorts',$UDPPorts);
20 +}
21 +
22 }
23
24 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
25 --- 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
26 +++ smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28FreePBXProxyPass 2016-05-15 23:34:20.627000000 -0400
27 @@ -9,12 +9,15 @@
28
29 if (($port eq "80") && ($haveSSL eq 'yes')){
30 $OUT .= " RewriteRule ^/freepbx(/.*|\$) https://%{HTTP_HOST}/freepbx\$1 [L,R]\n";
31 + $OUT .= " RewriteRule ^/ucp(/.*|\$) https://%{HTTP_HOST}/ucp\$1 [L,R]\n";
32 }
33 else{
34 $OUT .= " ProxyPass /freepbx http://127.0.0.1:${'httpd-fpbx'}{TCPPort}/freepbx\n";
35 $OUT .= " ProxyPassReverse /freepbx http://127.0.0.1:${'httpd-fpbx'}{TCPPort}/freepbx\n";
36 + $OUT .= " ProxyPass /ucp http://127.0.0.1:${'httpd-fpbx'}{TCPPort}/ucp\n";
37 + $OUT .= " ProxyPassReverse /ucp http://127.0.0.1:${'httpd-fpbx'}{TCPPort}/ucp\n";
38 }
39 - foreach my $url qw(panel recordings){
40 + foreach my $url qw(recordings){
41 $OUT .= " RewriteRule ^/$url(.*|\$) /freepbx/$url\$1 [L,R]\n";
42 }
43
44 @@ -33,18 +36,18 @@
45 allow from $localAccess $externalSSLAccess
46 </Location>
47
48 - <Location /freepbx/panel>
49 - order deny,allow
50 - deny from all
51 - allow from $localAccess
52 - </Location>
53 -
54 <Location /freepbx/recordings>
55 order deny,allow
56 deny from all
57 allow from all
58 </Location>
59
60 + <Location /ucp>
61 + SSLRequireSSL on
62 + order deny,allow
63 + deny from all
64 + allow from $localAccess $externalSSLAccess
65 + </Location>
66
67 HERE
68 }
69 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
70 --- 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
71 +++ smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/httpd/fpbx-conf/httpd.conf/90FreePBX10Alias 2016-05-15 23:30:22.037000000 -0400
72 @@ -1,3 +1,4 @@
73
74 Alias /freepbx /opt/freepbx/
75 +Alias /ucp /opt/freepbx/ucp/
76
77 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
78 --- 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
79 +++ smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/httpd/fpbx-conf/httpd.conf/90FreePBX20Root 2016-05-15 23:30:58.304000000 -0400
80 @@ -1,7 +1,8 @@
81
82 <Directory /opt/freepbx/>
83 AddType application/x-httpd-php .php
84 - AllowOverride None
85 + Options +followSymlinks
86 + AllowOverride All
87 order deny,allow
88 deny from all
89 allow from 127.0.0.1
90 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
91 --- 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
92 +++ smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/httpd/fpbx-conf/httpd.conf/90FreePBX30Admin 2016-05-15 23:29:37.573000000 -0400
93 @@ -2,7 +2,7 @@
94 <Directory /opt/freepbx/admin/>
95 Options +followSymlinks
96 php_admin_flag allow_url_fopen On
97 - php_admin_value memory_limit 100M
98 + php_admin_value memory_limit 256M
99 php_admin_value upload_max_filesize 100M
100 php_admin_value post_max_size 100M
101 php_admin_flag file_upload On
102 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
103 --- 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
104 +++ smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/httpd/fpbx-conf/httpd.conf/90FreePBX40Panel 1969-12-31 19:00:00.000000000 -0500
105 @@ -1,13 +0,0 @@
106 -
107 -<Location /freepbx/panel/>
108 - AuthType Basic
109 - TKTAuthLoginURL /server-common/cgi-bin/login
110 - require user admin {getUsersList('fop');}
111 - SetEnv IMGHDR_SRC "/server-common/server-manager.jpg"
112 - Satisfy all
113 - php_admin_value memory_limit {
114 -my $ml = $php{MemoryLimit} || "100M";
115 -$OUT .= "$ml";
116 -}
117 -</Location>
118 -
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed