From: Michael Kaply <consulting@kaply.com> Date: Tue, 20 Mar 2018 15:57:05 +0000 (-0500) Subject: Add README, Add heading for dropdowns, cleanup tabs X-Git-Tag: 0.9~29^2~2 X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/2cde024a39d0df54fb441d1a33ca433b9158aa29?hp=-c Add README, Add heading for dropdowns, cleanup tabs --- 2cde024a39d0df54fb441d1a33ca433b9158aa29 diff --git a/README.md b/README.md index 1d81e0e..13db59a 100644 --- a/README.md +++ b/README.md @@ -260,3 +260,24 @@ same folder name are grouped together. } } ``` +### Proxy +This policy allows you to specify proxy settings. These settings correspond to the connection settings in Firefox preferences. +To specify ports, append them to the URLs with a colon (:). If Locked is set to true, the values can't be changed by the user. +``` +{ + "Proxy": { + "Mode": ["none", "system", "manual", "autoDetect", "autoConfig"] + "Locked": [true, false] +Z "HTTPProxy": "URL_TO_PROXY", + "UseHTTPProxyForAllProtocols": [true, false] + "SSLProxy": "URL_TO_PROXY", + "FTPProxy": "URL_TO_PROXY", + "SOCKSProxy": { "URL_TO_PROXY", + "SOCKSVersion": [4, 5], + "Passthrough": "List of passthrough addresses/domains", + "AutoConfigURL": "URL_TO_AUTOCONFIG", + "AutoLogin": [true, false], + "UseProxyForDNS": [true, false] + } +} +``` diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml index 5272681..4b2b76e 100644 --- a/windows/en-US/firefox.adml +++ b/windows/en-US/firefox.adml @@ -131,12 +131,13 @@ </presentation> <presentation id="Proxy"> <checkBox refId="ProxyLocked">Don't allow proxy settings to be changed.</checkBox> - <dropdownList refId="ConnectionType"/> + <text>Connection Type:</text> + <dropdownList refId="ConnectionType"/> <text>HTTP Proxy:</text> <textBox refId="HTTPProxy"> <label/> </textBox> - <checkBox refId="UseHTTPProxyForAllProtocols">Use this proxy server for all protocols.</checkBox> + <checkBox refId="UseHTTPProxyForAllProtocols">Use this proxy server for all protocols.</checkBox> <text>SSL Proxy:</text> <textBox refId="SSLProxy"> <label/> @@ -149,6 +150,7 @@ <textBox refId="SOCKSProxy"> <label/> </textBox> + <text>SOCKS Version:</text> <dropdownList refId="SOCKSVersion"/> <text>No proxy for</text> <textBox refId="Passthrough"> @@ -159,7 +161,7 @@ <textBox refId="AutoConfigURL"> <label/> </textBox> - <checkBox refId="AutoLogin">Do not prompt for authentication if password is saved.</checkBox> + <checkBox refId="AutoLogin">Do not prompt for authentication if password is saved.</checkBox> <checkBox refId="UseProxyForDNS">Proxy DNS when using SOCKS v5.</checkBox> </presentation> </presentationTable>