Spec file update

ipasserelle-gp.spec

@@ -1,4 +1,4 @@
-%define version 0.2.35
+%define version 0.2.39
 %define release 1
 %define name ipasserelle-gp
 
@@ -26,6 +26,18 @@ Ce paquet permet de gérer un parc de machines sous MS Windows
 Basé sur WPKG et d'autres outils
 
 %changelog
+* Tue Apr 21 2015 Daniel Berteaud <daniel@firewall-services.com> - 0.2.39-1
+- Create a default email_modif.txt if missing (for outlook)
+
+* Thu Apr 2 2015 Daniel Berteaud <daniel@firewall-services.com> - 0.2.38-1
+- Add support for Outlook signature deployment
+
+* Tue Mar 24 2015 Daniel Berteaud <daniel@firewall-services.com> - 0.2.37-1
+- Add xmind in the sample workstation profile
+
+* Fri Dec 19 2014 Daniel Berteaud <daniel@firewall-services.com> - 0.2.36-1
+- Also exclude ImapMail_old from thunderbird profile's backup
+
 * Wed Jul 16 2014 Daniel Berteaud <daniel@firewall-services.com> - 0.2.35-1
 - Fix a typo in bootstrap-console-save event name
 

root/etc/e-smith/db/configuration/defaults/wpkg/OutlookSignatures

@@ -0,0 +1 @@
+disabled

root/etc/e-smith/db/configuration/defaults/wpkg/ThunderbirdSignatures

@@ -0,0 +1 @@
+enabled

root/etc/e-smith/templates/home/e-smith/files/shares/tools/files/scripts/wpkg/conf.bat/10All

@@ -8,6 +8,8 @@ my $name = $SystemName;
 my $url = "https://auth." . $DomainName;
 my $comp = $ldap{'defaultCompany'};
 my $mozbackup = (($wpkg{'MozillaBackup'} || 'no') =~ m/^yes|enabled|on|1$/) ? 'yes':'no';
+my $olsig = (($wpkg{'OutlookSignatures'} || 'no') =~ m/^yes|enabled|on|1$/) ? 'yes':'no';
+my $tbsig = (($wpkg{'ThunderbirdSignatures'} || 'yes') =~ m/^yes|enabled|on|1$/) ? 'yes':'no';
 
 $OUT .=<<"EOF";
 
@@ -21,6 +23,8 @@ SET SOFTWARE=\\\\%IPASSERELLE_IP%\\wpkg\\softwares
 SET SETTINGS=\\\\%IPASSERELLE_IP%\\wpkg\\settings
 SET WPKGLOGS=\\\\%IPASSERELLE_IP%\\wpkglogs
 SET MOZBACKUP=$mozbackup
+SET TBSIG=$tbsig
+SET OLSIG=$olsig
 
 EOF
 

root/home/e-smith/files/shares/tools/files/scripts/session/010signature.bat

