From 6a93b867cfc719d577ee8fea68f664f79cb41037 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Mon, 11 Jun 2012 20:29:00 +0200
Subject: [PATCH] Correction des templates pour le profile variables

---
 ipasserelle-gp.spec                                                  | 2 +-
 .../e-smith/files/shares/wpkg/files/profiles/variables.xml/10All     | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ipasserelle-gp.spec b/ipasserelle-gp.spec
index b74e82f..47bc8fc 100644
--- a/ipasserelle-gp.spec
+++ b/ipasserelle-gp.spec
@@ -1,5 +1,5 @@
 %define version 0.1.1
-%define release 1.beta1
+%define release 1.beta2
 %define name ipasserelle-gp
 
 
diff --git a/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/profiles/variables.xml/10All b/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/profiles/variables.xml/10All
index de1eb2e..f0c1181 100644
--- a/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/profiles/variables.xml/10All
+++ b/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/profiles/variables.xml/10All
@@ -1,13 +1,14 @@
     <profile id="variables">
        <variable name="IPASSERELLE_DOMAIN" value="{$DomainName}" />
-       <variable name="IPASSERELLE_NT_DOMAIN" value="{$smb{'Workgroup'}}" />
+       <variable name="IPASSERELLE_NT_DOMAIN" value="{uc($smb{'Workgroup'})}" />
        <variable name="IPASSERELLE_NAME" value="{$smb{'ServerName'}}" />
        <variable name="IPASSERELLE_IP" value="{$InternalInterface{'IPAddress'}}" />
        <variable name="BACKUP_SERVER_IP" value="{$wpkg{'BackupServer'} || $InternalInterface{'IPAddress'}}" />
-       <variable name='BACKUP_USER' value='$wpkg{'BackupUser'} || 'backup' />
+       <variable name='BACKUP_USER' value="{$wpkg{'BackupUser'} || 'backup'}" />
        <variable name="IPASSERELLE_HOME_URL" value="http://auth.%IPASSERELLE_DOMAIN%" />
        <variable name="TOOLS" value="\\%IPASSERELLE_IP%\tools" />
        <variable name="WPKGLOGS" value="\\%IPASSERELLE_IP%\wpkglogs" />
        <variable name="SOFTWARE" value="\\%IPASSERELLE_IP%\wpkg\softwares" />
        <variable name="SETTINGS" value="\\%IPASSERELLE_IP%\wpkg\settings" />
     </profile>
+