From: fbrehm Date: Mon, 7 May 2012 18:12:44 +0000 (+0200) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=8c15ae688d367648a63d57c8af692da1bcc0db5f;p=config%2Fsamara%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/.etckeeper b/.etckeeper index 630a064..9f2a3fc 100755 --- a/.etckeeper +++ b/.etckeeper @@ -564,6 +564,12 @@ maybe chmod 0644 './crontab' maybe chmod 0644 './csh.env' maybe chgrp lp './cups' maybe chmod 0755 './cups' +maybe chgrp lp './cups/._cfg0000_cupsd.conf' +maybe chmod 0640 './cups/._cfg0000_cupsd.conf' +maybe chgrp lp './cups/._cfg0000_cupsd.conf.default' +maybe chmod 0640 './cups/._cfg0000_cupsd.conf.default' +maybe chgrp lp './cups/._cfg0000_snmp.conf' +maybe chmod 0640 './cups/._cfg0000_snmp.conf' maybe chmod 0644 './cups/client.conf' maybe chmod 0644 './cups/command.types' maybe chmod 0644 './cups/cups-pdf.conf' @@ -1052,6 +1058,7 @@ maybe chmod 0644 './imlib/im_palette-tiny.pal' maybe chmod 0644 './imlib/im_palette.pal' maybe chmod 0644 './imlib/imrc' maybe chmod 0755 './init.d' +maybe chmod 0755 './init.d/._cfg0000_cupsd' maybe chmod 0755 './init.d/NetworkManager' maybe chmod 0755 './init.d/acpid' maybe chmod 0755 './init.d/aiccu' diff --git a/cups/._cfg0000_cupsd.conf b/cups/._cfg0000_cupsd.conf new file mode 100644 index 0000000..ea8c061 --- /dev/null +++ b/cups/._cfg0000_cupsd.conf @@ -0,0 +1,141 @@ +# +# "$Id: cupsd.conf.in 9407 2010-12-09 21:24:51Z 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. +# We switch this off by default in Gentoo, to avoid an unnecessary open port. +Browsing Off +BrowseOrder allow,deny +BrowseAllow all +BrowseLocalProtocols CUPS dnssd + +# Default authentication type, when authentication is required... +DefaultAuthType Basic + +# Web interface setting... +WebInterface Yes + +# 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/subscription privacy... + JobPrivateAccess default + JobPrivateValues default + SubscriptionPrivateAccess default + SubscriptionPrivateValues default + + # 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/subscription privacy... + JobPrivateAccess default + JobPrivateValues default + SubscriptionPrivateAccess default + SubscriptionPrivateValues default + + # 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 9407 2010-12-09 21:24:51Z mike $". +# diff --git a/cups/._cfg0000_cupsd.conf.default b/cups/._cfg0000_cupsd.conf.default new file mode 100644 index 0000000..ea8c061 --- /dev/null +++ b/cups/._cfg0000_cupsd.conf.default @@ -0,0 +1,141 @@ +# +# "$Id: cupsd.conf.in 9407 2010-12-09 21:24:51Z 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. +# We switch this off by default in Gentoo, to avoid an unnecessary open port. +Browsing Off +BrowseOrder allow,deny +BrowseAllow all +BrowseLocalProtocols CUPS dnssd + +# Default authentication type, when authentication is required... +DefaultAuthType Basic + +# Web interface setting... +WebInterface Yes + +# 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/subscription privacy... + JobPrivateAccess default + JobPrivateValues default + SubscriptionPrivateAccess default + SubscriptionPrivateValues default + + # 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/subscription privacy... + JobPrivateAccess default + JobPrivateValues default + SubscriptionPrivateAccess default + SubscriptionPrivateValues default + + # 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 9407 2010-12-09 21:24:51Z mike $". +# diff --git a/cups/._cfg0000_snmp.conf b/cups/._cfg0000_snmp.conf new file mode 100644 index 0000000..5539d50 --- /dev/null +++ b/cups/._cfg0000_snmp.conf @@ -0,0 +1,13 @@ +# +# "$Id: snmp.conf.in 9045 2010-03-24 07:48:42Z mike $" +# +# 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: snmp.conf.in 9045 2010-03-24 07:48:42Z mike $". +# diff --git a/init.d/._cfg0000_cupsd b/init.d/._cfg0000_cupsd new file mode 100755 index 0000000..7ccc359 --- /dev/null +++ b/init.d/._cfg0000_cupsd @@ -0,0 +1,22 @@ +#!/sbin/runscript + +depend() { + use net + need avahi-daemon dbus + before nfs + after logger +} + +start() { + ebegin "Starting cupsd" + checkpath -q -d -m 0755 -o root:lp /var/run/cups + checkpath -q -d -m 0511 -o lp:lpadmin /var/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 $? +}