From: frank Date: Sun, 15 Jan 2012 23:56:25 +0000 (+0100) Subject: committing changes in /etc after emerge run X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=2229119a270b42e08996a23ba79065f4f2f402e5;p=config%2Fbruni%2Fetc.git committing changes in /etc after emerge run Package changes: +net-print/cups-1.4.8-r1 --- diff --git a/.etckeeper b/.etckeeper index 45c0e795..b58c9aab 100755 --- a/.etckeeper +++ b/.etckeeper @@ -97,6 +97,21 @@ maybe chmod 0750 './cron.weekly' maybe chmod 0644 './cron.weekly/.keep_sys-process_cronbase-0' maybe chmod 0644 './crontab' maybe chmod 0644 './csh.env' +maybe chgrp lp './cups' +maybe chmod 0755 './cups' +maybe chmod 0644 './cups/client.conf' +maybe chgrp lp './cups/cupsd.conf' +maybe chmod 0640 './cups/cupsd.conf' +maybe chgrp lp './cups/cupsd.conf.default' +maybe chmod 0640 './cups/cupsd.conf.default' +maybe chmod 0755 './cups/interfaces' +maybe chmod 0644 './cups/interfaces/.keep_net-print_cups-0' +maybe chmod 0755 './cups/ppd' +maybe chmod 0644 './cups/ppd/.keep_net-print_cups-0' +maybe chgrp lp './cups/snmp.conf' +maybe chmod 0640 './cups/snmp.conf' +maybe chmod 0755 './cups/ssl' +maybe chmod 0644 './cups/ssl/.keep_net-print_cups-0' maybe chmod 0755 './dbus-1' maybe chmod 0644 './dbus-1/session.conf' maybe chmod 0755 './dbus-1/session.d' @@ -105,6 +120,7 @@ maybe chmod 0644 './dbus-1/system.conf' maybe chmod 0755 './dbus-1/system.d' maybe chmod 0644 './dbus-1/system.d/.keep_sys-apps_dbus-0' maybe chmod 0644 './dbus-1/system.d/ConsoleKit.conf' +maybe chmod 0444 './dbus-1/system.d/cups.conf' maybe chmod 0644 './dbus-1/system.d/org.freedesktop.PolicyKit1.conf' maybe chmod 0755 './default' maybe chmod 0600 './default/useradd' @@ -251,6 +267,7 @@ maybe chmod 0755 './init.d/bootmisc' maybe chmod 0755 './init.d/consolefont' maybe chmod 0755 './init.d/consolekit' maybe chmod 0755 './init.d/crypto-loop' +maybe chmod 0755 './init.d/cupsd' maybe chmod 0755 './init.d/dbus' maybe chmod 0755 './init.d/devfs' maybe chmod 0755 './init.d/device-mapper' @@ -396,6 +413,7 @@ maybe chmod 0644 './pam.d/chgpasswd' maybe chmod 0644 './pam.d/chpasswd' maybe chmod 0644 './pam.d/chsh' maybe chmod 0644 './pam.d/cron' +maybe chmod 0644 './pam.d/cups' maybe chmod 0644 './pam.d/cvs' maybe chmod 0644 './pam.d/groupadd' maybe chmod 0644 './pam.d/groupdel' @@ -596,6 +614,7 @@ maybe chmod 0644 './xinetd.conf' maybe chmod 0755 './xinetd.d' maybe chmod 0644 './xinetd.d/chargen-dgram' maybe chmod 0644 './xinetd.d/chargen-stream' +maybe chmod 0644 './xinetd.d/cups-lpd' maybe chmod 0644 './xinetd.d/cvspserver' maybe chmod 0644 './xinetd.d/daytime-dgram' maybe chmod 0644 './xinetd.d/daytime-stream' diff --git a/cups/client.conf b/cups/client.conf new file mode 100644 index 00000000..d6d639ea --- /dev/null +++ b/cups/client.conf @@ -0,0 +1 @@ +ServerName /var/run/cups/cups.sock diff --git a/cups/cupsd.conf b/cups/cupsd.conf new file mode 100644 index 00000000..4b078f51 --- /dev/null +++ b/cups/cupsd.conf @@ -0,0 +1,125 @@ +# +# "$Id: cupsd.conf.in 9310 2010-09-21 22:34:57Z mike $" +# +# Sample configuration file for the CUPS scheduler. See "man cupsd.conf" for a +# complete description of this file. +# + +# Log general information in error_log - change "warn" to "debug" +# for troubleshooting... +LogLevel warn + +# Administrator user group... +SystemGroup lpadmin + + +# Only listen for connections from the local machine. +Listen localhost:631 +Listen /var/run/cups/cups.sock + +# Show shared printers on the local network. +Browsing On +BrowseOrder allow,deny +BrowseAllow all +BrowseLocalProtocols CUPS + +# Default authentication type, when authentication is required... +DefaultAuthType Basic + +# Restrict access to the server... + + Order allow,deny + + +# Restrict access to the admin pages... + + Order allow,deny + + +# Restrict access to configuration files... + + AuthType Default + Require user @SYSTEM + Order allow,deny + + +# Set the default printer/job policies... + + # Job-related operations must be done by the owner or an administrator... + + Order deny,allow + + + + Require user @OWNER @SYSTEM + Order deny,allow + + + # All administration operations require an administrator to authenticate... + + AuthType Default + Require user @SYSTEM + Order deny,allow + + + # All printer operations require a printer operator to authenticate... + + AuthType Default + Require user @SYSTEM + Order deny,allow + + + # Only the owner or an administrator can cancel or authenticate a job... + + Require user @OWNER @SYSTEM + Order deny,allow + + + + Order deny,allow + + + +# Set the authenticated printer/job policies... + + # Job-related operations must be done by the owner or an administrator... + + AuthType Default + Order deny,allow + + + + AuthType Default + Require user @OWNER @SYSTEM + Order deny,allow + + + # All administration operations require an administrator to authenticate... + + AuthType Default + Require user @SYSTEM + Order deny,allow + + + # All printer operations require a printer operator to authenticate... + + AuthType Default + Require user @SYSTEM + Order deny,allow + + + # Only the owner or an administrator can cancel or authenticate a job... + + AuthType Default + Require user @OWNER @SYSTEM + Order deny,allow + + + + Order deny,allow + + + +# +# End of "$Id: cupsd.conf.in 9310 2010-09-21 22:34:57Z mike $". +# diff --git a/cups/cupsd.conf.default b/cups/cupsd.conf.default new file mode 100644 index 00000000..4b078f51 --- /dev/null +++ b/cups/cupsd.conf.default @@ -0,0 +1,125 @@ +# +# "$Id: cupsd.conf.in 9310 2010-09-21 22:34:57Z mike $" +# +# Sample configuration file for the CUPS scheduler. See "man cupsd.conf" for a +# complete description of this file. +# + +# Log general information in error_log - change "warn" to "debug" +# for troubleshooting... +LogLevel warn + +# Administrator user group... +SystemGroup lpadmin + + +# Only listen for connections from the local machine. +Listen localhost:631 +Listen /var/run/cups/cups.sock + +# Show shared printers on the local network. +Browsing On +BrowseOrder allow,deny +BrowseAllow all +BrowseLocalProtocols CUPS + +# Default authentication type, when authentication is required... +DefaultAuthType Basic + +# Restrict access to the server... + + Order allow,deny + + +# Restrict access to the admin pages... + + Order allow,deny + + +# Restrict access to configuration files... + + AuthType Default + Require user @SYSTEM + Order allow,deny + + +# Set the default printer/job policies... + + # Job-related operations must be done by the owner or an administrator... + + Order deny,allow + + + + Require user @OWNER @SYSTEM + Order deny,allow + + + # All administration operations require an administrator to authenticate... + + AuthType Default + Require user @SYSTEM + Order deny,allow + + + # All printer operations require a printer operator to authenticate... + + AuthType Default + Require user @SYSTEM + Order deny,allow + + + # Only the owner or an administrator can cancel or authenticate a job... + + Require user @OWNER @SYSTEM + Order deny,allow + + + + Order deny,allow + + + +# Set the authenticated printer/job policies... + + # Job-related operations must be done by the owner or an administrator... + + AuthType Default + Order deny,allow + + + + AuthType Default + Require user @OWNER @SYSTEM + Order deny,allow + + + # All administration operations require an administrator to authenticate... + + AuthType Default + Require user @SYSTEM + Order deny,allow + + + # All printer operations require a printer operator to authenticate... + + AuthType Default + Require user @SYSTEM + Order deny,allow + + + # Only the owner or an administrator can cancel or authenticate a job... + + AuthType Default + Require user @OWNER @SYSTEM + Order deny,allow + + + + Order deny,allow + + + +# +# End of "$Id: cupsd.conf.in 9310 2010-09-21 22:34:57Z mike $". +# diff --git a/cups/interfaces/.keep_net-print_cups-0 b/cups/interfaces/.keep_net-print_cups-0 new file mode 100644 index 00000000..e69de29b diff --git a/cups/ppd/.keep_net-print_cups-0 b/cups/ppd/.keep_net-print_cups-0 new file mode 100644 index 00000000..e69de29b diff --git a/cups/snmp.conf b/cups/snmp.conf new file mode 100644 index 00000000..cf954df3 --- /dev/null +++ b/cups/snmp.conf @@ -0,0 +1,13 @@ +# +# "$Id$" +# +# Sample SNMP configuration file for CUPS. See "man cups-snmp.conf" for a +# complete description of this file. +# + +Address @LOCAL +Community public + +# +# End of "$Id$". +# diff --git a/cups/ssl/.keep_net-print_cups-0 b/cups/ssl/.keep_net-print_cups-0 new file mode 100644 index 00000000..e69de29b diff --git a/dbus-1/system.d/cups.conf b/dbus-1/system.d/cups.conf new file mode 100644 index 00000000..537ac776 --- /dev/null +++ b/dbus-1/system.d/cups.conf @@ -0,0 +1,13 @@ + + + + + + + + + + + + diff --git a/init.d/cupsd b/init.d/cupsd new file mode 100755 index 00000000..f59e27b4 --- /dev/null +++ b/init.d/cupsd @@ -0,0 +1,20 @@ +#!/sbin/runscript + +depend() { + use net + need dbus + before nfs + after logger +} + +start() { + ebegin "Starting cupsd" + start-stop-daemon --start --quiet --exec /usr/sbin/cupsd + eend $? +} + +stop() { + ebegin "Stopping cupsd" + start-stop-daemon --stop --quiet --exec /usr/sbin/cupsd + eend $? +} diff --git a/pam.d/cups b/pam.d/cups new file mode 100644 index 00000000..acccae5e --- /dev/null +++ b/pam.d/cups @@ -0,0 +1,5 @@ +# File autogenerated by pamd_mimic in pam eclass + + +auth include system-auth +account include system-auth diff --git a/xinetd.d/cups-lpd b/xinetd.d/cups-lpd new file mode 100644 index 00000000..4d5aa82b --- /dev/null +++ b/xinetd.d/cups-lpd @@ -0,0 +1,12 @@ +service printer +{ + disable = yes + socket_type = stream + protocol = tcp + wait = no + user = lp + group = lp + passenv = + server = /usr/libexec/cups/daemon/cups-lpd + server_args = -o document-format=application/octet-stream +}