From: Michael Kaply Date: Wed, 11 Apr 2018 15:24:49 +0000 (-0500) Subject: Merge pull request #62 from mozilla/SearchEngines_Policy X-Git-Tag: 0.9~8 X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/23f77b2cefd0c8d02f6aef2232efaac64718c8ca?hp=5b9cf156d0ceaf337241234c5509fcf39cc7f363 Merge pull request #62 from mozilla/SearchEngines_Policy Add policies for SearchEngines --- diff --git a/README.md b/README.md index 9938b1a..2277853 100644 --- a/README.md +++ b/README.md @@ -405,12 +405,13 @@ same folder name are grouped together. { "policies": { "Bookmarks": [ - {"Title": "Example", - "URL": "http://example.org", - "Favicon": "http://example.com/favicon.ico", - "Placement": ["toolbar", "menu"], - "Folder": "FolderName" - } + { + "Title": "Example", + "URL": "http://example.org", + "Favicon": "http://example.com/favicon.ico", + "Placement": ["toolbar", "menu"], + "Folder": "FolderName" + } ] } } @@ -464,3 +465,26 @@ Blocks websites from being visited. The parameters take an array of Match Patter } } ``` +### Search Engines +This policy allows you to add new search engines, as well as set the default and prevent the install of search engines from web pages. Only Name and URLTemplate is required. +``` +{ + "policies": { + "SearchEngines": { + "Add": [ + { + "Name": "", + "URLTemplate": "URL including {searchTerms} to substitute for the terms", + "Method": ["GET", "POST"], + "IconURL": "URL to icon", + "Alias": "Alias that can be used to access the engine", + "Description": "Description", + "SuggestURLTemplate": "URL for suggestions using {searchTerms}" + } + ], + "Default": "Name of engine", + "PreventInstalls": [true|false] + } + } +} +``` \ No newline at end of file diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml index 6e9bfe9..ea66f2e 100644 --- a/windows/en-US/firefox.adml +++ b/windows/en-US/firefox.adml @@ -16,6 +16,7 @@ Extensions Flash Home page + Search Allowed Sites Blocked Sites SPNEGO @@ -233,8 +234,26 @@ If this policy is enabled, private browsing is enabled by default in both the br If this policy is enabled, you can set whether the search bar is separate from the URL bar. If this policy is not configured or disabled, new users get a unified search bar, users upgrading from Firefox 56 and below get a separate search bar. + Search Engine One + Search Engine Two + Search Engine Three + Search Engine Four + Search Engine Five + If this policy is enabled, you can configure a search engine to be added to Firefox. Use {searchTerms} to indicate where the search term is placed. Due to a bug, you must select the method (usually GET). Note that you must specify the search engines in order. + +If this policy is not configured or disabled, a new search engine is not added. Unified Separate + GET + POST + Default Search Engine + If this policy is enabled, you can set type the name of a search engine to be used as the default. + +If this policy is not configured or disabled, the Firefox default engine is used. + Prevent Search Engine Installs + If this policy is enabled, the user cannot install search engines from web page. + +If this policy is not configured or disabled, search engines can be installed from web pages. @@ -292,6 +311,33 @@ If this policy is not configured or disabled, new users get a unified search bar + + + + + + + + Method: + + + + + + + + + + + + + + + + + + Don't allow proxy settings to be changed. Connection Type: diff --git a/windows/firefox.admx b/windows/firefox.admx index 93832ec..5e153a1 100644 --- a/windows/firefox.admx +++ b/windows/firefox.admx @@ -45,6 +45,9 @@ + + + @@ -815,5 +818,142 @@ + + + + + + + + + + GET + + + + + POST + + + + + + + + + + + + + + + + + + + GET + + + + + POST + + + + + + + + + + + + + + + + + + + GET + + + + + POST + + + + + + + + + + + + + + + + + + + GET + + + + + POST + + + + + + + + + + + + + + + + + + + GET + + + + + POST + + + + + + + + + + + + + + + + + + + + + + + + + +