diff -Nur -x '*.orig' -x '*.rej' smeserver-openvpn-bridge-2.0/createlinks mezzanine_patched_smeserver-openvpn-bridge-2.0/createlinks
--- smeserver-openvpn-bridge-2.0/createlinks	2008-12-10 02:53:47.000000000 +0100
+++ mezzanine_patched_smeserver-openvpn-bridge-2.0/createlinks	2009-01-16 15:32:58.000000000 +0100
@@ -25,4 +25,5 @@
 templates2events("/etc/crontab", qw(openvpn-bridge-update));
 
 event_link("openvpn-bridge-reload-ccd", qw(openvpn-bridge-update openvpn-bridge-reload-ccd), "20");
+event_link("openvpn-bridge-update-crl", qw(openvpn-bridge-update openvpn-bridge-reload-ccd), "30");
 
diff -Nur -x '*.orig' -x '*.rej' smeserver-openvpn-bridge-2.0/root/etc/e-smith/db/configuration/defaults/openvpn-bridge/CrlUrl mezzanine_patched_smeserver-openvpn-bridge-2.0/root/etc/e-smith/db/configuration/defaults/openvpn-bridge/CrlUrl
--- smeserver-openvpn-bridge-2.0/root/etc/e-smith/db/configuration/defaults/openvpn-bridge/CrlUrl	1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-openvpn-bridge-2.0/root/etc/e-smith/db/configuration/defaults/openvpn-bridge/CrlUrl	2009-01-16 15:32:58.000000000 +0100
@@ -0,0 +1 @@
+http://localhost:940/phpki/index.php?stage=dl_crl_pem
diff -Nur -x '*.orig' -x '*.rej' smeserver-openvpn-bridge-2.0/root/etc/e-smith/events/actions/openvpn-bridge-update-crl mezzanine_patched_smeserver-openvpn-bridge-2.0/root/etc/e-smith/events/actions/openvpn-bridge-update-crl
--- smeserver-openvpn-bridge-2.0/root/etc/e-smith/events/actions/openvpn-bridge-update-crl	1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-openvpn-bridge-2.0/root/etc/e-smith/events/actions/openvpn-bridge-update-crl	2009-01-16 15:32:58.000000000 +0100
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+URL=$(/sbin/e-smith/db configuration getprop openvpn-bridge CrlUrl)
+DOMAIN=$(/sbin/e-smith/db configuration get DomainName)
+
+/usr/bin/wget $URL -O /tmp/cacrl.pem > /dev/null 2>&1
+
+/usr/bin/openssl crl -inform PEM -in /tmp/cacrl.pem -text > /dev/null 2>&1
+
+if [ "$?" -eq "0" ]; then
+	/bin/mv -f /tmp/cacrl.pem /etc/openvpn/bridge/pub/cacrl.pem > /dev/null 2>&1
+else
+	cat > /tmp/crlmail <<END
+
+An error occured while updating the CRL for OpenVPN-Bridge
+because openssl didn't recognize the file as a valid CRL.
+Below is the copy of the latest CRL downloaded from
+$URL
+
+
+END
+
+	cat /tmp/cacrl.pem >> /tmp/crlmail
+	mail -s 'CRL update failed' admin@$DOMAIN < /tmp/crlmail
+fi
+
+rm -f /tmp/cacrl.pem
+rm -f /tmp/crlmail
+
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 15:33:54.000000000 +0100
+++ mezzanine_patched_smeserver-openvpn-bridge-2.0/root/etc/e-smith/locale/en/etc/e-smith/web/functions/openvpnbridge	2009-01-16 15:32:58.000000000 +0100
@@ -397,5 +397,43 @@
     	<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>
     </entry>
 
+	<entry>
+    	<base>NOT_A_VALID_URL</base>
+    	<trans>"{$string}" isn't a valid URL</trans>
+    </entry>
+
+	<entry>
+    	<base>DESC_CRL_URL</base>
+    	<trans>Enter here the URL to update the CRL. (if phpki runs on the same server, you can let the default value)</trans>
+    </entry>
+
+	<entry>
+    	<base>LABEL_CRL_URL</base>
+    	<trans>URL to update the CRL</trans>
+    </entry>
+
+	<entry>
+    	<base>LABEL_CA_PEM</base>
+    	<trans>CA certificate</trans>
+    </entry>
 
