From 64e30553db4cf2574192a3f0eb34b607aa4f7ac1 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 27 Jun 2016 02:44:53 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- .etckeeper | 4 ++ cups/cups-files.conf.default | 93 ++++++++++++++++++++++++++++++++++++ cups/cupsd.conf | 7 +++ cups/snmp.conf.default | 7 +++ init.d/cupsd | 20 +++----- 5 files changed, 118 insertions(+), 13 deletions(-) create mode 100644 cups/cups-files.conf.default create mode 100644 cups/snmp.conf.default diff --git a/.etckeeper b/.etckeeper index fc103ca..cb5bcf6 100755 --- a/.etckeeper +++ b/.etckeeper @@ -1153,12 +1153,16 @@ maybe chmod 0644 'cups/client.conf' maybe chmod 0644 'cups/cups-browsed.conf' maybe chgrp 'lp' 'cups/cups-files.conf' maybe chmod 0640 'cups/cups-files.conf' +maybe chgrp 'lp' 'cups/cups-files.conf.default' +maybe chmod 0640 'cups/cups-files.conf.default' maybe chgrp 'lp' 'cups/cupsd.conf' maybe chmod 0640 'cups/cupsd.conf' maybe chmod 0755 'cups/interfaces' maybe chmod 0755 'cups/ppd' maybe chgrp 'lp' 'cups/snmp.conf' maybe chmod 0640 'cups/snmp.conf' +maybe chgrp 'lp' 'cups/snmp.conf.default' +maybe chmod 0640 'cups/snmp.conf.default' maybe chmod 0755 'cups/ssl' maybe chmod 0755 'dbus-1' maybe chmod 0644 'dbus-1/session.conf' diff --git a/cups/cups-files.conf.default b/cups/cups-files.conf.default new file mode 100644 index 0000000..44dc3fe --- /dev/null +++ b/cups/cups-files.conf.default @@ -0,0 +1,93 @@ +# +# 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 config + +# Do we call fsync() after writing configuration or status files? +#SyncOnClose No + +# 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 lp +#Group lp + +# Administrator user group, used to match @SYSTEM in cupsd.conf policy rules... +# This cannot contain the Group value for security reasons... +SystemGroup lpadmin + + +# 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 0640 +#LogFilePerm 0644 + +# 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 /var/log/cups/access_log + +# Location of cache files used by the scheduler... +#CacheDir /var/cache/cups + +# Location of data files used by the scheduler... +#DataDir /usr/share/cups + +# Location of the static web content served by the scheduler... +#DocumentRoot /usr/share/cups/html + +# 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 /var/log/cups/error_log + +# Location of fonts used by older print filters... +#FontPath /usr/share/cups/fonts + +# Location of LPD configuration +#LPDConfigFile xinetd:///etc/xinetd.d/cups-lpd + +# 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 /var/log/cups/page_log + +# Location of the file listing all of the local printers... +#Printcap /etc/printcap + +# Format of the Printcap file... +#PrintcapFormat bsd +#PrintcapFormat plist +#PrintcapFormat solaris + +# Location of all spool files... +#RequestRoot /var/spool/cups + +# Location of helper programs... +#ServerBin /usr/lib/cups + +# SSL/TLS keychain for the scheduler... +#ServerKeychain ssl + +# Location of other configuration files... +#ServerRoot /etc/cups + +# Location of Samba configuration file... +#SMBConfigFile + +# Location of scheduler state files... +#StateDir /run/cups + +# 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 /var/spool/cups/tmp diff --git a/cups/cupsd.conf b/cups/cupsd.conf index 3d477a8..50e11f5 100644 --- a/cups/cupsd.conf +++ b/cups/cupsd.conf @@ -39,6 +39,13 @@ WebInterface Yes Order allow,deny +# Restrict access to log files... + + AuthType Default + Require user @SYSTEM + Order allow,deny + + # Set the default printer/job policies... # Job/subscription privacy... diff --git a/cups/snmp.conf.default b/cups/snmp.conf.default new file mode 100644 index 0000000..a7d1e3b --- /dev/null +++ b/cups/snmp.conf.default @@ -0,0 +1,7 @@ +# +# SNMP configuration file for CUPS. See "man cups-snmp.conf" for a complete +# description of this file. +# + +Address @LOCAL +Community public diff --git a/init.d/cupsd b/init.d/cupsd index d81e2bc..7fb1a29 100755 --- a/init.d/cupsd +++ b/init.d/cupsd @@ -1,4 +1,9 @@ -#!/sbin/runscript +#!/sbin/openrc-run +# Copyright 1999-2016 Gentoo Foundation +# $Id$ + +description="The Common Unix Printing System daemon" +command="/usr/sbin/cupsd" depend() { use net @@ -7,20 +12,9 @@ depend() { after logger } -start() { - ebegin "Starting cupsd" - +start_pre() { checkpath -q -d -m 0775 -o root:lp /var/cache/cups checkpath -q -d -m 0775 -o root:lp /var/cache/cups/rss checkpath -q -d -m 0755 -o root:lp /run/cups checkpath -q -d -m 0511 -o lp:lpadmin /run/cups/certs - - start-stop-daemon --start --quiet --exec /usr/sbin/cupsd - eend $? -} - -stop() { - ebegin "Stopping cupsd" - start-stop-daemon --stop --quiet --exec /usr/sbin/cupsd - eend $? } -- 2.39.5