Spec file update

createlinks

@@ -10,7 +10,7 @@ templates2events("/home/e-smith/files/shares/tools/files/scripts/session/001conf
 templates2events("/home/e-smith/files/shares/tools/files/scripts/wpkg/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));
-templates2events("/home/e-smith/files/samba/netlogon/netlogon.bat", qw(workgroup-update bootstrap-consolesave));
+templates2events("/home/e-smith/files/samba/netlogon/netlogon.bat", qw(workgroup-update bootstrap-console-save));
 
 templates2events("/usr/share/mozilla-mcd/conf.php", qw(wpkg-update webapps-update bootstrap-console-save));
 

ipasserelle-gp.spec

@@ -1,4 +1,4 @@
-%define version 0.2.31
+%define version 0.2.39
 %define release 1
 %define name ipasserelle-gp
 
@@ -26,6 +26,31 @@ 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
+
+* Tue Feb 25 2014 Daniel Berteaud <daniel@firewall-services.com> - 0.2.34-1
+- Configure Thunderbird to add signature on reply and forward
+
+* Thu Feb 6 2014 Daniel Berteaud <daniel@firewall-services.com> - 0.2.33-1
+- Configure Thunderbird to reply on top by default
+- Remove some hardcoded defaultPref, use the global type instead
+
+* Fri Jan 10 2014 Daniel Berteaud <daniel@firewall-services.com> - 0.2.32-1
+- Add a few packages (disabled) in the workstation profile
+
 * Thu Apr 4 2013 Daniel Berteaud <daniel@firewall-services.com> - 0.2.31-1
 - Revert previous change as it prevents XMPP accounts to work properly
 

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/tools/files/scripts/session/015mozBackup.bat

@@ -46,7 +46,7 @@ REM Le répertoire ImapMail.old existe sur certains profiles, à exclure égalem
 REM tout comme le répertoire Mail, qui contient des mails récupérés en POP en général
 REM On utilise le plus faible taux de compression pour éviter de prendre trop de temps
 REM vu que ce script sera lancé à l'ouverture de session
-%ZIP% a -t7z -mx1 "%DEST%\thunderbird1.7z" "%TBPROFILE%\*" -x!key3 -xr!"Mail\" -xr!"ImapMail.old\" -xr!"ImapMail\" -x!global-messages-db.sqlite -x!Cache -x!SOGoImageCache -x!startupCache -x!places.sqlite -x!urlclassifier3.sqlite -x!cookies.sqlite
+%ZIP% a -t7z -mx1 "%DEST%\thunderbird1.7z" "%TBPROFILE%\*" -x!key3 -xr!"Mail\" -xr!"ImapMail.old\" -xr!"ImapMail_old\" -xr!"ImapMail\" -x!global-messages-db.sqlite -x!Cache -x!SOGoImageCache -x!startupCache -x!places.sqlite -x!urlclassifier3.sqlite -x!cookies.sqlite
 REM Maintenant, on rajoute à l'archive les fichiers .dat contenus dans le répertoire ImapMail
 REM Ces fichiers contiennent en particulier les filtres des messages
 REM pas trouvé comment faire ça en une seule passe

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

@@ -11,6 +11,10 @@
         <package package-id="tightvnc" />
         <package package-id="thunderbird" />
         <!-- <package package-id="thunderbird-config" /> -->
+        <!-- <package package-id="lightning" /> -->
+        <!-- <package package-id="sogo-addons" /> -->
+        <!-- <package package-id="filelink-dl" /> -->
+        <!-- <package package-id="clicktodial" /> -->
         <!-- <package package-id="firefox-config" /> -->
         <package package-id="flash" />
         <package package-id="pdfcreator" />
@@ -21,7 +25,9 @@
         <!-- <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>
 
     <!-- Le profile graphiste contient une compilation de logiciels pour

root/usr/share/mozilla-mcd/thunderbird.php

@@ -124,14 +124,17 @@ for ($i=0; $i < count($user[0]['mail'])-1; $i++){
 <?php echo $pref;?>("mail.identity.id<?php echo $id; ?>.smtpServer", "smtp1");
 <?php echo $pref;?>("mail.identity.id<?php echo $id; ?>.useremail", "<?php echo $user[0]['mail'][$i]; ?>");
 <?php echo $pref;?>("mail.identity.id<?php echo $id; ?>.valid", true);
-defaultPref("mail.identity.id<?php echo $id; ?>.fcc_folder_pickup_mode", "1");
-defaultPref("mail.identity.id<?php echo $id; ?>.fcc_folder", "imap://<?php echo $uid; ?>@<?php echo IMAP_SERVER; ?>/Sent");
-defaultPref("mail.identity.id<?php echo $id; ?>.drafts_folder_pickup_mode", "1");
-defaultPref("mail.identity.id<?php echo $id; ?>.draft_folder", "imap://<?php echo $uid; ?>@<?php echo IMAP_SERVER; ?>/Drafts");
-defaultPref("mail.identity.id<?php echo $id; ?>.templ_folder_pickup_mode", "1");
-defaultPref("mail.identity.id<?php echo $id; ?>.stationery_folder", "imap://<?php echo $uid; ?>@<?php echo IMAP_SERVER; ?>/Templates");
-defaultPref("mail.identity.id<?php echo $id; ?>.attach_signature", true);
-defaultPref("mail.identity.id<?php echo $id; ?>.sig_file", path_profile+path_sep+"signature"+path_sep+"email.html");
+<?php echo $pref;?>("mail.identity.id<?php echo $id; ?>.fcc_folder_pickup_mode", "1");
+<?php echo $pref;?>("mail.identity.id<?php echo $id; ?>.fcc_folder", "imap://<?php echo $uid; ?>@<?php echo IMAP_SERVER; ?>/Sent");
+<?php echo $pref;?>("mail.identity.id<?php echo $id; ?>.drafts_folder_pickup_mode", "1");
+<?php echo $pref;?>("mail.identity.id<?php echo $id; ?>.draft_folder", "imap://<?php echo $uid; ?>@<?php echo IMAP_SERVER; ?>/Drafts");
+<?php echo $pref;?>("mail.identity.id<?php echo $id; ?>.templ_folder_pickup_mode", "1");
+<?php echo $pref;?>("mail.identity.id<?php echo $id; ?>.stationery_folder", "imap://<?php echo $uid; ?>@<?php echo IMAP_SERVER; ?>/Templates");
+<?php echo $pref;?>("mail.identity.id<?php echo $id; ?>.reply_on_top", 1);
+<?php echo $pref;?>("mail.identity.id<?php echo $id; ?>.attach_signature", true);
+<?php echo $pref;?>("mail.identity.id<?php echo $id; ?>.sig_file", path_profile+path_sep+"signature"+path_sep+"email.html");
+<?php echo $pref;?>("mail.identity.id<?php echo $id; ?>.sig_on_fwd", true);
+<?php echo $pref;?>("mail.identity.id<?php echo $id; ?>.sig_on_reply", true);
 <?php
 $identities .= ',id' . $id;
 $account++;