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 @@ - + 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);