Skip to content

Commit

Permalink
Add note about restarting the scheduler manually after editing config…
Browse files Browse the repository at this point in the history
… files (Issue #5402)
  • Loading branch information
michaelrsweet committed Nov 8, 2018
1 parent b167c7f commit ee347e1
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 13 deletions.
2 changes: 1 addition & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Changes in CUPS v2.3b6

- Localization update (Issue #5339, Issue #5348, Issue #5362, Issue #5408,
Issue #5410)
- Documentation updates (Issue #5369, Issue #5403, Issue #5404)
- Documentation updates (Issue #5369, Issue #5402, Issue #5403, Issue #5404)
- The lpadmin command would create a non-working printer in some error cases
(Issue #5305)
- The scheduler would crash if an empty `AccessLog` directive was specified
Expand Down
16 changes: 12 additions & 4 deletions man/cups-files.conf.man.in
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
.\"
.\" cups-files.conf man page for CUPS.
.\"
.\" Copyright 2007-2018 by Apple Inc.
.\" Copyright 1997-2006 by Easy Software Products.
.\" Copyright © 2007-2018 by Apple Inc.
.\" Copyright © 1997-2006 by Easy Software Products.
.\"
.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information.
.\" Licensed under Apache License v2.0. See the file "LICENSE" for more
.\" information.
.\"
.TH cups-files.conf 5 "CUPS" "21 September 2017" "Apple Inc."
.TH cups-files.conf 5 "CUPS" "8 November 2018" "Apple Inc."
.SH NAME
cups\-files.conf \- file and directory configuration file for cups
.SH DESCRIPTION
Expand Down Expand Up @@ -269,6 +270,13 @@ Specifies the format to use for the Printcap file.
.TP 5
\fBSMBConfigFile \fIfilename\fR
Specifies the SMB service configuration file to update.
.SH NOTES
The scheduler MUST be restarted manually after making changes to the \fBcups-files.conf\fR file.
On Linux this is typically done using the
.BR systemctl (8)
command, while on macOS the
.BR launchctl (8)
command is used instead.
.SH SEE ALSO
.BR classes.conf (5),
.BR cups (1),
Expand Down
24 changes: 16 additions & 8 deletions man/cupsd.conf.man.in
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
.\"
.\" cupsd.conf man page for CUPS.
.\"
.\" Copyright 2007-2018 by Apple Inc.
.\" Copyright 1997-2006 by Easy Software Products.
.\" Copyright © 2007-2018 by Apple Inc.
.\" Copyright © 1997-2006 by Easy Software Products.
.\"
.\" Licensed under Apache License v2.0. See the file "LICENSE" for more information.
.\" Licensed under Apache License v2.0. See the file "LICENSE" for more
.\" information.
.\"
.TH cupsd.conf 5 "CUPS" "24 April 2018" "Apple Inc."
.TH cupsd.conf 5 "CUPS" "8 November 2018" "Apple Inc."
.SH NAME
cupsd.conf \- server configuration file for cups
.SH DESCRIPTION
Expand All @@ -17,10 +18,6 @@ file configures the CUPS scheduler,
It is normally located in the
.I /etc/cups
directory.
\fBNote:\fR File, directory, and user configuration directives that used to be allowed in the \fBcupsd.conf\fR file are now stored in the
.BR cups-files.conf (5)
file instead in order to prevent certain types of privilege escalation attacks.
.LP
Each line in the file can be a configuration directive, a blank line, or a comment.
Configuration directives typically consist of a name and zero or more values separated by whitespace.
The configuration directive name and values are case-insensitive.
Expand Down Expand Up @@ -856,6 +853,17 @@ Use "%{job-impressions-completed}" to insert the number of pages (sides) that we
\fBRIPCache \fIsize\fR
Specifies the maximum amount of memory to use when converting documents into bitmaps for a printer.
The default is "128m".
.SH NOTES
File, directory, and user configuration directives that used to be allowed in the \fBcupsd.conf\fR file are now stored in the
.BR cups-files.conf (5)
file instead in order to prevent certain types of privilege escalation attacks.
.PP
The scheduler MUST be restarted manually after making changes to the \fBcupsd.conf\fR file.
On Linux this is typically done using the
.BR systemctl (8)
command, while on macOS the
.BR launchctl (8)
command is used instead.
.SH CONFORMING TO
The \fBcupsd.conf\fR file format is based on the Apache HTTP Server configuration file format.
.SH EXAMPLES
Expand Down

0 comments on commit ee347e1

Please sign in to comment.