From d9ef69533950022f3dfc30308574bcdf62f97455 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Mon, 11 Jun 2012 20:12:51 +0200
Subject: [PATCH] =?UTF-8?q?restructuration=20des=20profiles,=20s=C3=A9para?=
 =?UTF-8?q?tion=20du=20profile=20variables=20en=20templates?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 createlinks                                        |  2 +-
 ipasserelle-gp.spec                                |  8 +++--
 .../shares/wpkg/files/profiles/variables.xml/10All | 13 +++++++
 .../files/profiles/variables.xml/template-begin    | 15 ++++++++
 .../wpkg/files/profiles/variables.xml/template-end |  1 +
 .../home/e-smith/files/shares/wpkg/files/hosts.xml | 10 +++---
 .../e-smith/files/shares/wpkg/files/profiles.xml   | 42 +++++++++++-----------
 7 files changed, 64 insertions(+), 27 deletions(-)
 create mode 100644 root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/profiles/variables.xml/10All
 create mode 100644 root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/profiles/variables.xml/template-begin
 create mode 100644 root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/profiles/variables.xml/template-end

diff --git a/createlinks b/createlinks
index 116e41f..44a4a6c 100644
--- a/createlinks
+++ b/createlinks
@@ -8,4 +8,4 @@ event_link("initialize-default-databases", "wpkg-update", "02");
 
 templates2events("/home/e-smith/files/shares/tools/files/scripts/conf.bat", qw(wpkg-update bootstrap-console-save));
 templates2events("/home/e-smith/files/shares/wpkg/files/config.xml", qw(wpkg-update bootstrap-console-save));
-
+templates2events("/home/e-smith/files/shares/wpkg/files/profiles/variables.xml", qw(wpkg-update bootstrap-console-save));
diff --git a/ipasserelle-gp.spec b/ipasserelle-gp.spec
index 4160f92..b74e82f 100644
--- a/ipasserelle-gp.spec
+++ b/ipasserelle-gp.spec
@@ -1,5 +1,5 @@
-%define version 0.1.0
-%define release 1
+%define version 0.1.1
+%define release 1.beta1
 %define name ipasserelle-gp
 
 
@@ -23,6 +23,9 @@ Ce paquet permet de gérer un parc de machines sous MS Windows
 Basé sur WPKG et d'autres outils
 
 %changelog
+* Mon Jun 11 2012 Daniel Berteaud <daniel@firewall-services.com> 0.1.1-1.sme
+- restructure profiles
+
 * Mon Jun 11 2012 Daniel Berteaud <daniel@firewall-services.com> 0.1.0-1.sme
 - initial release
 
@@ -31,6 +34,7 @@ Basé sur WPKG et d'autres outils
 %setup -q -n %{name}-%{version}
 
 %build
+%{__mkdir_p} root/home/e-smith/files/shares/wpkg/files/profiles/
 perl createlinks
 
 %install
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
new file mode 100644
index 0000000..de1eb2e
--- /dev/null
+++ b/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/profiles/variables.xml/10All
@@ -0,0 +1,13 @@
+    <profile id="variables">
+       <variable name="IPASSERELLE_DOMAIN" value="{$DomainName}" />
+       <variable name="IPASSERELLE_NT_DOMAIN" value="{$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="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>
diff --git a/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/profiles/variables.xml/template-begin b/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/profiles/variables.xml/template-begin
new file mode 100644
index 0000000..3cb3a6a
--- /dev/null
+++ b/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/profiles/variables.xml/template-begin
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<profiles:profiles xmlns:profiles="http://www.wpkg.org/profiles"
+                   xmlns:wpkg="http://www.wpkg.org/wpkg"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.wpkg.org/profiles xsd/profiles.xsd ">
+<!--
+#              !!DO NOT MODIFY THIS FILE!!
+# 
+# Manual changes will be lost when this file is regenerated.
+#
+# Please read the developer's guide, which is available
+# at http://www.contribs.org/development/
+#
+# Copyright (C) 1999-2006 Mitel Networks Corporation
+-->
diff --git a/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/profiles/variables.xml/template-end b/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/profiles/variables.xml/template-end
new file mode 100644
index 0000000..4e9adb8
--- /dev/null
+++ b/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/profiles/variables.xml/template-end
@@ -0,0 +1 @@
+</profiles:profiles>
diff --git a/root/home/e-smith/files/shares/wpkg/files/hosts.xml b/root/home/e-smith/files/shares/wpkg/files/hosts.xml
index 60325be..0752568 100644
--- a/root/home/e-smith/files/shares/wpkg/files/hosts.xml
+++ b/root/home/e-smith/files/shares/wpkg/files/hosts.xml
@@ -5,13 +5,15 @@
             xsi:schemaLocation="http://www.wpkg.org/hosts xsd/hosts.xsd ">
 
     <!--
