/[smecontribs]/rpms/smeserver-openvpn-bridge/contribs8/smeserver-openvpn-bridge-2.0-check_bridge.patch
ViewVC logotype

Annotation of /rpms/smeserver-openvpn-bridge/contribs8/smeserver-openvpn-bridge-2.0-check_bridge.patch

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

Revision 1.1 - (hide annotations) (download)
Sun Mar 3 21:14:33 2013 UTC (11 years, 2 months ago) by unnilennium
Branch: MAIN
CVS Tags: smeserver-openvpn-bridge-2_0-49_el5_sme, smeserver-openvpn-bridge-2_0-55_el5_sme, smeserver-openvpn-bridge-2_0-48_el5_sme, smeserver-openvpn-bridge-2_0-56_el5_sme, smeserver-openvpn-bridge-2_0-51_el5_sme, smeserver-openvpn-bridge-2_0-52_el5_sme, smeserver-openvpn-bridge-2_0-53_el5_sme, smeserver-openvpn-bridge-2_0-54_el5_sme, smeserver-openvpn-bridge-2_0-47_el5_sme, smeserver-openvpn-bridge-2_0-50_el5_sme, HEAD 
Initial import
1 unnilennium 1.1 diff -Nur -x '*.orig' -x '*.rej' smeserver-openvpn-bridge-2.0/root/etc/e-smith/locale/en/etc/e-smith/web/functions/openvpnbridge mezzanine_patched_smeserver-openvpn-bridge-2.0/root/etc/e-smith/locale/en/etc/e-smith/web/functions/openvpnbridge
2     --- smeserver-openvpn-bridge-2.0/root/etc/e-smith/locale/en/etc/e-smith/web/functions/openvpnbridge 2009-01-16 13:13:39.000000000 +0100
3     +++ mezzanine_patched_smeserver-openvpn-bridge-2.0/root/etc/e-smith/locale/en/etc/e-smith/web/functions/openvpnbridge 2009-01-16 13:13:25.000000000 +0100
4     @@ -392,4 +392,10 @@
5     <trans>"{$string}" contains forbiden characters</trans>
6     </entry>
7    
8     + <entry>
9     + <base>BRIDGE_NOT_ENABLED</base>
10     + <trans><![CDATA[<span style="color:red">The bridge service must be enabled.<br>The following commands will enable it:<br>db configuration setprop bridge status enabled<br>/etc/init.d/bridge start</span><br><br>]]></trans>
11     + </entry>
12     +
13     +
14     </lexicon>
15     diff -Nur -x '*.orig' -x '*.rej' smeserver-openvpn-bridge-2.0/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/openvpnbridge mezzanine_patched_smeserver-openvpn-bridge-2.0/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/openvpnbridge
16     --- smeserver-openvpn-bridge-2.0/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/openvpnbridge 2009-01-16 13:13:39.000000000 +0100
17     +++ mezzanine_patched_smeserver-openvpn-bridge-2.0/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/openvpnbridge 2009-01-16 13:12:59.000000000 +0100
18     @@ -390,4 +390,9 @@
19     <trans>"{$string}" comporte des charactères nonautorisés</trans>
20     </entry>
21    
22     + <entry>
23     + <base>BRIDGE_NOT_ENABLED</base>
24     + <trans><![CDATA[<span style="color:red">Le service bridge doit être activé.<br>Les commandes suivantes permettrons de l'activer:<br>db configuration setprop bridge status enabled<br>/etc/init.d/bridge start</span><br><br>]]></trans>
25     + </entry>
26     +
27     </lexicon>
28     diff -Nur -x '*.orig' -x '*.rej' smeserver-openvpn-bridge-2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/openvpnbridge.pm mezzanine_patched_smeserver-openvpn-bridge-2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/openvpnbridge.pm
29     --- smeserver-openvpn-bridge-2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/openvpnbridge.pm 2009-01-16 13:13:39.000000000 +0100
30     +++ mezzanine_patched_smeserver-openvpn-bridge-2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/openvpnbridge.pm 2009-01-16 13:11:16.000000000 +0100
31     @@ -478,6 +478,14 @@
32    
33     sub print_crt_not_ready_warning{
34     my ($fm) = @_;
35     +
36     + # First, check the service "bridge" is running
37     + my $bridge = $config_db->get_prop('bridge', 'status') || 'disabled';
38     +
39     + unless ($bridge eq 'enabled'){
40     + return $fm->localise('BRIDGE_NOT_ENABLED');
41     + }
42     +
43     # If any of the required files is missing or empty
44     # Warn the user
45     if (
46     diff -Nur -x '*.orig' -x '*.rej' smeserver-openvpn-bridge-2.0/root/var/service/openvpn-bridge/run mezzanine_patched_smeserver-openvpn-bridge-2.0/root/var/service/openvpn-bridge/run
47     --- smeserver-openvpn-bridge-2.0/root/var/service/openvpn-bridge/run 2008-12-03 15:45:04.000000000 +0100
48     +++ mezzanine_patched_smeserver-openvpn-bridge-2.0/root/var/service/openvpn-bridge/run 2009-01-16 13:11:16.000000000 +0100
49     @@ -2,4 +2,9 @@
50    
51     exec 2>&1
52    
53     +BRIDGE=$(/sbin/e-smith/db configuration getprop bridge status)
54     +
55     +[ $BRIDGE == 'enabled' ] || exit 1
56     +
57     exec /usr/sbin/openvpn --config /etc/openvpn/bridge/openvpn.conf --cd /etc/openvpn/bridge
58     +
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed