Skip to content

Commit

Permalink
Merge pull request #70 from Archaeopteryx/proxyFixes
Browse files Browse the repository at this point in the history
Add missing 'policies' level for 'Proxy' snippet and missing commas
  • Loading branch information
mkaply authored Apr 17, 2018
2 parents 384ac59 + 5511f41 commit 49a479f
Showing 1 changed file with 17 additions and 15 deletions.
32 changes: 17 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -369,8 +369,8 @@ This policy sets domains that can install extensions, as well as the default beh
"policies": {
"InstallAddonsPermission": {
"Allow": ["http://example.org/",
"http://example.edu/"]
"Default": [true|false], /* If this is set to false, add-ons cannot be installed by the user */
"http://example.edu/"],
"Default": [true|false] /* If this is set to false, add-ons cannot be installed by the user */
}
}
}
Expand Down Expand Up @@ -432,19 +432,21 @@ This policy allows you to specify proxy settings. These settings correspond to t
To specify ports, append them to the hostnames 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]
"HTTPProxy": "hostname",
"UseHTTPProxyForAllProtocols": [true, false]
"SSLProxy": "hostname",
"FTPProxy": "hostname",
"SOCKSProxy": "hostname",
"SOCKSVersion": [4, 5],
"Passthrough": "List of passthrough addresses/domains",
"AutoConfigURL": "URL_TO_AUTOCONFIG",
"AutoLogin": [true, false],
"UseProxyForDNS": [true, false]
"policies": {
"Proxy": {
"Mode": ["none", "system", "manual", "autoDetect", "autoConfig"],
"Locked": [true, false],
"HTTPProxy": "hostname",
"UseHTTPProxyForAllProtocols": [true, false],
"SSLProxy": "hostname",
"FTPProxy": "hostname",
"SOCKSProxy": "hostname",
"SOCKSVersion": [4, 5],
"Passthrough": "List of passthrough addresses/domains",
"AutoConfigURL": "URL_TO_AUTOCONFIG",
"AutoLogin": [true, false],
"UseProxyForDNS": [true, false]
}
}
}
```
Expand Down

0 comments on commit 49a479f

Please sign in to comment.