From a3054b52c2fbb3846c7f57a3a8c5be1ed3f92848 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Thu, 20 Sep 2012 13:54:38 +0200
Subject: [PATCH] =?UTF-8?q?R=C3=A9cup=C3=A9ration=20de=20la=20conf=20en=20?=
 =?UTF-8?q?https=20par=20d=C3=A9faut?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/firefox-config.xml                                        | 2 +-
 .../files/shares/wpkg/files/settings/firefox/firefox.cfg/10All     | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/firefox-config.xml b/packages/firefox-config.xml
index d945f08..45bb30e 100644
--- a/packages/firefox-config.xml
+++ b/packages/firefox-config.xml
@@ -8,7 +8,7 @@
 
         <depends package-id="firefox" />
 
-        <variable name='PKG_VERSION' value='4' />
+        <variable name='PKG_VERSION' value='5' />
         <variable architecture='x86' name='PROG' value='%PROGRAMFILES%\Mozilla Firefox' />
         <variable architecture='x64' name='PROG' value='%PROGRAMFILES(x86)%\Mozilla Firefox' />
         <variable architecture='x86' name='REG_PATH' value='HKLM\Software\Mozilla\Firefox' />
diff --git a/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/firefox/firefox.cfg/10All b/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/firefox/firefox.cfg/10All
index 054609d..95c000f 100644
--- a/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/firefox/firefox.cfg/10All
+++ b/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/firefox/firefox.cfg/10All
@@ -1,5 +1,10 @@
 // Autoconf
 
+{
+$proto = ((${'mozilla-mcd'}{'RequireSSL'} || 'yes') =~ m/^enabled|yes|on|1$/) ? 'https':'http';
+$OUT .= '';
+}
+
 if(getenv("USER") != "") \{
 var user = getenv("USER");
 \} else \{
@@ -10,6 +15,6 @@ var mail = env_user + '@{$DomainName}';
 
 lockPref("mail.identity.useremail", mail);
 lockPref("autoadmin.append_emailaddr", true);
-lockPref("autoadmin.global_config_url", "http://{"$SystemName.$DomainName"}/firefox.cfg");
+lockPref("autoadmin.global_config_url", "{"$proto"}://{"$SystemName.$DomainName"}/firefox.cfg");
 lockPref("autoadmin.failover_to_cached", true);
 lockPref("autoadmin.offline_failover", true);