Skip to content

Commit 2c74eba

Browse files
sirainenfleischie
authored andcommitted
Convert apparmor plugin settings
1 parent 74c19bb commit 2c74eba

File tree

2 files changed

+9
-14
lines changed

2 files changed

+9
-14
lines changed

data/settings.js

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1690,21 +1690,18 @@ See [[setting,auth_master_user_separator]] for the format of this setting.`
16901690

16911691
/* apparmor plugin */
16921692

1693-
apparmor_hat: {
1693+
apparmor_hats: {
16941694
plugin: 'apparmor',
1695-
values: setting_types.STRING,
1695+
values: setting_types.BOOLLIST,
16961696
text: `
1697-
The AppArmor "hat" to change to when a user is loaded.
1698-
1699-
You can define multiple hats by appending an increasing number to the
1700-
setting name.
1697+
List of AppArmor "hats" to change to when a user is loaded.
17011698
17021699
Example:
17031700
17041701
\`\`\`
1705-
plugin {
1706-
apparmor_hat = hat_name
1707-
apparmor_hat2 = another_hat
1702+
apparmor_hats {
1703+
hat_name = yes
1704+
another_hat = yes
17081705
}
17091706
\`\`\``
17101707
},

docs/core/plugins/apparmor.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ function.
2222
You can also specify hats from user or password database extra fields.
2323

2424
### Password Database
25-
If you provide from [[link,passdb]], use `userdb_apparmor_hat=hat`.
25+
If you provide from [[link,passdb]], use `userdb_apparmor_hats=hat`.
2626

2727
### User Database
28-
If you provide from [[link,userdb]], use `apparmor_hat=hat`.
28+
If you provide from [[link,userdb]], use `apparmor_hats=hat`.
2929

3030
## Sample Configuration
3131

@@ -34,9 +34,7 @@ mail_plugins {
3434
apparmor = yes
3535
}
3636
37-
plugin {
38-
apparmor_hat = hat_name
39-
}
37+
apparmor_hats = hat_name
4038
```
4139

4240
## Debugging

0 commit comments

Comments
 (0)