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
--- 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
+++ 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
@@ -392,4 +392,10 @@
"{$string}" contains forbiden characters
+
+ BRIDGE_NOT_ENABLED
+ The bridge service must be enabled.
The following commands will enable it:
db configuration setprop bridge status enabled
/etc/init.d/bridge start
]]>
+
+
+
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
--- 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
+++ 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
@@ -390,4 +390,9 @@
"{$string}" comporte des charactères nonautorisés
+
+ BRIDGE_NOT_ENABLED
+ Le service bridge doit être activé.
Les commandes suivantes permettrons de l'activer:
db configuration setprop bridge status enabled
/etc/init.d/bridge start
]]>
+
+
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
--- smeserver-openvpn-bridge-2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/openvpnbridge.pm 2009-01-16 13:13:39.000000000 +0100
+++ 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
@@ -478,6 +478,14 @@
sub print_crt_not_ready_warning{
my ($fm) = @_;
+
+ # First, check the service "bridge" is running
+ my $bridge = $config_db->get_prop('bridge', 'status') || 'disabled';
+
+ unless ($bridge eq 'enabled'){
+ return $fm->localise('BRIDGE_NOT_ENABLED');
+ }
+
# If any of the required files is missing or empty
# Warn the user
if (
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
--- smeserver-openvpn-bridge-2.0/root/var/service/openvpn-bridge/run 2008-12-03 15:45:04.000000000 +0100
+++ mezzanine_patched_smeserver-openvpn-bridge-2.0/root/var/service/openvpn-bridge/run 2009-01-16 13:11:16.000000000 +0100
@@ -2,4 +2,9 @@
exec 2>&1
+BRIDGE=$(/sbin/e-smith/db configuration getprop bridge status)
+
+[ $BRIDGE == 'enabled' ] || exit 1
+
exec /usr/sbin/openvpn --config /etc/openvpn/bridge/openvpn.conf --cd /etc/openvpn/bridge
+