diff options
| -rw-r--r-- | man/bcfg2-lint.8 | 4 | ||||
| -rw-r--r-- | man/bcfg2-lint.conf.5 | 4 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Lint/RequiredAttrs.py | 6 | ||||
| -rw-r--r-- | tools/manpagegen/bcfg2-lint.8.ronn | 2 | ||||
| -rw-r--r-- | tools/manpagegen/bcfg2-lint.conf.5.ronn | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/man/bcfg2-lint.8 b/man/bcfg2-lint.8 index a6bfffb8a..6f2ee12a0 100644 --- a/man/bcfg2-lint.8 +++ b/man/bcfg2-lint.8 @@ -1,5 +1,5 @@ . -.TH "BCFG2\-LINT" "8" "September 2012" "" "" +.TH "BCFG2\-LINT" "8" "October 2012" "" "" . .SH "NAME" \fBbcfg2\-lint\fR \- Check Bcfg2 specification for validity, common mistakes, and style @@ -71,7 +71,7 @@ Check for several types of duplicates in the Metadata: duplicate groups; duplica . .TP \fBInfoXML\fR -Check that certain attributes are specified in \fBinfo\.xml\fR files\. By default, requires that \fIowner\fR, \fIgroup\fR, and \fIperms\fR are specified\. Can also require that an \fBinfo\.xml\fR exists for all Cfg files, and that paranoid mode be enabled for all files\. +Check that certain attributes are specified in \fBinfo\.xml\fR files\. By default, requires that \fIowner\fR, \fIgroup\fR, and \fImode\fR are specified\. Can also require that an \fBinfo\.xml\fR exists for all Cfg files, and that paranoid mode be enabled for all files\. . .TP \fBMergeFiles\fR diff --git a/man/bcfg2-lint.conf.5 b/man/bcfg2-lint.conf.5 index 55dfa5cc2..63fe73253 100644 --- a/man/bcfg2-lint.conf.5 +++ b/man/bcfg2-lint.conf.5 @@ -1,5 +1,5 @@ . -.TH "BCFG2\-LINT\.CONF" "5" "September 2012" "" "" +.TH "BCFG2\-LINT\.CONF" "5" "October 2012" "" "" . .SH "NAME" \fBbcfg2\-lint\.conf\fR \- configuration parameters for bcfg2\-lint @@ -81,7 +81,7 @@ Ensure that files of the specified type have a comment containing the given stri . .TP \fBrequired_attrs\fR -A comma\-delimited list of attributes to require on \fB<Info>\fR tags\. Default is "owner,group,perms"\. +A comma\-delimited list of attributes to require on \fB<Info>\fR tags\. Default is "owner,group,mode"\. . .SS "MergeFiles" . diff --git a/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py b/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py index 299d6a246..da812b754 100644 --- a/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py +++ b/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py @@ -64,16 +64,16 @@ class RequiredAttrs(Bcfg2.Server.Lint.ServerPlugin): dev_type=lambda v: \ v in Bcfg2.Client.Tools.POSIX.base.device_map), directory=dict(name=is_filename, owner=is_username, - group=is_username, perms=is_octal_mode), + group=is_username, mode=is_octal_mode), file=dict(name=is_filename, owner=is_username, - group=is_username, perms=is_octal_mode, + group=is_username, mode=is_octal_mode, __text__=None), hardlink=dict(name=is_filename, to=is_filename), symlink=dict(name=is_filename), ignore=dict(name=is_filename), nonexistent=dict(name=is_filename), permissions=dict(name=is_filename, owner=is_username, - group=is_username, perms=is_octal_mode), + group=is_username, mode=is_octal_mode), vcs=dict(vcstype=lambda v: (v != 'Path' and hasattr(Bcfg2.Client.Tools.VCS, "Install%s" % v)), diff --git a/tools/manpagegen/bcfg2-lint.8.ronn b/tools/manpagegen/bcfg2-lint.8.ronn index e089bf2e7..f3c9771e8 100644 --- a/tools/manpagegen/bcfg2-lint.8.ronn +++ b/tools/manpagegen/bcfg2-lint.8.ronn @@ -80,7 +80,7 @@ the plugins listed below. * `InfoXML`: Check that certain attributes are specified in `info.xml` files. By - default, requires that *owner*, *group*, and *perms* are specified. + default, requires that *owner*, *group*, and *mode* are specified. Can also require that an `info.xml` exists for all Cfg files, and that paranoid mode be enabled for all files. diff --git a/tools/manpagegen/bcfg2-lint.conf.5.ronn b/tools/manpagegen/bcfg2-lint.conf.5.ronn index 657ea6e74..aed3eaaa8 100644 --- a/tools/manpagegen/bcfg2-lint.conf.5.ronn +++ b/tools/manpagegen/bcfg2-lint.conf.5.ronn @@ -94,7 +94,7 @@ files, all lines are checked since comment characters may vary. * `required_attrs`: A comma-delimited list of attributes to require on `<Info>` tags. - Default is "owner,group,perms". + Default is "owner,group,mode". ### MergeFiles |