[debian-edu-commits] r81944 - in trunk/src/debian-edu-config: debian etc/cups
sunweaver at alioth.debian.org
sunweaver at alioth.debian.org
Tue Aug 6 07:59:03 UTC 2013
Author: sunweaver
Date: 2013-08-06 07:59:03 +0000 (Tue, 06 Aug 2013)
New Revision: 81944
Modified:
trunk/src/debian-edu-config/debian/changelog
trunk/src/debian-edu-config/etc/cups/cupsd-debian-edu.conf
Log:
Adopt from d-e-c (wheezy):
Remove SystemGroup block from cupsd-debian-edu.conf, as this
option now is in cups-files.conf and modifying it in our
cupsd.conf file have no effect (Closes: #718484). Thanks to Mike
Gabriel for discovering this. Also remove all the other options
now moved to cups-files.conf (AccessLog, DataDir, DocumentRoot,
ErrorLog, FontPath, PageLog, Printcap, PrintcapFormat,
RequestRoot, RemoteRoot, ServerBin, ServerRoot, ServerCertificate,
ServerKey, User, Group and TempDir). (by Petter Reinholdtsen)
Modified: trunk/src/debian-edu-config/debian/changelog
===================================================================
--- trunk/src/debian-edu-config/debian/changelog 2013-08-06 07:37:21 UTC (rev 81943)
+++ trunk/src/debian-edu-config/debian/changelog 2013-08-06 07:59:03 UTC (rev 81944)
@@ -4,6 +4,15 @@
Rewrite /etc/shutdown-at-night/clients-generator to list hostname
and MAC address the way wakeupclients now expect it (Closes:
#662868). (by Petter Reinholdtsen)
+ * Adopt from d-e-c (wheezy):
+ Remove SystemGroup block from cupsd-debian-edu.conf, as this
+ option now is in cups-files.conf and modifying it in our
+ cupsd.conf file have no effect (Closes: #718484). Thanks to Mike
+ Gabriel for discovering this. Also remove all the other options
+ now moved to cups-files.conf (AccessLog, DataDir, DocumentRoot,
+ ErrorLog, FontPath, PageLog, Printcap, PrintcapFormat,
+ RequestRoot, RemoteRoot, ServerBin, ServerRoot, ServerCertificate,
+ ServerKey, User, Group and TempDir). (by Petter Reinholdtsen)
-- Mike Gabriel <sunweaver at debian.org> Tue, 06 Aug 2013 09:25:40 +0200
Modified: trunk/src/debian-edu-config/etc/cups/cupsd-debian-edu.conf
===================================================================
--- trunk/src/debian-edu-config/etc/cups/cupsd-debian-edu.conf 2013-08-06 07:37:21 UTC (rev 81943)
+++ trunk/src/debian-edu-config/etc/cups/cupsd-debian-edu.conf 2013-08-06 07:59:03 UTC (rev 81944)
@@ -61,17 +61,6 @@
########
#
-# AccessLog: the access log file; if this does not start with a leading /
-# then it is assumed to be relative to ServerRoot. By default set to
-# "/var/log/cups/access_log"
-#
-# You can also use the special name "syslog" to send the output to the
-# syslog file or daemon.
-#
-
-#AccessLog /var/log/cups/access_log
-
-#
# Classification: the classification level of the server. If set, this
# classification is displayed on all pages, and raw printing is disabled.
# The default is the empty string.
@@ -95,13 +84,6 @@
#ClassifyOverride off
#
-# DataDir: the root directory for the CUPS data files.
-# By default "/usr/share/cups".
-#
-
-#DataDir /usr/share/cups
-
-#
# DefaultCharset: the default character set to use. If not specified,
# defaults to "utf-8". Note that this can also be overridden in
# HTML documents...
@@ -117,31 +99,6 @@
#DefaultLanguage en
#
-# DocumentRoot: the root directory for HTTP documents that are served.
-# By default "/usr/share/cups/doc-root".
-#
-
-#DocumentRoot /usr/share/cups/doc-root
-
-#
-# ErrorLog: the error log file; if this does not start with a leading /
-# then it is assumed to be relative to ServerRoot. By default set to
-# "/var/log/cups/error_log"
-#
-# You can also use the special name "syslog" to send the output to the
-# syslog file or daemon.
-#
-
-#ErrorLog /var/log/cups/error_log
-
-#
-# FontPath: the path to locate all font files (currently only for pstoraster)
-# By default "/usr/share/cups/fonts".
-#
-
-#FontPath /usr/share/cups/fonts
-
-#
# LogLevel: controls the number of messages logged to the ErrorLog
# file and can be one of the following:
#
@@ -163,17 +120,6 @@
#MaxLogSize 0
#
-# PageLog: the page log file; if this does not start with a leading /
-# then it is assumed to be relative to ServerRoot. By default set to
-# "/var/log/cups/page_log"
-#
-# You can also use the special name "syslog" to send the output to the
-# syslog file or daemon.
-#
-
-#PageLog /var/log/cups/page_log
-
-#
# PreserveJobHistory: whether or not to preserve the job history after a
# job is completed, cancelled, or stopped. Default is Yes.
#
@@ -202,21 +148,6 @@
#MaxJobs 500
#
-# Printcap: the name of the printcap file. Default is /etc/printcap.
-# Leave blank to disable printcap file generation.
-#
-
-#Printcap /etc/printcap
-
-#
-# PrintcapFormat: the format of the printcap file, currently either
-# BSD or Solaris. The default is "BSD".
-#
-
-#PrintcapFormat BSD
-#PrintcapFormat Solaris
-
-#
# PrintcapGUI: the name of the GUI options panel program to associate
# with print queues under IRIX. The default is "/usr/bin/glpoptions"
# from ESP Print Pro.
@@ -228,72 +159,11 @@
#PrintcapGUI /usr/bin/glpoptions
-#
-# RequestRoot: the directory where request files are stored.
-# By default "/var/spool/cups".
-#
-
-#RequestRoot /var/spool/cups
-
-#
-# RemoteRoot: the name of the user assigned to unauthenticated accesses
-# from remote systems. By default "remroot".
-#
-
-#RemoteRoot remroot
-
-#
-# ServerBin: the root directory for the scheduler executables.
-# By default "/usr/lib/cups".
-#
-
-#ServerBin /usr/lib/cups
-
-#
-# ServerRoot: the root directory for the scheduler.
-# By default "/etc/cups".
-#
-
-#ServerRoot /etc/cups
-
-
########
-######## Encryption Support
-########
-
-#
-# ServerCertificate: the file to read containing the server's certificate.
-# Defaults to "/etc/cups/ssl/server.crt".
-#
-
-#ServerCertificate /etc/cups/ssl/server.crt
-
-#
-# ServerKey: the file to read containing the server's key.
-# Defaults to "/etc/cups/ssl/server.key".
-#
-
-#ServerKey /etc/cups/ssl/server.key
-
-
-########
######## Filter Options
########
#
-# User/Group: the user and group the server runs under. Normally this
-# must be lp and sys, however you can configure things for another
-# user or group as needed.
-#
-# Note: the server must be run initially as root to support the
-# default IPP port of 631. It changes users whenever an external
-# program is run, or if the RunAsUser directive is specified...
-#
-
-User lp
-Group sys
-
-#
# RIPCache: the amount of memory that each RIP should use to cache
# bitmaps. The value can be any real number followed by "k" for
# kilobytes, "m" for megabytes, "g" for gigabytes, or "t" for tiles
@@ -303,14 +173,6 @@
#RIPCache 8m
#
-# TempDir: the directory to put temporary files in. This directory must be
-# writable by the user defined above! Defaults to "/var/spool/cups/tmp" or
-# the value of the TMPDIR environment variable.
-#
-
-#TempDir /var/spool/cups/tmp
-
-#
# FilterLimit: sets the maximum cost of all job filters that can be run
# at the same time. A limit of 0 means no limit. A typical job may need
# a filter limit of at least 200; limits less than the minimum required
@@ -585,14 +447,6 @@
########
#
-# SystemGroup: the group name for "System" (printer administration)
-# access. The default varies depending on the operating system, but
-# will be "sys", "system", or "root" (checked for in that order.)
-#
-
-SystemGroup lpadmin
-
-#
# Access permissions for each directory served by the scheduler.
# Locations are relative to DocumentRoot...
#
More information about the debian-edu-commits
mailing list