Skip to content

Commit 443c224

Browse files
authored
Update RFCXXXX-Policy.md
1 parent ae41a86 commit 443c224

File tree

1 file changed

+5
-40
lines changed

1 file changed

+5
-40
lines changed

1-Draft/RFCXXXX-Policy.md

Lines changed: 5 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ If during operation PowerShell 7 cannot read configuration files it continue to
5959
`PowerShell 7` settings are grouped into `Policy settings` and `Regular settings`.
6060
Regular settings are normal configuration settings.
6161
Regular settings can be treated as default and recommended values.
62-
Policy settings is high precedence.
62+
Policy settings is higher precedence.
6363
See [Precedence for Policy settings in descending order](#precedence-for-policy-settings-in-descending-order).
6464
Policy settings are used by administrators to centrally manage PowerShell and hosted applications.
6565

@@ -124,9 +124,9 @@ This will have performance impact on startup, but only when `-settingsfile` is s
124124
|-----------------------------|------------------------------------------------------|------------------------------------------------------|
125125
| File -> Application-Startup | pwsh -settingsfile `somepath/powershell.config.json` | pwsh -settingsfile `somepath/powershell.config.json` |
126126
| File -> Application-Wide | $apphome\powershell.config.json | $apphome/powershell.config.json |
127-
| File -> User-Wide | %APPDATA%\powershell.config.json | ~/powershell.config.json |
127+
| File -> User-Wide | %APPDATA%\powershell.config.json | ~/.config/powershell/powershell.config.json |
128128
| File -> Computer-Wide | %ProgramFiles%\PowerShell\powershell.config.json | /opt/Microsoft/powershell/powershell.config.json |
129-
| GPO -> User Config | HKCU\Software\PowerShellCore | See `Comment A` below |
129+
| GPO -> User Config | HKCU\Software\PowerShellCore | ~/.config/powershell/powershell.config.json | |
130130
| GPO -> Computer Config | HKLM\Software\PowerShellCore | /etc/powershell.config.json |
131131

132132
### Configuration settings
@@ -191,15 +191,7 @@ I filed [#9632](https://github.com/PowerShell/PowerShell/issues/9632) on Updatab
191191
"PoliciesSettings": {
192192
...
193193
}
194-
},
195-
196-
"OtherPowerShellApplication": {
197-
"RegularSettings": {
198-
...
199-
},
200-
"PolicySettings": {
201-
...
202-
}
194+
}
203195
}
204196
```
205197

@@ -214,37 +206,10 @@ The main purpose of describing the alternative is to describe why it should not
214206

215207
#### Description
216208

217-
We could attempt to resolve policy conflicts between PowerShell 7 policy and Windows PowerShell policy.
209+
PowerShell could attempt to resolve policy conflicts between PowerShell 7 policy and Windows PowerShell policy.
218210
This would make the `Precedence for Policy settings` not just a simple list but a complex set of rules that would not be easily understood. See [this conversation](https://github.com/PowerShell/PowerShell/issues/9309?#issuecomment-480643922).
219211

220212
### Allowing environment variable in the JSON
221213

222214
A new RFC should be drafted about how to allow environment variables in the values in the JSON.
223215
This would allow consistent files across platforms.
224-
225-
### Comment A
226-
227-
Mainly for Unix we'd add `Users` section to computer wide JSON file (`/etc/powershell.config.json`) to allow administrators set policies and regular settings on user level base
228-
229-
```json
230-
{
231-
"PowerShell": {
232-
"RegularSettings": {
233-
...
234-
},
235-
"PolicySettings": {
236-
...
237-
},
238-
"Users": {
239-
"Smith": {
240-
"PowerShell": {
241-
"RegularSettings": {
242-
...
243-
},
244-
"PolicySettings": {
245-
...
246-
}
247-
}
248-
}
249-
}
250-
```

0 commit comments

Comments
 (0)