Merge pull request #1090 from dennisjackson/master

[policy-templates.git] / mac / org.mozilla.firefox.plist

diff --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist
index a4660bf3febcf9593de312485360f92be57f02c0..2335b6112cc9f1feb0ec2d65be4572b968d0f383 100644 (file)
--- a/mac/org.mozilla.firefox.plist
+++ b/mac/org.mozilla.firefox.plist
@@ -586,12 +586,28 @@
        <false/>
        <key>Proxy</key>
        <dict>
        <false/>
        <key>Proxy</key>
        <dict>

-               <key>SocksVersion</key>
-               <string>4</string>

                <key>Mode</key>
                <string>manual</string>
                <key>HTTPProxy</key>
                <string>proxy.example.com:80</string>
                <key>Mode</key>
                <string>manual</string>
                <key>HTTPProxy</key>
                <string>proxy.example.com:80</string>

+               <key>UseHTTPProxyForAllProtocols</key>
+               <true/>
+               <key>SSLProxy</key>
+               <string>proxy.example.com:80</string>
+               <key>FTPProxy</key>
+               <string>proxy.example.com:80</string>
+               <key>SOCKSProxy</key>
+               <string>proxy.example.com:80</string>
+               <key>SocksVersion</key>
+               <string>4</string>
+               <key>Passthrough</key>
+               <string>&lt;local&gt;</string>
+               <key>AutoConfigURL</key>
+               <string>URL_TO_AUTOCONFIG</string>
+               <key>AutoLogin</key>
+               <true/>
+               <key>UseProxyForDNS</key>
+               <true/>

                <key>Locked</key>
                <true/>
        </dict>
                <key>Locked</key>
                <true/>
        </dict>


@@ -604,6 +620,30 @@
        <true/>
        <key>SearchBar</key>
        <string>separate</string>
        <true/>
        <key>SearchBar</key>
        <string>separate</string>

+       <key>SecurityDevices</key>
+       <dict>
+               <key>NAME_OF_DEVICE</key>
+               <string>PATH_TO_LIBRARY_FOR_DEVICE</string>
+       </dict>
+       <key>ShowHomeButton</key>
+       <true/>
+       <key>SSLVersionMin</key>
+       <string>tls1.2</string>
+       <key>SSLVersionMax</key>
+       <string>tls1.3</string>
+       <key>StartDownloadsInTempDirectory</key>
+       <true/>
+       <key>SupportMenu</key>
+       <dict>
+               <key>Title</key>
+               <string>Click here for help</string>
+               <key>URL</key>
+               <string>http://example.edu/</string>
+               <key>AccessKey</key>
+               <string>C</string>
+       </dict>
+       <key>TranslateEnabled</key>
+       <true/>

        <key>UserMessaging</key>
        <dict>
                <key>WhatsNew</key>
        <key>UserMessaging</key>
        <dict>
                <key>WhatsNew</key>


@@ -635,27 +675,5 @@
                        <string>https://www.yahoo.com/*</string>
                </array>
        </dict>
                        <string>https://www.yahoo.com/*</string>
                </array>
        </dict>

-       <key>SecurityDevices</key>
-       <dict>
-               <key>NAME_OF_DEVICE</key>
-               <string>PATH_TO_LIBRARY_FOR_DEVICE</string>
-       </dict>
-       <key>ShowHomeButton</key>
-       <true/>
-       <key>SSLVersionMin</key>
-       <string>tls1.2</string>
-       <key>SSLVersionMax</key>
-       <string>tls1.3</string>
-       <key>StartDownloadsInTempDirectory</key>
-       <true/>
-       <key>SupportMenu</key>
-       <dict>
-               <key>Title</key>
-               <string>Click here for help</string>
-               <key>URL</key>
-               <string>http://example.edu/</string>
-               <key>AccessKey</key>
-               <string>C</string>
-       </dict>

 </dict>
 </plist>
 </dict>
 </plist>