From: Michael Kaply Date: Mon, 19 Mar 2018 22:48:12 +0000 (-0500) Subject: Policy for Proxy settings. Fixes #19. X-Git-Tag: 0.9~29^2~4 X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/24980c2056a99b798320157ebd395018c512f125?ds=inline Policy for Proxy settings. Fixes #19. --- diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml index 06beb4b..e52cd96 100644 --- a/windows/en-US/firefox.adml +++ b/windows/en-US/firefox.adml @@ -13,6 +13,7 @@ Addons Flash Home page + Proxy server Allow Block Block About Addons @@ -77,6 +78,27 @@ Homepage Settings Additional Homepages If you want to have more than one homepage + HTTP Proxy Settings + This should only be set if you selected manual proxy + SSL Proxy Settings + This should only be set if you selected manual proxy + FTP Proxy Settings + This should only be set if you selected manual proxy + SOCKS Host Settings + This should only be set if you selected manual proxy + SOCKS v4 + SOCKS v5 + Automatic proxy configuration URL + These should only be set if you selected autoConfig + Proxy bypass URLs + These should only be set if you selected manual proxy + No Proxy + Use system proxy settings + Manual proxy configuration + Auto-detect proxy settings + Automatic proxy configuration + Proxy Mode + Select the proxy mode Allow popups for websites @@ -115,6 +137,51 @@ diff --git a/windows/firefox.admx b/windows/firefox.admx index 198dc65..827c063 100644 --- a/windows/firefox.admx +++ b/windows/firefox.admx @@ -36,6 +36,9 @@ + + + @@ -422,5 +425,124 @@ + + + + + + + + none + + + + + system + + + + + manual + + + + + autoDetect + + + + + autoConfig + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 4 + + + + + 5 + + + + + + + + + + + + + + + + + + +