From c41769ffd04ad45bb2c95691ad3999674896a2ed Mon Sep 17 00:00:00 2001 From: msweet Date: Mon, 26 Nov 2012 19:37:04 +0000 Subject: Merge changes from CUPS 1.7svn-r10710. git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@4040 a1ca3aef-8c08-0410-bb20-df032aa958be --- conf/Makefile | 2 +- conf/cups-files.conf.in | 98 +++++++++++++++++++++++++++++++++++++++++++++++++ conf/cupsd.conf.in | 4 -- 3 files changed, 99 insertions(+), 5 deletions(-) create mode 100644 conf/cups-files.conf.in (limited to 'conf') diff --git a/conf/Makefile b/conf/Makefile index 5114174f1..a68a58b16 100644 --- a/conf/Makefile +++ b/conf/Makefile @@ -19,7 +19,7 @@ include ../Makedefs # Config files... # -KEEP = cupsd.conf snmp.conf +KEEP = cups-files.conf cupsd.conf snmp.conf REPLACE = mime.convs mime.types diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in new file mode 100644 index 000000000..8c3a1b58c --- /dev/null +++ b/conf/cups-files.conf.in @@ -0,0 +1,98 @@ +# +# "$Id$" +# +# Sample file/directory/user/group configuration file for the CUPS scheduler. +# See "man cups-files.conf" for a complete description of this file. +# + +# List of events that are considered fatal errors for the scheduler... +#FatalErrors @CUPS_FATAL_ERRORS@ + +# Default user and group for filters/backends/helper programs; this cannot be +# any user or group that resolves to ID 0 for security reasons... +#User @CUPS_USER@ +#Group @CUPS_GROUP@ + +# Administrator user group, used to match @SYSTEM in cupsd.conf policy rules... +SystemGroup @CUPS_SYSTEM_GROUPS@ +@CUPS_SYSTEM_AUTHKEY@ + +# User that is substituted for unauthenticated (remote) root accesses... +#RemoteRoot remroot + +# Do we allow file: device URIs other than to /dev/null? +#FileDevice No + +# Permissions for configuration and log files... +#ConfigFilePerm @CUPS_CONFIG_FILE_PERM@ +#LogFilePerm @CUPS_LOG_FILE_PERM@ + +# Location of the file logging all access to the scheduler; may be the name +# "syslog". If not an absolute path, the value of ServerRoot is used as the +# root directory. Also see the "AccessLogLevel" directive in cupsd.conf. +AccessLog @CUPS_LOGDIR@/access_log + +# Location of cache files used by the scheduler... +#CacheDir @CUPS_CACHEDIR@ + +# Location of data files used by the scheduler... +#DataDir @CUPS_DATADIR@ + +# Location of the static web content served by the scheduler... +#DocRoot @CUPS_DOCROOT@ + +# Location of the file logging all messages produced by the scheduler and any +# helper programs; may be the name "syslog". If not an absolute path, the value +# of ServerRoot is used as the root directory. Also see the "LogLevel" +# directive in cupsd.conf. +ErrorLog @CUPS_LOGDIR@/error_log + +# Location of fonts used by older print filters... +#FontPath @CUPS_FONTPATH@ + +# Location of LPD configuration +#LPDConfigFile @CUPS_DEFAULT_LPD_CONFIG_FILE@ + +# Location of the file logging all pages printed by the scheduler and any +# helper programs; may be the name "syslog". If not an absolute path, the value +# of ServerRoot is used as the root directory. Also see the "PageLogFormat" +# directive in cupsd.conf. +PageLog @CUPS_LOGDIR@/page_log + +# Location of the file listing all of the local printers... +#Printcap @CUPS_DEFAULT_PRINTCAP@ + +# Format of the Printcap file... +#PrintcapFormat bsd +#PrintcapFormat plist +#PrintcapFormat solaris + +# Location of all spool files... +#RequestRoot @CUPS_REQUESTS@ + +# Location of helper programs... +#ServerBin @CUPS_SERVERBIN@ + +# SSL/TLS certificate for the scheduler... +#ServerCertificate @CUPS_SERVERCERT@ + +# SSL/TLS private key for the scheduler... +#ServerKey @CUPS_SERVERKEY@ + +# Location of other configuration files... +#ServerRoot @CUPS_SERVERROOT@ + +# Location of Samba configuration file... +#SMBConfigFile @CUPS_DEFAULT_SMB_CONFIG_FILE@ + +# Location of scheduler state files... +#StateDir @CUPS_STATEDIR@ + +# Location of scheduler/helper temporary files. This directory is emptied on +# scheduler startup and cannot be one of the standard (public) temporary +# directory locations for security reasons... +#TempDir @CUPS_REQUESTS@/tmp + +# +# End of "$Id$". +# diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in index 8a1e86f25..5ae2c9f02 100644 --- a/conf/cupsd.conf.in +++ b/conf/cupsd.conf.in @@ -9,10 +9,6 @@ # for troubleshooting... LogLevel @CUPS_LOG_LEVEL@ -# Administrator user group... -SystemGroup @CUPS_SYSTEM_GROUPS@ -@CUPS_SYSTEM_AUTHKEY@ - # Only listen for connections from the local machine. Listen localhost:@DEFAULT_IPP_PORT@ @CUPS_LISTEN_DOMAINSOCKET@ -- cgit v1.2.1