/[smecontribs]/rpms/smeserver-freepbx/contribs8/smeserver-freepbx-0.1-fop_separate_service.patch
ViewVC logotype

Contents of /rpms/smeserver-freepbx/contribs8/smeserver-freepbx-0.1-fop_separate_service.patch

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

Revision 1.1 - (show annotations) (download)
Tue Feb 26 03:16:30 2013 UTC (11 years, 2 months ago) by unnilennium
Branch: MAIN
CVS Tags: smeserver-freepbx-0_1-32_el5_sme, smeserver-freepbx-0_1-33_el5_sme, HEAD 
Initial import
1 diff -Nur -x '*.orig' -x '*.rej' smeserver-freepbx-0.1/root/etc/e-smith/db/configuration/defaults/fop/access mezzanine_patched_smeserver-freepbx-0.1/root/etc/e-smith/db/configuration/defaults/fop/access
2 --- smeserver-freepbx-0.1/root/etc/e-smith/db/configuration/defaults/fop/access 1970-01-01 01:00:00.000000000 +0100
3 +++ mezzanine_patched_smeserver-freepbx-0.1/root/etc/e-smith/db/configuration/defaults/fop/access 2009-04-29 17:18:27.000000000 +0200
4 @@ -0,0 +1 @@
5 +private
6 diff -Nur -x '*.orig' -x '*.rej' smeserver-freepbx-0.1/root/etc/e-smith/db/configuration/defaults/fop/status mezzanine_patched_smeserver-freepbx-0.1/root/etc/e-smith/db/configuration/defaults/fop/status
7 --- smeserver-freepbx-0.1/root/etc/e-smith/db/configuration/defaults/fop/status 1970-01-01 01:00:00.000000000 +0100
8 +++ mezzanine_patched_smeserver-freepbx-0.1/root/etc/e-smith/db/configuration/defaults/fop/status 2009-04-29 17:18:15.000000000 +0200
9 @@ -0,0 +1 @@
10 +enabled
11 diff -Nur -x '*.orig' -x '*.rej' smeserver-freepbx-0.1/root/etc/e-smith/db/configuration/defaults/fop/TCPPort mezzanine_patched_smeserver-freepbx-0.1/root/etc/e-smith/db/configuration/defaults/fop/TCPPort
12 --- smeserver-freepbx-0.1/root/etc/e-smith/db/configuration/defaults/fop/TCPPort 1970-01-01 01:00:00.000000000 +0100
13 +++ mezzanine_patched_smeserver-freepbx-0.1/root/etc/e-smith/db/configuration/defaults/fop/TCPPort 2009-04-29 17:21:43.000000000 +0200
14 @@ -0,0 +1 @@
15 +4445
16 diff -Nur -x '*.orig' -x '*.rej' smeserver-freepbx-0.1/root/etc/e-smith/db/configuration/defaults/freepbx/Fop mezzanine_patched_smeserver-freepbx-0.1/root/etc/e-smith/db/configuration/defaults/freepbx/Fop
17 --- smeserver-freepbx-0.1/root/etc/e-smith/db/configuration/defaults/freepbx/Fop 2008-09-20 02:04:31.000000000 +0200
18 +++ mezzanine_patched_smeserver-freepbx-0.1/root/etc/e-smith/db/configuration/defaults/freepbx/Fop 1970-01-01 01:00:00.000000000 +0100
19 @@ -1 +0,0 @@
20 -enabled
21 diff -Nur -x '*.orig' -x '*.rej' smeserver-freepbx-0.1/root/etc/e-smith/db/configuration/migrate/freepbx mezzanine_patched_smeserver-freepbx-0.1/root/etc/e-smith/db/configuration/migrate/freepbx
22 --- smeserver-freepbx-0.1/root/etc/e-smith/db/configuration/migrate/freepbx 2008-08-13 16:33:39.000000000 +0200
23 +++ mezzanine_patched_smeserver-freepbx-0.1/root/etc/e-smith/db/configuration/migrate/freepbx 2009-04-29 17:35:17.000000000 +0200
24 @@ -4,10 +4,19 @@
25 my $dbpass = $freepbx->prop('DbPassword') ||
26 $freepbx->set_prop('DbPassword', `/usr/bin/openssl rand -base64 40 | /usr/bin/tr -c -d '[:graph:]'`);
27
28 -my $foppass = $freepbx->prop('FopPassword') ||
29 - $freepbx->set_prop('FopPassword', `/usr/bin/openssl rand -base64 5 | /usr/bin/tr -c -d '[:alnum:]'`);
30 -
31 my $managerpass = $freepbx->prop('ManagerPassword') ||
32 $freepbx->set_prop('ManagerPassword', `/usr/bin/openssl rand -base64 10 | /usr/bin/tr -c -d '[:alnum:]'`);
33
34 +my $fop = $DB->get('fop') || $DB->new_record('fop', {type => 'service'});
35 +
36 +my $foppass = $fop->prop('Password') || '';
37 +if ($foppass eq ''){
38 + $fopass = $freepbx->prop('FopPassword') || '';
39 + if ($foppass eq ''){
40 + $foppass = `/usr/bin/openssl rand -base64 5 | /usr/bin/tr -c -d '[:alnum:]'`;
41 + }
42 }
43 +$fop->set_prop('Password', $foppass);
44 +
45 +}
46 +
47 diff -Nur -x '*.orig' -x '*.rej' smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/amportal.conf/25fop mezzanine_patched_smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/amportal.conf/25fop
48 --- smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/amportal.conf/25fop 2009-04-29 17:38:05.000000000 +0200
49 +++ mezzanine_patched_smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/amportal.conf/25fop 2009-04-29 17:15:35.000000000 +0200
50 @@ -3,14 +3,14 @@
51 FOPWEBROOT=/opt/freepbx/panel
52
53 # FOPPASSWORD: the secret code for performing transfers and hangups in the Flash Operator Panel
54 -FOPPASSWORD={${'freepbx'}{'FopPassword'} || 'passw0rd';}
55 +FOPPASSWORD={${'fop'}{'Password'} || 'passw0rd';}
56
57 # FOPSORT: FOP should sort extensions by Last Name [lastname] or by Extension [extension]
58 FOPSORT=extension
59
60 # FOPRUN: set to true if you want FOP started by freepbx_engine (amportal_start), false otherwise
61 -FOPRUN={((${'freepbx'}{'Fop'} || 'disabled') eq 'enabled') ? 'true': 'false';}
62 +FOPRUN={((${'fop'}{'status'} || 'disabled') eq 'enabled') ? 'true': 'false';}
63
64 -FOPDISABLE={((${'freepbx'}{'Fop'} || 'disabled') eq 'enabled') ? 'false': 'true';}
65 +FOPDISABLE={((${'fop'}{'status'} || 'disabled') eq 'enabled') ? 'false': 'true';}
66 # Disables FOP in interface and retrieve_conf. Usefull for sqlite3 or if you don't want FOP.
67
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed