smeserver-openvpn-s2s/contribs7/smeserver-openvpn-s2s-0.1-tls_locale_2.patch

diff -Nur -x '*.orig' -x '*.rej' smeserver-openvpn-s2s-0.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/openvpns2s mezzanine_patched_smeserver-openvpn-s2s-0.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/openvpns2s
--- smeserver-openvpn-s2s-0.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/openvpns2s        2010-10-17 16:15:56.000000000 +0200
+++ mezzanine_patched_smeserver-openvpn-s2s-0.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/openvpns2s      2010-10-17 16:15:07.000000000 +0200
@@ -48,7 +48,7 @@
         <trans>
             <![CDATA[Choose the authentication mechanism.<br>
             Shared Key is simple to configure because you don't need to create and manage a PKI. 
-            You just need to create a secret key, and and configure it on both side.<br>
+            You just need to create a secret key, and configure it on both side.<br>
             TLS authentication is a bit harder to configure, as you'll need to manage a PKI, but
             provide a better level of security (like the Perfect Forward Secrecy).<br>
             If you don't care about the extra security provided by TLS, you should choose Shared Key here.]]>
@@ -59,6 +59,14 @@
         <trans>Authentication mechanism</trans>
     </entry>
     <entry>
+        <base>SHARED_KEY</base>
+        <trans>Shared key</trans>
+    </entry>
+    <entry>
+        <base>TLS</base>
+        <trans>TLS</trans>
+    </entry>
+    <entry>
         <base>DESC_CONFIGURE_CERT</base>
         <trans>This page lets you configure the authentication of this daemon</trans>
     </entry>
diff -Nur -x '*.orig' -x '*.rej' smeserver-openvpn-s2s-0.1/root/etc/e-smith/web/functions/openvpns2s mezzanine_patched_smeserver-openvpn-s2s-0.1/root/etc/e-smith/web/functions/openvpns2s
--- smeserver-openvpn-s2s-0.1/root/etc/e-smith/web/functions/openvpns2s 2010-10-17 16:15:56.000000000 +0200
+++ mezzanine_patched_smeserver-openvpn-s2s-0.1/root/etc/e-smith/web/functions/openvpns2s       2010-10-17 16:15:50.000000000 +0200
@@ -94,7 +94,7 @@
             <label>LABEL_STATUS</label>
         </field>
 
-        <field type="select" id="auth" options="'TLS' => 'TLS', 'SharedKey' => 'SECRET_KEY'">
+        <field type="select" id="auth" options="'TLS' => 'TLS', 'SharedKey' => 'SHARED_KEY'">
             <description>DESC_AUTH</description>
             <label>LABEL_AUTH</label>
         </field>
@@ -151,7 +151,7 @@
             <label>LABEL_STATUS</label>
         </field>
 
-        <field type="select" id="auth" options="'TLS' => 'TLS', 'SharedKey' => 'SECRET_KEY'">
+        <field type="select" id="auth" options="'TLS' => 'TLS', 'SharedKey' => 'SHARED_KEY'">
             <description>DESC_AUTH</description>
             <label>LABEL_AUTH</label>
         </field>
1	slords	1.1	diff -Nur -x '.orig' -x '.rej' smeserver-openvpn-s2s-0.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/openvpns2s mezzanine_patched_smeserver-openvpn-s2s-0.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/openvpns2s
2			--- smeserver-openvpn-s2s-0.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/openvpns2s 2010-10-17 16:15:56.000000000 +0200
3			+++ mezzanine_patched_smeserver-openvpn-s2s-0.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/openvpns2s 2010-10-17 16:15:07.000000000 +0200
4			@@ -48,7 +48,7 @@
5			<trans>
6			<![CDATA[Choose the authentication mechanism.<br>
7			Shared Key is simple to configure because you don't need to create and manage a PKI.
8			- You just need to create a secret key, and and configure it on both side.<br>
9			+ You just need to create a secret key, and configure it on both side.<br>
10			TLS authentication is a bit harder to configure, as you'll need to manage a PKI, but
11			provide a better level of security (like the Perfect Forward Secrecy).<br>
12			If you don't care about the extra security provided by TLS, you should choose Shared Key here.]]>
13			@@ -59,6 +59,14 @@
14			<trans>Authentication mechanism</trans>
15			</entry>
16			<entry>
17			+ <base>SHARED_KEY</base>
18			+ <trans>Shared key</trans>
19			+ </entry>
20			+ <entry>
21			+ <base>TLS</base>
22			+ <trans>TLS</trans>
23			+ </entry>
24			+ <entry>
25			<base>DESC_CONFIGURE_CERT</base>
26			<trans>This page lets you configure the authentication of this daemon</trans>
27			</entry>
28			diff -Nur -x '.orig' -x '.rej' smeserver-openvpn-s2s-0.1/root/etc/e-smith/web/functions/openvpns2s mezzanine_patched_smeserver-openvpn-s2s-0.1/root/etc/e-smith/web/functions/openvpns2s
29			--- smeserver-openvpn-s2s-0.1/root/etc/e-smith/web/functions/openvpns2s 2010-10-17 16:15:56.000000000 +0200
30			+++ mezzanine_patched_smeserver-openvpn-s2s-0.1/root/etc/e-smith/web/functions/openvpns2s 2010-10-17 16:15:50.000000000 +0200
31			@@ -94,7 +94,7 @@
32			<label>LABEL_STATUS</label>
33			</field>
34
35			- <field type="select" id="auth" options="'TLS' => 'TLS', 'SharedKey' => 'SECRET_KEY'">
36			+ <field type="select" id="auth" options="'TLS' => 'TLS', 'SharedKey' => 'SHARED_KEY'">
37			<description>DESC_AUTH</description>
38			<label>LABEL_AUTH</label>
39			</field>
40			@@ -151,7 +151,7 @@
41			<label>LABEL_STATUS</label>
42			</field>
43
44			- <field type="select" id="auth" options="'TLS' => 'TLS', 'SharedKey' => 'SECRET_KEY'">
45			+ <field type="select" id="auth" options="'TLS' => 'TLS', 'SharedKey' => 'SHARED_KEY'">
46			<description>DESC_AUTH</description>
47			<label>LABEL_AUTH</label>
48			</field>