+	<entry>
+    	<base>LABEL_CRT_PEM</base>
+    	<trans>Server certificate</trans>
+    </entry>
+
+	<entry>
+    	<base>LABEL_KEY_PEM</base>
+    	<trans>Server private key</trans>
+    </entry>
+
+	<entry>
+    	<base>LABEL_DH_PEM</base>
+    	<trans>DH parameters</trans>
+    </entry>
+
+	<entry>
+    	<base>LABEL_TA_PEM</base>
+    	<trans>Static key</trans>
+    </entry>
 </lexicon>
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 15:33:54.000000000 +0100
+++ mezzanine_patched_smeserver-openvpn-bridge-2.0/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/openvpnbridge	2009-01-16 15:32:58.000000000 +0100
@@ -395,4 +395,45 @@
     	<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>
     </entry>
 
+	<entry>
+    	<base>NOT_A_VALID_URL</base>
+    	<trans>"{$string}" n'est pas une URL valide</trans>
+    </entry>
+
+	<entry>
+    	<base>DESC_CRL_URL</base>
+    	<trans>Entrez ici l'URL de mise à jour de la CRL. (si phpki est installé sur la même machine, vous pouvez laisser la valeur par défaut)</trans>
+    </entry>
+
+	<entry>
+    	<base>LABEL_CRL_URL</base>
+    	<trans>URL de mise à jour de la CRL</trans>
+    </entry>
+
+	<entry>
+    	<base>LABEL_CA_PEM</base>
+    	<trans>Certificat autoritaire</trans>
+    </entry>
+
+	<entry>
+    	<base>LABEL_CRT_PEM</base>
+    	<trans>Certificat serveur</trans>
+    </entry>
+
+	<entry>
+    	<base>LABEL_KEY_PEM</base>
+    	<trans>Clé privée du serveur</trans>
+    </entry>
+
+	<entry>
+    	<base>LABEL_DH_PEM</base>
+    	<trans>Paramètres DH</trans>
+    </entry>
+
+	<entry>
+    	<base>LABEL_TA_PEM</base>
+    	<trans>Clé statique</trans>
+    </entry>
+
+
 </lexicon>
diff -Nur -x '*.orig' -x '*.rej' smeserver-openvpn-bridge-2.0/root/etc/e-smith/templates/etc/crontab/openvpn-bridge-crl mezzanine_patched_smeserver-openvpn-bridge-2.0/root/etc/e-smith/templates/etc/crontab/openvpn-bridge-crl
--- smeserver-openvpn-bridge-2.0/root/etc/e-smith/templates/etc/crontab/openvpn-bridge-crl	2008-12-10 02:54:47.000000000 +0100
+++ mezzanine_patched_smeserver-openvpn-bridge-2.0/root/etc/e-smith/templates/etc/crontab/openvpn-bridge-crl	2009-01-16 15:33:17.000000000 +0100
@@ -2,7 +2,6 @@
 my $url = ${'openvpn-bridge'}{'CrlUrl'} || '';
 if ($url =~ /^http(s)?:\/\/.*$/){
 	$OUT .= "# Update OpenVPN bridge's CRL\n";
-	$OUT .= "5 * * * * root /usr/bin/ovpn-bridge-update-crl 2>&1 /dev/null\n";
-
+	$OUT .= "5 * * * * root /etc/e-smith/events/actions/openvpn-bridge-update-crl 2>&1 /dev/null\n";
 }
 }
diff -Nur -x '*.orig' -x '*.rej' smeserver-openvpn-bridge-2.0/root/etc/e-smith/web/functions/openvpnbridge mezzanine_patched_smeserver-openvpn-bridge-2.0/root/etc/e-smith/web/functions/openvpnbridge
--- smeserver-openvpn-bridge-2.0/root/etc/e-smith/web/functions/openvpnbridge	2008-12-10 03:56:57.000000000 +0100
+++ mezzanine_patched_smeserver-openvpn-bridge-2.0/root/etc/e-smith/web/functions/openvpnbridge	2009-01-16 15:32:58.000000000 +0100
@@ -255,34 +255,50 @@
 		pre-event="turn_off_buttons()"
 		post-event="write_pem()">
 		
-		<field
+	<field
             type="literal"
             id="desc_initial_config"
             value="">
             <description>DESC_CRT_CONFIG_PAGE</description>
+	</field>
+
+	<field 
+            type="text"
+            id="crl_url"
+            size="60"
+            value="get_prop('CrlUrl')"
+            validation="is_url">
+		<label>LABEL_CRL_URL</label>
+                <description>DESC_CRL_URL</description>
         </field>
 