-    <host name="POSTE1" profile-id="default">
+    <host name="POSTE1" profile-id="workstation">
         <profile id="graphiste" />
-        <profile id="skyper" />
-        <profile id="iphoner" />
+        <profile id="skype" />
+        <profile id="iphone" />
         <profile id="admin" />
     </host>
+
+    <host name="SERVER1 profile-id="default" />
     -->
 
-    <host name=".+" profile-id="default" />
+    <host name=".+" profile-id="worstation" />
 </hosts:wpkg>
diff --git a/root/home/e-smith/files/shares/wpkg/files/profiles.xml b/root/home/e-smith/files/shares/wpkg/files/profiles.xml
index a63b151..a4225e2 100644
--- a/root/home/e-smith/files/shares/wpkg/files/profiles.xml
+++ b/root/home/e-smith/files/shares/wpkg/files/profiles.xml
@@ -4,9 +4,23 @@
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                    xsi:schemaLocation="http://www.wpkg.org/profiles xsd/profiles.xsd ">
 
+    <!-- Le profile workstation contient les logiciels classiques
+         à déployer sur un poste client -->
+    <profile id="workstation">
+        <depends profile-id="default" />
+        <package package-id="tightvnc" />
+        <package package-id='thunderbird' />
+        <package package-id="flash" />
+        <package package-id='pdfcreator' />
+        <package package-id="adobe_reader" />
+        <package package-id="vlc" />
+        <!-- <package package-id="libreoffice" /> -->
+    </profile>
+
     <!-- Le profile graphiste contient une compilation de logiciels pour
                   l'édition d'image et la publication -->
     <profile id="graphiste">
+        <depends profile-id="default" />
         <package package-id="gimp" />
         <package package-id="inkscape" />
         <package package-id="scribus" />
@@ -14,52 +28,40 @@
 
     <!-- profile d'administrateur, contient quelques outils utiles -->
     <profile id="admin">
+        <depends profile-id="default" />
         <package package-id="putty" />
         <package package-id="notepad++" />
         <package package-id="winscp" />
     </profile>
 
     <!-- pour ceux qui ont un iPhone, permet de déployer iTunes -->
-    <profile id="iphoner">
+    <profile id="iphone">
+        <depends profile-id="default" />
         <package package-id="itunes" />
     </profile>
 
     <!-- Pour ceux qui veulent Skyper -->
-    <profile id="skyper">
+    <profile id="skype">
+        <depends profile-id="default" />
         <package package-id="skype" />
     </profile>
 
     <!-- profile par défaut appliqué à tous les postes -->
     <profile id="default">
-       <variable name="IPASSERELLE_DOMAIN" value="__DNS_DOMAIN__" />
-       <variable name="IPASSERELLE_NT_DOMAIN" value="__NT_DOMAIN__" />
-       <variable name="IPASSERELLE_NAME" value="__NETBIOS_NAME__" />
-       <variable name="IPASSERELLE_IP" value="__IP_ADDRESS__" />
-       <variable name="BACKUP_SERVER_IP" value="__IP_ADDRESS__" />
-       <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" />
-
+       <depends profile-id="variables" />
        <package package-id="wpkg" />
        <package package-id="logs" />
        <package package-id="cacert" />
        <package package-id="productkey" />
-       <package package-id="tightvnc" />
        <package package-id="ccleaner" />
        <package package-id='ntp' />
        <package package-id="jre" />
        <package package-id="firefox" />
-       <package package-id="flash" />
-       <package package-id='thunderbird' />
-       <package package-id="adobe_reader" />
        <package package-id="sumatrapdf" />
-       <package package-id='pdfcreator' />
-       <!--<package package-id="libreoffice" />-->
        <package package-id="7zip" />
-       <package package-id="vlc" />
        <package package-id="fusioninventory" />
+       <!-- patch le registre pour la jonction à un domaine NT 4
+            nécessaire uniquement pour les Windows 7 -->
        <package package-id="sambawin7" os="6\.1\.\d{4}" />
     </profile>