From: Frank Brehm Date: Thu, 1 Aug 2013 20:45:35 +0000 (+0200) Subject: Current state X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=c9269ecf21351454eda411fc6e66ef5a7c3ee5a6;p=config%2Fsamara%2Fetc.git Current state --- diff --git a/config-archive/etc/pam.d/login b/config-archive/etc/pam.d/login new file mode 100644 index 0000000..13abd27 --- /dev/null +++ b/config-archive/etc/pam.d/login @@ -0,0 +1,6 @@ +auth required pam_securetty.so +auth include system-local-login + +account include system-local-login +password include system-local-login +session include system-local-login diff --git a/config-archive/etc/pam.d/login.dist b/config-archive/etc/pam.d/login.dist new file mode 100644 index 0000000..787803d --- /dev/null +++ b/config-archive/etc/pam.d/login.dist @@ -0,0 +1,6 @@ +auth required pam_securetty.so +auth include system-local-login +account include system-local-login +password include system-local-login +session optional pam_lastlog.so +session include system-local-login diff --git a/config-archive/etc/pam.d/passwd b/config-archive/etc/pam.d/passwd new file mode 100644 index 0000000..960b32e --- /dev/null +++ b/config-archive/etc/pam.d/passwd @@ -0,0 +1,8 @@ +#%PAM-1.0 + +auth sufficient pam_rootok.so +auth include system-auth + +account include system-auth + +password include system-auth diff --git a/config-archive/etc/pam.d/passwd.dist b/config-archive/etc/pam.d/passwd.dist new file mode 100644 index 0000000..bcb5d2c --- /dev/null +++ b/config-archive/etc/pam.d/passwd.dist @@ -0,0 +1,4 @@ +auth sufficient pam_rootok.so +auth include system-auth +account include system-auth +password include system-auth diff --git a/config-archive/etc/pam.d/su b/config-archive/etc/pam.d/su new file mode 100644 index 0000000..d15c7ed --- /dev/null +++ b/config-archive/etc/pam.d/su @@ -0,0 +1,32 @@ +#%PAM-1.0 + +auth sufficient pam_rootok.so + +# If you want to restrict users begin allowed to su even more, +# create /etc/security/suauth.allow (or to that matter) that is only +# writable by root, and add users that are allowed to su to that +# file, one per line. +#auth required pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.allow + +# Uncomment this to allow users in the wheel group to su without +# entering a passwd. +#auth sufficient pam_wheel.so use_uid trust + +# Alternatively to above, you can implement a list of users that do +# not need to supply a passwd with a list. +#auth sufficient pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.nopass + +# Comment this to allow any user, even those not in the 'wheel' +# group to su +auth required pam_wheel.so use_uid + +auth include system-auth + +account include system-auth + +password include system-auth + +session include system-auth +session required pam_env.so +session optional pam_xauth.so + diff --git a/config-archive/etc/pam.d/su.dist b/config-archive/etc/pam.d/su.dist new file mode 100644 index 0000000..30c2834 --- /dev/null +++ b/config-archive/etc/pam.d/su.dist @@ -0,0 +1,8 @@ +auth sufficient pam_rootok.so +auth required pam_wheel.so use_uid +auth include system-auth +account include system-auth +password include system-auth +session include system-auth +session required pam_env.so +session optional pam_xauth.so diff --git a/cups/client.conf b/cups/client.conf index d6d639e..34395d3 100644 --- a/cups/client.conf +++ b/cups/client.conf @@ -1 +1 @@ -ServerName /var/run/cups/cups.sock +ServerName /run/cups/cups.sock diff --git a/cups/cups-browsed.conf b/cups/cups-browsed.conf new file mode 100644 index 0000000..57d2deb --- /dev/null +++ b/cups/cups-browsed.conf @@ -0,0 +1,26 @@ +# Which protocols will we use to discover printers on the network? +# Can use DNSSD and/or CUPS, or 'none' for neither. +BrowseRemoteProtocols DNSSD,CUPS + +# Which protocols will we use to broadcast shared local printers to the network? +# Can use DNSSD and/or CUPS, or 'none' for neither. +# Only CUPS is actually supported, as DNSSD is done by CUPS itself (we ignore +# DNSSD in this directive). +# BrowseLocalProtocols none + +# Settings of this directive apply to both BrowseRemoteProtocols and +# BrowseLocalProtocols. +# Can use DNSSD and/or CUPS, or 'none' for neither. +# BrowseProtocols none + +# Only browse remote printers from selected servers +# BrowseAllow cups.example.com +# BrowseAllow 192.168.1.12 +# BrowseAllow 192.168.1.0/24 +# BrowseAllow 192.168.1.0/255.255.255.0 + +# Use BrowsePoll to poll a particular CUPS server +# BrowsePoll cups.example.com +# BrowsePoll cups.example.com:631 + +# Unknown directives are ignored, also unknown values. diff --git a/cups/cups-files.conf b/cups/cups-files.conf new file mode 100644 index 0000000..9edfd39 --- /dev/null +++ b/cups/cups-files.conf @@ -0,0 +1,98 @@ +# +# "$Id: cups-files.conf.in 10765 2012-12-13 20:36:17Z mike $" +# +# 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 config + +# 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... +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 + +# 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 certificate for the scheduler... +#ServerCertificate ssl/server.crt + +# SSL/TLS private key for the scheduler... +#ServerKey ssl/server.key + +# 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 + +# +# End of "$Id: cups-files.conf.in 10765 2012-12-13 20:36:17Z mike $". +# diff --git a/cups/cupsd.conf b/cups/cupsd.conf index ea8c061..43b2eae 100644 --- a/cups/cupsd.conf +++ b/cups/cupsd.conf @@ -1,5 +1,5 @@ # -# "$Id: cupsd.conf.in 9407 2010-12-09 21:24:51Z mike $" +# "$Id: cupsd.conf.in 10710 2012-11-26 18:26:01Z mike $" # # Sample configuration file for the CUPS scheduler. See "man cupsd.conf" for a # complete description of this file. @@ -9,20 +9,13 @@ # 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 +Listen /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 +Browsing On +BrowseLocalProtocols dnssd # Default authentication type, when authentication is required... DefaultAuthType Basic @@ -137,5 +130,5 @@ WebInterface Yes # -# End of "$Id: cupsd.conf.in 9407 2010-12-09 21:24:51Z mike $". +# End of "$Id: cupsd.conf.in 10710 2012-11-26 18:26:01Z mike $". # diff --git a/cups/cupsd.conf.default b/cups/cupsd.conf.default deleted file mode 100644 index ea8c061..0000000 --- a/cups/cupsd.conf.default +++ /dev/null @@ -1,141 +0,0 @@ -# -# "$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/printers.conf b/cups/printers.conf index 19a45b8..a72c93f 100644 --- a/cups/printers.conf +++ b/cups/printers.conf @@ -1,5 +1,5 @@ -# Printer configuration file for CUPS v1.5.2 -# Written by cupsd on 2013-06-21 09:47 +# Printer configuration file for CUPS v1.6.2 +# Written by cupsd on 2013-07-08 15:15 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING UUID urn:uuid:6320fcff-05cc-3168-6d1c-8306a28977be diff --git a/cups/printers.conf.O b/cups/printers.conf.O index 4e2d938..19a45b8 100644 --- a/cups/printers.conf.O +++ b/cups/printers.conf.O @@ -1,5 +1,5 @@ # Printer configuration file for CUPS v1.5.2 -# Written by cupsd on 2013-06-21 09:46 +# Written by cupsd on 2013-06-21 09:47 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING UUID urn:uuid:6320fcff-05cc-3168-6d1c-8306a28977be @@ -8,7 +8,7 @@ Location Office RI MakeModel Dell S2500 Foomatic/Postscript (recommended) DeviceURI socket://192.168.49.5 State Idle -StateTime 1371800794 +StateTime 1371800841 Type 8433684 Accepting Yes Shared No @@ -22,5 +22,5 @@ Attribute marker-colors \#000000,none,none Attribute marker-levels 300,99,-1 Attribute marker-names Black Toner,Fuser,Maintenance Kit Attribute marker-types toner,other,other -Attribute marker-change-time 1371800813 +Attribute marker-change-time 1371800841 diff --git a/dbus-1/system.d/org.kde.polkitkde1.helper.conf b/dbus-1/system.d/org.kde.polkitkde1.helper.conf deleted file mode 100644 index baa69a9..0000000 --- a/dbus-1/system.d/org.kde.polkitkde1.helper.conf +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/env.d/99polkit-kde b/env.d/99polkit-kde deleted file mode 100644 index d6646ad..0000000 --- a/env.d/99polkit-kde +++ /dev/null @@ -1 +0,0 @@ -CONFIG_PROTECT="/usr/share/polkit-1/actions" diff --git a/fonts/conf.avail/99pdftoopvp.conf b/fonts/conf.avail/99pdftoopvp.conf new file mode 100644 index 0000000..2737e17 --- /dev/null +++ b/fonts/conf.avail/99pdftoopvp.conf @@ -0,0 +1,18 @@ + + + + + + + ZapfDingbats + + Dingbats + + + + Symbol + + Standard Symbols L + + + diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml index a1050be..ee4be3a 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -1574,52 +1574,53 @@ - - - + + + - - - - - - + + + + + + + - - - - - + + + + + - - - - + + + + - + - - - + + + - + - - - - + + + + - - - - + + + + @@ -12371,56 +12372,62 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Default manager window width - + Default manager window height - + Show system tray icon while app is running - + + + + Whether we require a confirmation on deleting storage + + + Whether we ask the user to apply or discard unapplied device changes - + Whether we require confirmation to start or stop a libvirt virtual interface - + Whether we require confirmation to remove a virtual device - + Whether we require confirmation to pause a VM - + Whether we require confirmation to poweroff/reboot a VM - + Whether we require confirmation to forcepoweroff a VM @@ -12428,7 +12435,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + @@ -12436,7 +12443,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Default path for saving screenshots from VMs - + @@ -12444,7 +12451,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Default path for stored VM snapshots - + @@ -12452,7 +12459,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Default path for saving VM snapshots - + @@ -12460,7 +12467,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Default path for choosing media - + @@ -12470,7 +12477,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + default @@ -12478,7 +12485,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Use selected format when creating new disk images in new VM wizard - + vnc @@ -12486,13 +12493,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Install selected graphics type for new VM. vnc or spice - + Whether to install a sound device for remote VMs or not - + Whether to install a sound device for local VMs or not @@ -12500,7 +12507,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Whether to show toolbar containing Virtual Machine action buttons (such as Run, Pause, Shutdown) in the details display @@ -12508,19 +12515,19 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + When to scale the VM graphical console. 0 = never, 1 = only when in full screen mode, 2 = Always - + Whether to show the notification hint when grabbing the mouse in the console - + Whether to enable menu accelerators while connected to the guest graphical console. @@ -12528,7 +12535,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + The number of urls to keep in the history for the install media address page. @@ -12536,25 +12543,25 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Whether or not the app will poll VM network i/o statistics - + Whether or not the app will poll VM disk i/o statistics - + The number of samples to keep in the statistics history - + The statistics update interval in seconds @@ -12562,25 +12569,25 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + Show the host cpu usage field in the domain list summary view - + Show the guest cpu usage field in the domain list summary view - + Show the network I/O field in the domain list summary view - + Show the disk I/O field in the domain list summary view @@ -16857,13 +16864,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -16873,13 +16878,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -16889,13 +16892,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18593,13 +18594,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18609,13 +18608,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18625,13 +18622,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18641,13 +18636,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18657,13 +18650,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18673,13 +18664,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18689,13 +18678,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18705,13 +18692,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18721,13 +18706,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18737,13 +18720,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18753,13 +18734,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18769,13 +18748,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18785,13 +18762,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18801,13 +18776,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18817,13 +18790,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18833,13 +18804,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18849,13 +18818,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - @@ -18865,13 +18832,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati /usr/bin/ufraw-batch --embedded-image --out-type=png --size=%s %i --overwrite --silent --output=%o - - diff --git a/gconf/schemas/virt-manager.schemas b/gconf/schemas/virt-manager.schemas index 53a7cae..1a69dfa 100644 --- a/gconf/schemas/virt-manager.schemas +++ b/gconf/schemas/virt-manager.schemas @@ -377,6 +377,19 @@ + + /schemas/apps/virt-manager/confirm/delete_storage + /apps/virt-manager/confirm/delete_storage + virt-manager + bool + 1 + + + Confirm deleting storage + Whether we require a confirmation on deleting storage + + + /schemas/apps/virt-manager/manager_window_height /apps/virt-manager/manager_window_height diff --git a/init.d/cups-browsed b/init.d/cups-browsed new file mode 100755 index 0000000..785c13a --- /dev/null +++ b/init.d/cups-browsed @@ -0,0 +1,20 @@ +#!/sbin/runscript + +PIDFILE=/var/run/cups-browsed.pid + +depend() { + need cupsd avahi-daemon +} + +start() { + ebegin "Starting cups-browsed" + start-stop-daemon --start --make-pidfile --pidfile "${PIDFILE}" \ + --background --quiet --exec /usr/sbin/cups-browsed + eend $? +} + +stop() { + ebegin "Stopping cups-browsed" + start-stop-daemon --stop --pidfile "${PIDFILE}" --quiet --exec /usr/sbin/cupsd + eend $? +} diff --git a/init.d/cupsd b/init.d/cupsd index 7ccc359..9edc253 100755 --- a/init.d/cupsd +++ b/init.d/cupsd @@ -9,8 +9,8 @@ depend() { 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 + 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 $? } diff --git a/init.d/udev b/init.d/udev index 8f07d8f..0e9abfe 100755 --- a/init.d/udev +++ b/init.d/udev @@ -90,7 +90,7 @@ start_udevmonitor() einfo "udev: Running udevadm monitor ${udev_monitor_opts} to log all events" start-stop-daemon --start --stdout "${udevmonitor_log}" \ --make-pidfile --pidfile "${udevmonitor_pid}" \ - --background --exec /sbin/udevadm -- monitor ${udev_monitor_opts} + --background --exec /bin/udevadm -- monitor ${udev_monitor_opts} } populate_dev() @@ -105,6 +105,7 @@ populate_dev() if ! yesno ${rc_coldplug:-${RC_COLDPLUG:-yes}}; then einfo "Setting /dev permissions and symbolic links" udevadm trigger --attr-match=dev --action=add + udevadm trigger --subsystem-match=net --action=add ewarn "Skipping udev coldplug sequence" return 0 fi @@ -128,7 +129,7 @@ stop_udevmonitor() ewarn "udev: udevmonitor is still running and writing into ${udevmonitor_log}" else einfo "udev: Stopping udevmonitor: Log is in ${udevmonitor_log}" - start-stop-daemon --stop --pidfile "${udevmonitor_pid}" --exec /sbin/udevadm + start-stop-daemon --stop --pidfile "${udevmonitor_pid}" --exec /bin/udevadm fi } diff --git a/login.defs b/login.defs index e99404c..d0bf19d 100644 --- a/login.defs +++ b/login.defs @@ -1,7 +1,7 @@ # # /etc/login.defs - Configuration control definitions for the shadow package. # -# $Id: login.defs 3038 2009-07-23 20:41:35Z nekral-guest $ +# $Id: login.defs 3189 2010-03-26 11:53:06Z nekral-guest $ # # @@ -183,7 +183,8 @@ ERASECHAR 0177 KILLCHAR 025 #ULIMIT 2097152 -# Default initial "umask" value for non-PAM enabled systems. +# Default initial "umask" value used by login on non-PAM enabled systems. +# Default "umask" value for pam_umask on PAM enabled systems. # UMASK is also used by useradd and newusers to set the mode of new home # directories. # 022 is the default value, but 027, or even 077, could be considered diff --git a/nanorc b/nanorc index 746ccf2..1124f97 100644 --- a/nanorc +++ b/nanorc @@ -56,6 +56,11 @@ ## Enable ~/.nano_history for saving and reading search/replace strings. # set historylog +## Enable vim-style lock-files. This is just to let a vim user know you +## are editing a file [s]he is trying to edit and vice versa. There are +## no plans to implement vim-style undo state in these files +# set locking + ## The opening and closing brackets that can be found by bracket ## searches. They cannot contain blank characters. The former set must ## come before the latter set, and both must be in the same order. diff --git a/pam.d/kde b/pam.d/kde index 5dde130..24d19de 100644 --- a/pam.d/kde +++ b/pam.d/kde @@ -1,10 +1,11 @@ #%PAM-1.0 auth required pam_nologin.so -auth include system-auth -account include system-auth +auth include system-local-login -password include system-auth +account include system-local-login -session include system-auth +password include system-local-login + +session include system-local-login diff --git a/pam.d/kde-np b/pam.d/kde-np index 5e4f503..f5499e6 100644 --- a/pam.d/kde-np +++ b/pam.d/kde-np @@ -3,8 +3,8 @@ auth required pam_nologin.so auth required pam_permit.so -account include system-auth +account include system-local-login -password include system-auth +password include system-local-login -session include system-auth +session include system-local-login diff --git a/pam.d/login b/pam.d/login index 13abd27..787803d 100644 --- a/pam.d/login +++ b/pam.d/login @@ -1,6 +1,6 @@ auth required pam_securetty.so auth include system-local-login - account include system-local-login password include system-local-login +session optional pam_lastlog.so session include system-local-login diff --git a/pam.d/newusers b/pam.d/newusers index 743b2f0..960b32e 100644 --- a/pam.d/newusers +++ b/pam.d/newusers @@ -1,8 +1,8 @@ -#%PAM-1.0 +#%PAM-1.0 -auth sufficient pam_rootok.so -auth required pam_permit.so +auth sufficient pam_rootok.so +auth include system-auth -account include system-auth +account include system-auth -password required pam_permit.so +password include system-auth diff --git a/pam.d/passwd b/pam.d/passwd index 960b32e..bcb5d2c 100644 --- a/pam.d/passwd +++ b/pam.d/passwd @@ -1,8 +1,4 @@ -#%PAM-1.0 - auth sufficient pam_rootok.so auth include system-auth - account include system-auth - password include system-auth diff --git a/pam.d/su b/pam.d/su index d15c7ed..30c2834 100644 --- a/pam.d/su +++ b/pam.d/su @@ -1,32 +1,8 @@ -#%PAM-1.0 - auth sufficient pam_rootok.so - -# If you want to restrict users begin allowed to su even more, -# create /etc/security/suauth.allow (or to that matter) that is only -# writable by root, and add users that are allowed to su to that -# file, one per line. -#auth required pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.allow - -# Uncomment this to allow users in the wheel group to su without -# entering a passwd. -#auth sufficient pam_wheel.so use_uid trust - -# Alternatively to above, you can implement a list of users that do -# not need to supply a passwd with a list. -#auth sufficient pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.nopass - -# Comment this to allow any user, even those not in the 'wheel' -# group to su auth required pam_wheel.so use_uid - auth include system-auth - account include system-auth - password include system-auth - session include system-auth session required pam_env.so session optional pam_xauth.so - diff --git a/pam.d/system-login b/pam.d/system-login index 2345bb0..f5861f0 100644 --- a/pam.d/system-login +++ b/pam.d/system-login @@ -14,9 +14,9 @@ password optional pam_gnome_keyring.so session optional pam_loginuid.so session required pam_env.so -session optional pam_lastlog.so +session optional pam_lastlog.so silent session include system-auth -session optional pam_ck_connector.so nox11 +-session optional pam_ck_connector.so nox11 session optional pam_gnome_keyring.so auto_start session optional pam_motd.so motd=/etc/motd session optional pam_mail.so diff --git a/sandbox.conf b/sandbox.conf index 6ad1c15..dc460f0 100644 --- a/sandbox.conf +++ b/sandbox.conf @@ -22,12 +22,6 @@ # operations caught by sandbox. Default is "no" #SANDBOX_DEBUG="no" -# SANDBOX_BEEP -# -# The amount of beeps sandbox will issue when it exits with access violations -# after printing the normal log. Default is "3" -#SANDBOX_BEEP=3 - # NOCOLOR # # Determine the use of color in the output. Default is "false" (ie, use color) diff --git a/vim/vimrc.local b/vim/vimrc.local index 9ddb9e1..6278ad9 100644 --- a/vim/vimrc.local +++ b/vim/vimrc.local @@ -6,6 +6,8 @@ set modeline set showmatch set ignorecase +set list listchars=tab:»·,trail:· + if has("multi_byte") set encoding=utf-8 setglobal fileencoding=utf-8