-		<field type="textarea" id="ca_pem" rows="15" cols="70" value="read_pem('cacert.pem')">
+
+	<field type="textarea" id="ca_pem" rows="15" cols="70" value="read_pem('cacert.pem')">
+		<label>LABEL_CA_PEM</label>
         	<description>DESC_CA_PEM</description>
       	</field>
         
         <field type="textarea" id="crt_pem" rows="15" cols="70" value="read_pem('cert.pem')">
+		<label>LABEL_CRT_PEM</label>
         	<description>DESC_CRT_PEM</description>
       	</field>
     	
     	<field type="textarea" id="key_pem" rows="15" cols="70" value="read_pem('key.pem')">
+		<label>LABEL_KEY_PEM</label>
         	<description>DESC_KEY_PEM</description>
       	</field>
 		
-		<field type="textarea" id="dhpar_pem" rows="15" cols="70" value="read_pem('dh.pem')">
+	<field type="textarea" id="dhpar_pem" rows="15" cols="70" value="read_pem('dh.pem')">
+		<label>LABEL_DH_PEM</label>
         	<description>DESC_DH_PEM</description>
       	</field>
 
-		<field type="textarea" id="ta_pem" rows="15" cols="70" value="read_pem('takey.pem')">
+	<field type="textarea" id="ta_pem" rows="15" cols="70" value="read_pem('takey.pem')">
+		<label>LABEL_TA_PEM</label>
         	<description>DESC_TA_PEM</description>
       	</field>
    		
-		<subroutine src="print_button('SAVE')" />
+	<subroutine src="print_button('SAVE')" />
 
     </page>
 	
diff -Nur -x '*.orig' -x '*.rej' smeserver-openvpn-bridge-2.0/root/usr/bin/ovpn-bridge-update-crl mezzanine_patched_smeserver-openvpn-bridge-2.0/root/usr/bin/ovpn-bridge-update-crl
--- smeserver-openvpn-bridge-2.0/root/usr/bin/ovpn-bridge-update-crl	2008-12-10 03:08:19.000000000 +0100
+++ mezzanine_patched_smeserver-openvpn-bridge-2.0/root/usr/bin/ovpn-bridge-update-crl	1970-01-01 01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-URL=$(/sbin/e-smith/db configuration getprop openvpn-bridge CrlUrl)
-DOMAIN=$(/sbin/e-smith/db configuration get DomainName)
-
-/usr/bin/wget $URL -O /tmp/cacrl.pem > /dev/null 2>&1
-
-/usr/bin/openssl crl -inform PEM -in /tmp/cacrl.pem -text > /dev/null 2>&1
-
-if [ "$?" -eq "0" ]; then
-	/bin/mv -f /tmp/cacrl.pem /etc/openvpn/bridge/pub/cacrl.pem
-else
-	cat > /tmp/crlmail <<END
-
-An error occured while updating the CRL for OpenVPN-Bridge
-because openssl didn't recognize the file as a valid CRL.
-Below is the copy of the latest CRL downloaded from
-$URL
-
-
-END
-
-	cat /tmp/cacrl.pem >> /tmp/crlmail
-	mail -s 'CRL update failed' admin@$DOMAIN < /tmp/crlmail
-fi
-
-rm -f /tmp/cacrl.pem
-rm -f /tmp/crlmail
-
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 15:33:54.000000000 +0100
+++ mezzanine_patched_smeserver-openvpn-bridge-2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/openvpnbridge.pm	2009-01-16 15:32:58.000000000 +0100
@@ -634,6 +634,8 @@
 	my $dh	= $q->param('dhpar_pem');
 	my $ta	= $q->param('ta_pem');
 
+	$config_db->set_prop('openvpn-bridge', 'CrlUrl', $q->param('crl_url'));
+
 	if (! open (CA, ">$pubdir/cacert.pem")){
       	$fm->error('ERROR_OPEN_CA','FIRST');
       	# Tell the user something bad has happened
@@ -769,5 +771,16 @@
     return "OK";
 }
 
+sub is_url
+{
+   my ($fm, $url) = @_;
+
+   unless ($url =~ /^(http:\/\/)|(https:\/\/)/){
+	 return $fm->localise('NOT_A_VALID_URL',{string => $url});
+    }
+    return "OK";
+
+}
+
 
 1;