@@ -1,3 +1,73 @@
-if exist "\\%IPASSERELLE_IP%\tools\signatures\%USERNAME%" (
+@echo off
+REM gestion des signatures de mail
+
+if not exist "\\%IPASSERELLE_IP%\tools\signatures\%USERNAME%" GOTO :EOF
+
+REM Pour Thunderbird, simple copie, le resrte étant fait par MCD
+if "%TBSIG%" EQU "yes" (
+  if exist "\\%IPASSERELLE_IP%\tools\signatures\%USERNAME%" (
     xcopy /E /I /Y \\%IPASSERELLE_IP%\tools\signatures\%USERNAME% "%USERPROFILE%\signature"
+  )
+)
+
+if "%OLSIG%" EQU "yes" (
+  REM premier deploiement ?
+  if not exist "%APPDATA%\Microsoft\Signatures\email.htm" (
+    SET OV="unknown"
+    REM Detection version Outlook
+    REM 2013 = 15.0
+    reg query "HKLM\Software\Microsoft\Office\15.0\Outlook" >NUL 2>NUL
+    if %errorlevel% EQU 0 (
+      SET OV=15.0
+      GOTO :MODREG
+    )
+    REM 2010 = 14.0
+    reg query "HKLM\Software\Microsoft\Office\14.0\Outlook" >NUL 2>NUL
+    if %errorlevel% EQU 0 (
+      SET OV=14.0
+      GOTO :MODREG
+    )
+    REM 2007 = 12.0
+    reg query "HKLM\Software\Microsoft\Office\12.0\Outlook" >NUL 2>NUL
+    if %errorlevel% EQU 0 (
+      SET OV=12.0
+      GOTO :MODREG
+    )
+    REM Version inconnue d'office, on arrete
+    IF "%OV%" EQU "unknown" GOTO :EOF
+    echo "Office %OV%"
+    :MODREG
+    REM Supprimer First Run pour que Outlook prenne en compte les signatures au prochain lancement
+    reg delete "HKEY_CURRENT_USER\Software\Microsoft\Office\%OV%\Outlook\Setup" /v "First-Run" /f
+    REM TODO: selection de la signature via le serveur
+    SET SIG="email"
+    if exist "\\%IPASSERELLE_IP%\tools\signatures\%USERNAME%\email_modif.html" (
+      SET SIG="email_modif"
+    )
+    REM Configurer la signature pour les nouveaux mails et les reponses
+    reg add "HKEY_CURRENT_USER\Software\Microsoft\Office\%OV%\Common\MailSettings" /t REG_EXPAND_SZ /v NewSignature /d "%SIG%" /f
+    reg add "HKEY_CURRENT_USER\Software\Microsoft\Office\%OV%\Common\MailSettings" /t REG_EXPAND_SZ /v ReplySignature /d "%SIG%" /f
+    REM Les images des signatures doivent etre inline pour s'afficher
+    reg add "HKEY_CURRENT_USER\Software\Microsoft\Office\%OV%\Outlook\Options\Mail" /t REG_DWORD /v "Send Pictures With Document" /d 1 /f
+  )
+
+  REM Copie des signatures
+  xcopy /E /I /Y "\\%IPASSERELLE_IP%\tools\signatures\%USERNAME%\*" "%APPDATA%\Microsoft\Signatures\"
+  del /Q /F "%APPDATA%\Microsoft\Signatures\email.htm"
+  rename "%APPDATA%\Microsoft\Signatures\email.html" "email.htm"
+  echo -- > "%APPDATA%\Microsoft\Signatures\email.rtf"
+  type "%APPDATA%\Microsoft\Signatures\email.txt" >> "%APPDATA%\Microsoft\Signatures\email.rtf"
+  copy /Y "%APPDATA%\Microsoft\Signatures\email.rtf" "%APPDATA%\Microsoft\Signatures\email.txt"
+  if exist "%APPDATA%\Microsoft\Signatures\email_modif.html" (
+    del /Q /F "%APPDATA%\Microsoft\Signatures\email_modif.htm"
+    rename "%APPDATA%\Microsoft\Signatures\email_modif.html" "email_modif.htm"
+    if not exist "%APPDATA%\Microsoft\Signatures\email_modif.txt" (
+      copy /Y "%APPDATA%\Microsoft\Signatures\email.txt" "%APPDATA%\Microsoft\Signatures\email_modif.txt"
+    )
+  )
+  if exist "%APPDATA%\Microsoft\Signatures\email_modif.txt" (
+    echo -- > "%APPDATA%\Microsoft\Signatures\email_modif.rtf"
+    type "%APPDATA%\Microsoft\Signatures\email_modif.txt" >> "%APPDATA%\Microsoft\Signatures\email_modif.rtf"
+    copy /Y "%APPDATA%\Microsoft\Signatures\email_modif.rtf" "%APPDATA%\Microsoft\Signatures\email_modif.txt"
+  )
 )

root/home/e-smith/files/shares/wpkg/files/profiles.xml

@@ -25,6 +25,7 @@
         <!-- <package package-id="libreoffice" /> -->
         <!-- <package package-id="jce" /> -->
         <!-- <package package-id="freemind" /> -->
+        <!-- <package package-id="xmind" /> -->
         <!-- <package package-id="userprofile" /> -->
         <!-- <package package-id="gajim" /> -->
     </profile>