From c5d07d98bb1ee98a2b2a454eabccc349940c45de Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Sun, 18 May 2014 10:42:21 +0200 Subject: [PATCH] Current state --- ImageMagick-6/delegates.xml | 2 +- apache2/modules.d/00_apache_manual.conf | 4 +- apache2/modules.d/80_mod_dnssd.conf | 6 + bluetooth/bluetooth.conf | 1 + conf.d/rfcomm | 5 - config-archive/etc/logrotate.d/syslog-ng | 35 + config-archive/etc/logrotate.d/syslog-ng.dist | 13 + config-archive/etc/postfix/main.cf | 4 +- config-archive/etc/postfix/main.cf.1 | 4 +- config-archive/etc/postfix/main.cf.2 | 4 +- config-archive/etc/postfix/main.cf.3 | 6 +- config-archive/etc/postfix/main.cf.4 | 4 +- config-archive/etc/postfix/main.cf.5 | 13 +- config-archive/etc/postfix/main.cf.6 | 4 +- config-archive/etc/postfix/main.cf.7 | 2 +- config-archive/etc/postfix/main.cf.8 | 692 ++++++++++++++++++ config-archive/etc/postfix/main.cf.dist | 4 +- config-archive/etc/ssh/sshd_config.4 | 199 +++++ cups/cups-browsed.conf | 20 + cups/printers.conf | 2 +- davfs2/davfs2.conf | 77 ++ davfs2/secrets | 70 ++ dbus-1/system.d/bluetooth.conf | 1 + .../org.freedesktop.ModemManager1.conf | 7 + .../system.d/org.kde.kcontrol.kcmkwallet.conf | 11 + etckeeper/pre-commit.d/30store-metadata | 2 +- etckeeper/update-ignore.d/01update-ignore | 2 +- fstab | 7 +- gimp/2.0/gimprc | 2 +- group | 1 + group- | 1 + gshadow | 1 + gshadow- | 1 + gtk-2.0/i686-pc-linux-gnu/gtk.immodules | 5 +- hosts.allow | 17 + hotplug/usb/libsane.usermap | 2 +- init.d/apache2 | 15 +- init.d/git-daemon | 29 +- init.d/net.lo | 2 +- init.d/rfcomm | 27 - libvirt/libvirtd.conf | 40 +- libvirt/qemu.conf | 24 +- libvirt/virtlockd.conf | 10 +- logrotate.d/syslog-ng | 2 +- pango/i686-pc-linux-gnu/pango.modules | 45 +- portage/package.keywords | 2 + postfix/main.cf | 4 +- resolv.conf | 10 +- revdep-rebuild/10firefox | 1 + revdep-rebuild/61-oracle-jdk-bin-1.7 | 2 +- revdep-rebuild/61-oracle-jre-bin-1.7 | 2 +- runlevels/default/radvd | 1 - sane.d/canon_pp.conf | 36 - sane.d/hpsj5s.conf | 2 - sane.d/mustek_pp.conf | 103 --- ssh/ssh_host_ed25519_key | 7 + ssh/ssh_host_ed25519_key.pub | 1 + sysconfig/libvirtd | 11 +- updatedb.conf | 4 +- .../gnome-user-share-obexpush.desktop | 21 + xdg/autostart/gnome-user-share-webdav.desktop | 21 + xml/catalog | 2 +- 62 files changed, 1341 insertions(+), 314 deletions(-) create mode 100644 apache2/modules.d/80_mod_dnssd.conf delete mode 100644 conf.d/rfcomm create mode 100644 config-archive/etc/logrotate.d/syslog-ng create mode 100644 config-archive/etc/logrotate.d/syslog-ng.dist create mode 100644 config-archive/etc/postfix/main.cf.8 create mode 100644 config-archive/etc/ssh/sshd_config.4 create mode 100644 davfs2/davfs2.conf create mode 100644 davfs2/secrets create mode 100644 dbus-1/system.d/org.kde.kcontrol.kcmkwallet.conf create mode 100644 hosts.allow delete mode 100755 init.d/rfcomm create mode 100644 revdep-rebuild/10firefox delete mode 120000 runlevels/default/radvd delete mode 100644 sane.d/canon_pp.conf delete mode 100644 sane.d/hpsj5s.conf delete mode 100644 sane.d/mustek_pp.conf create mode 100644 ssh/ssh_host_ed25519_key create mode 100644 ssh/ssh_host_ed25519_key.pub create mode 100644 xdg/autostart/gnome-user-share-obexpush.desktop create mode 100644 xdg/autostart/gnome-user-share-webdav.desktop diff --git a/ImageMagick-6/delegates.xml b/ImageMagick-6/delegates.xml index 035f4ccd..77d1ae6b 100644 --- a/ImageMagick-6/delegates.xml +++ b/ImageMagick-6/delegates.xml @@ -87,7 +87,7 @@ - + diff --git a/apache2/modules.d/00_apache_manual.conf b/apache2/modules.d/00_apache_manual.conf index d1f11402..4f6ae4fb 100644 --- a/apache2/modules.d/00_apache_manual.conf +++ b/apache2/modules.d/00_apache_manual.conf @@ -3,9 +3,9 @@ # The documentation is always available at # http://httpd.apache.org/docs/2.2/ -AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.25/manual$1" +AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.27/manual$1" - + Options Indexes AllowOverride None Order allow,deny diff --git a/apache2/modules.d/80_mod_dnssd.conf b/apache2/modules.d/80_mod_dnssd.conf new file mode 100644 index 00000000..1c67f7e8 --- /dev/null +++ b/apache2/modules.d/80_mod_dnssd.conf @@ -0,0 +1,6 @@ + +LoadModule dnssd_module modules/mod_dnssd.so +DNSSDEnable on + + +# vim: ts=4 filetype=apache diff --git a/bluetooth/bluetooth.conf b/bluetooth/bluetooth.conf index 81c51011..0ae606ee 100644 --- a/bluetooth/bluetooth.conf +++ b/bluetooth/bluetooth.conf @@ -18,6 +18,7 @@ + diff --git a/conf.d/rfcomm b/conf.d/rfcomm deleted file mode 100644 index d87acdb2..00000000 --- a/conf.d/rfcomm +++ /dev/null @@ -1,5 +0,0 @@ -# Bind rfcomm devices (allowed values are "true" and "false") -RFCOMM_ENABLE=true - -# Config file for rfcomm -RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" diff --git a/config-archive/etc/logrotate.d/syslog-ng b/config-archive/etc/logrotate.d/syslog-ng new file mode 100644 index 00000000..49cc62ec --- /dev/null +++ b/config-archive/etc/logrotate.d/syslog-ng @@ -0,0 +1,35 @@ +# $Header: /etc/logrotate.d/.rcs/syslog-ng,v 1.1 2009/01/27 21:03:59 root Exp $ +# +# Syslog-ng logrotate snippet for Gentoo Linux +# contributed by Michael Sterrett +# + +script syslog-reload + /etc/init.d/syslog-ng reload >/dev/null || true +endscript + +rotate 10 + +/var/log/messages { + daily + olddir /var/log/old/%Y-%m + size 1024K + postrotate syslog-reload +} + +/var/log/all /var/log/debug /var/log/syslog { + daily + olddir /var/log/old/%Y-%m + size 4M + maxage 6m + postrotate syslog-reload +} + +/var/log/syslog.d/* { + daily + olddir /var/log/syslog.d/old/%Y-%m + size 1024K + maxage 1y + postrotate syslog-reload +} + diff --git a/config-archive/etc/logrotate.d/syslog-ng.dist b/config-archive/etc/logrotate.d/syslog-ng.dist new file mode 100644 index 00000000..1c67d90e --- /dev/null +++ b/config-archive/etc/logrotate.d/syslog-ng.dist @@ -0,0 +1,13 @@ +# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.logrotate.in,v 1.1 2014/01/22 04:25:35 mr_bones_ Exp $ +# +# Syslog-ng logrotate snippet for Gentoo Linux +# contributed by Michael Sterrett +# + +/var/log/messages { + missingok + sharedscripts + postrotate + systemctl kill -s HUP syslog-ng > /dev/null 2>&1 || true + endscript +} diff --git a/config-archive/etc/postfix/main.cf b/config-archive/etc/postfix/main.cf index f7e2a6a6..0436c1c4 100644 --- a/config-archive/etc/postfix/main.cf +++ b/config-archive/etc/postfix/main.cf @@ -645,7 +645,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.10.1/html +html_directory = /usr/share/doc/postfix-2.10.2/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -658,7 +658,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-2.10.1/readme +readme_directory = /usr/share/doc/postfix-2.10.2/readme home_mailbox = .maildir/ smtpd_sasl_auth_enable = yes diff --git a/config-archive/etc/postfix/main.cf.1 b/config-archive/etc/postfix/main.cf.1 index 1232f478..f7e2a6a6 100644 --- a/config-archive/etc/postfix/main.cf.1 +++ b/config-archive/etc/postfix/main.cf.1 @@ -645,7 +645,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.10.0/html +html_directory = /usr/share/doc/postfix-2.10.1/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -658,7 +658,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-2.10.0/readme +readme_directory = /usr/share/doc/postfix-2.10.1/readme home_mailbox = .maildir/ smtpd_sasl_auth_enable = yes diff --git a/config-archive/etc/postfix/main.cf.2 b/config-archive/etc/postfix/main.cf.2 index c438ed09..1232f478 100644 --- a/config-archive/etc/postfix/main.cf.2 +++ b/config-archive/etc/postfix/main.cf.2 @@ -645,7 +645,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.9.5/html +html_directory = /usr/share/doc/postfix-2.10.0/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -658,7 +658,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-2.9.5/readme +readme_directory = /usr/share/doc/postfix-2.10.0/readme home_mailbox = .maildir/ smtpd_sasl_auth_enable = yes diff --git a/config-archive/etc/postfix/main.cf.3 b/config-archive/etc/postfix/main.cf.3 index c1606d6e..c438ed09 100644 --- a/config-archive/etc/postfix/main.cf.3 +++ b/config-archive/etc/postfix/main.cf.3 @@ -645,7 +645,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.9.4/html +html_directory = /usr/share/doc/postfix-2.9.5/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -658,11 +658,11 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-2.9.4/readme +readme_directory = /usr/share/doc/postfix-2.9.5/readme home_mailbox = .maildir/ smtpd_sasl_auth_enable = yes -smtpd_sasl2_auth_enable = yes +#smtpd_sasl2_auth_enable = yes smtpd_sasl_security_options = noanonymous broken_sasl_auth_clients = yes smtpd_sasl_local_domain = $myhostname diff --git a/config-archive/etc/postfix/main.cf.4 b/config-archive/etc/postfix/main.cf.4 index 22ce4373..c1606d6e 100644 --- a/config-archive/etc/postfix/main.cf.4 +++ b/config-archive/etc/postfix/main.cf.4 @@ -645,7 +645,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.9.3/html +html_directory = /usr/share/doc/postfix-2.9.4/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -658,7 +658,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-2.9.3/readme +readme_directory = /usr/share/doc/postfix-2.9.4/readme home_mailbox = .maildir/ smtpd_sasl_auth_enable = yes diff --git a/config-archive/etc/postfix/main.cf.5 b/config-archive/etc/postfix/main.cf.5 index 03fb0bfa..22ce4373 100644 --- a/config-archive/etc/postfix/main.cf.5 +++ b/config-archive/etc/postfix/main.cf.5 @@ -39,7 +39,7 @@ command_directory = /usr/sbin # daemon programs (i.e. programs listed in the master.cf file). This # directory must be owned by root. # -daemon_directory = /usr/lib64/postfix +daemon_directory = /usr/libexec/postfix # The data_directory parameter specifies the location of Postfix-writable # data files (caches, random numbers). This directory must be owned @@ -463,7 +463,12 @@ mynetworks = 10.12.11.0/24, 127.0.0.0/8, [::1]/128, [2001:6f8:1db7::]/64 # the main.cf file, otherwise the SMTP server will reject mail for # non-UNIX accounts with "User unknown in local recipient table". # -#mailbox_transport = lmtp:unix:/file/name +# Cyrus IMAP over LMTP. Specify ``lmtpunix cmd="lmtpd" +# listen="/var/imap/socket/lmtp" prefork=0'' in cyrus.conf. +#mailbox_transport = lmtp:unix:/var/imap/socket/lmtp +# +# Cyrus IMAP via command line. Uncomment the "cyrus...pipe" and +# subsequent line in master.cf. #mailbox_transport = cyrus # The fallback_transport specifies the optional transport in master.cf @@ -640,7 +645,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.8.9/html +html_directory = /usr/share/doc/postfix-2.9.3/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -653,7 +658,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-2.8.9/readme +readme_directory = /usr/share/doc/postfix-2.9.3/readme home_mailbox = .maildir/ smtpd_sasl_auth_enable = yes diff --git a/config-archive/etc/postfix/main.cf.6 b/config-archive/etc/postfix/main.cf.6 index 76d1551d..03fb0bfa 100644 --- a/config-archive/etc/postfix/main.cf.6 +++ b/config-archive/etc/postfix/main.cf.6 @@ -640,7 +640,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.8.7/html +html_directory = /usr/share/doc/postfix-2.8.9/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -653,7 +653,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-2.8.7/readme +readme_directory = /usr/share/doc/postfix-2.8.9/readme home_mailbox = .maildir/ smtpd_sasl_auth_enable = yes diff --git a/config-archive/etc/postfix/main.cf.7 b/config-archive/etc/postfix/main.cf.7 index dba4ff00..76d1551d 100644 --- a/config-archive/etc/postfix/main.cf.7 +++ b/config-archive/etc/postfix/main.cf.7 @@ -264,7 +264,7 @@ unknown_local_recipient_reject_code = 550 #mynetworks = 168.100.189.0/28, 127.0.0.0/8 #mynetworks = $config_directory/mynetworks #mynetworks = hash:/etc/postfix/network_table -mynetworks = 10.12.11.0/24 +mynetworks = 10.12.11.0/24, 127.0.0.0/8, [::1]/128, [2001:6f8:1db7::]/64 # The relay_domains parameter restricts what destinations this system will # relay mail to. See the smtpd_recipient_restrictions description in diff --git a/config-archive/etc/postfix/main.cf.8 b/config-archive/etc/postfix/main.cf.8 new file mode 100644 index 00000000..dba4ff00 --- /dev/null +++ b/config-archive/etc/postfix/main.cf.8 @@ -0,0 +1,692 @@ +# Global Postfix configuration file. This file lists only a subset +# of all parameters. For the syntax, and for a complete parameter +# list, see the postconf(5) manual page (command: "man 5 postconf"). +# +# For common configuration examples, see BASIC_CONFIGURATION_README +# and STANDARD_CONFIGURATION_README. To find these documents, use +# the command "postconf html_directory readme_directory", or go to +# http://www.postfix.org/. +# +# For best results, change no more than 2-3 parameters at a time, +# and test if Postfix still works after every change. + +# SOFT BOUNCE +# +# The soft_bounce parameter provides a limited safety net for +# testing. When soft_bounce is enabled, mail will remain queued that +# would otherwise bounce. This parameter disables locally-generated +# bounces, and prevents the SMTP server from rejecting mail permanently +# (by changing 5xx replies into 4xx replies). However, soft_bounce +# is no cure for address rewriting mistakes or mail routing mistakes. +# +#soft_bounce = no + +# LOCAL PATHNAME INFORMATION +# +# The queue_directory specifies the location of the Postfix queue. +# This is also the root directory of Postfix daemons that run chrooted. +# See the files in examples/chroot-setup for setting up Postfix chroot +# environments on different UNIX systems. +# +queue_directory = /var/spool/postfix + +# The command_directory parameter specifies the location of all +# postXXX commands. +# +command_directory = /usr/sbin + +# The daemon_directory parameter specifies the location of all Postfix +# daemon programs (i.e. programs listed in the master.cf file). This +# directory must be owned by root. +# +daemon_directory = /usr/lib64/postfix + +# The data_directory parameter specifies the location of Postfix-writable +# data files (caches, random numbers). This directory must be owned +# by the mail_owner account (see below). +# +data_directory = /var/lib/postfix + +# QUEUE AND PROCESS OWNERSHIP +# +# The mail_owner parameter specifies the owner of the Postfix queue +# and of most Postfix daemon processes. Specify the name of a user +# account THAT DOES NOT SHARE ITS USER OR GROUP ID WITH OTHER ACCOUNTS +# AND THAT OWNS NO OTHER FILES OR PROCESSES ON THE SYSTEM. In +# particular, don't specify nobody or daemon. PLEASE USE A DEDICATED +# USER. +# +mail_owner = postfix + +# The default_privs parameter specifies the default rights used by +# the local delivery agent for delivery to external file or command. +# These rights are used in the absence of a recipient user context. +# DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER. +# +#default_privs = nobody + +# INTERNET HOST AND DOMAIN NAMES +# +# The myhostname parameter specifies the internet hostname of this +# mail system. The default is to use the fully-qualified domain name +# from gethostname(). $myhostname is used as a default value for many +# other configuration parameters. +# +#myhostname = host.domain.tld +#myhostname = virtual.domain.tld +myhostname = bruni.home.brehm-online.com + +# The mydomain parameter specifies the local internet domain name. +# The default is to use $myhostname minus the first component. +# $mydomain is used as a default value for many other configuration +# parameters. +# +#mydomain = domain.tld +mydomain = home.brehm-online.com + +# SENDING MAIL +# +# The myorigin parameter specifies the domain that locally-posted +# mail appears to come from. The default is to append $myhostname, +# which is fine for small sites. If you run a domain with multiple +# machines, you should (1) change this to $mydomain and (2) set up +# a domain-wide alias database that aliases each user to +# user@that.users.mailhost. +# +# For the sake of consistency between sender and recipient addresses, +# myorigin also specifies the default domain name that is appended +# to recipient addresses that have no @domain part. +# +#myorigin = $myhostname +#myorigin = $mydomain +myorigin = brehm-online.com + +# RECEIVING MAIL + +# The inet_interfaces parameter specifies the network interface +# addresses that this mail system receives mail on. By default, +# the software claims all active interfaces on the machine. The +# parameter also controls delivery of mail to user@[ip.address]. +# +# See also the proxy_interfaces parameter, for network addresses that +# are forwarded to us via a proxy or network address translator. +# +# Note: you need to stop/start Postfix when this parameter changes. +# +#inet_interfaces = all +#inet_interfaces = $myhostname +#inet_interfaces = $myhostname, localhost +inet_interfaces = 10.12.11.2, localhost + +# The proxy_interfaces parameter specifies the network interface +# addresses that this mail system receives mail on by way of a +# proxy or network address translation unit. This setting extends +# the address list specified with the inet_interfaces parameter. +# +# You must specify your proxy/NAT addresses when your system is a +# backup MX host for other domains, otherwise mail delivery loops +# will happen when the primary MX host is down. +# +#proxy_interfaces = +#proxy_interfaces = 1.2.3.4 + +# The mydestination parameter specifies the list of domains that this +# machine considers itself the final destination for. +# +# These domains are routed to the delivery agent specified with the +# local_transport parameter setting. By default, that is the UNIX +# compatible delivery agent that lookups all recipients in /etc/passwd +# and /etc/aliases or their equivalent. +# +# The default is $myhostname + localhost.$mydomain. On a mail domain +# gateway, you should also include $mydomain. +# +# Do not specify the names of virtual domains - those domains are +# specified elsewhere (see VIRTUAL_README). +# +# Do not specify the names of domains that this machine is backup MX +# host for. Specify those names via the relay_domains settings for +# the SMTP server, or use permit_mx_backup if you are lazy (see +# STANDARD_CONFIGURATION_README). +# +# The local machine is always the final destination for mail addressed +# to user@[the.net.work.address] of an interface that the mail system +# receives mail on (see the inet_interfaces parameter). +# +# Specify a list of host or domain names, /file/name or type:table +# patterns, separated by commas and/or whitespace. A /file/name +# pattern is replaced by its contents; a type:table is matched when +# a name matches a lookup key (the right-hand side is ignored). +# Continue long lines by starting the next line with whitespace. +# +# See also below, section "REJECTING MAIL FOR UNKNOWN LOCAL USERS". +# +#mydestination = $myhostname, localhost.$mydomain, localhost +#mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain +#mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain, +# mail.$mydomain, www.$mydomain, ftp.$mydomain + +# REJECTING MAIL FOR UNKNOWN LOCAL USERS +# +# The local_recipient_maps parameter specifies optional lookup tables +# with all names or addresses of users that are local with respect +# to $mydestination, $inet_interfaces or $proxy_interfaces. +# +# If this parameter is defined, then the SMTP server will reject +# mail for unknown local users. This parameter is defined by default. +# +# To turn off local recipient checking in the SMTP server, specify +# local_recipient_maps = (i.e. empty). +# +# The default setting assumes that you use the default Postfix local +# delivery agent for local delivery. You need to update the +# local_recipient_maps setting if: +# +# - You define $mydestination domain recipients in files other than +# /etc/passwd, /etc/aliases, or the $virtual_alias_maps files. +# For example, you define $mydestination domain recipients in +# the $virtual_mailbox_maps files. +# +# - You redefine the local delivery agent in master.cf. +# +# - You redefine the "local_transport" setting in main.cf. +# +# - You use the "luser_relay", "mailbox_transport", or "fallback_transport" +# feature of the Postfix local delivery agent (see local(8)). +# +# Details are described in the LOCAL_RECIPIENT_README file. +# +# Beware: if the Postfix SMTP server runs chrooted, you probably have +# to access the passwd file via the proxymap service, in order to +# overcome chroot restrictions. The alternative, having a copy of +# the system passwd file in the chroot jail is just not practical. +# +# The right-hand side of the lookup tables is conveniently ignored. +# In the left-hand side, specify a bare username, an @domain.tld +# wild-card, or specify a user@domain.tld address. +# +#local_recipient_maps = unix:passwd.byname $alias_maps +#local_recipient_maps = proxy:unix:passwd.byname $alias_maps +#local_recipient_maps = + +# The unknown_local_recipient_reject_code specifies the SMTP server +# response code when a recipient domain matches $mydestination or +# ${proxy,inet}_interfaces, while $local_recipient_maps is non-empty +# and the recipient address or address local-part is not found. +# +# The default setting is 550 (reject mail) but it is safer to start +# with 450 (try again later) until you are certain that your +# local_recipient_maps settings are OK. +# +unknown_local_recipient_reject_code = 550 + +# TRUST AND RELAY CONTROL + +# The mynetworks parameter specifies the list of "trusted" SMTP +# clients that have more privileges than "strangers". +# +# In particular, "trusted" SMTP clients are allowed to relay mail +# through Postfix. See the smtpd_recipient_restrictions parameter +# in postconf(5). +# +# You can specify the list of "trusted" network addresses by hand +# or you can let Postfix do it for you (which is the default). +# +# By default (mynetworks_style = subnet), Postfix "trusts" SMTP +# clients in the same IP subnetworks as the local machine. +# On Linux, this does works correctly only with interfaces specified +# with the "ifconfig" command. +# +# Specify "mynetworks_style = class" when Postfix should "trust" SMTP +# clients in the same IP class A/B/C networks as the local machine. +# Don't do this with a dialup site - it would cause Postfix to "trust" +# your entire provider's network. Instead, specify an explicit +# mynetworks list by hand, as described below. +# +# Specify "mynetworks_style = host" when Postfix should "trust" +# only the local machine. +# +#mynetworks_style = class +#mynetworks_style = subnet +#mynetworks_style = host + +# Alternatively, you can specify the mynetworks list by hand, in +# which case Postfix ignores the mynetworks_style setting. +# +# Specify an explicit list of network/netmask patterns, where the +# mask specifies the number of bits in the network part of a host +# address. +# +# You can also specify the absolute pathname of a pattern file instead +# of listing the patterns here. Specify type:table for table-based lookups +# (the value on the table right-hand side is not used). +# +#mynetworks = 168.100.189.0/28, 127.0.0.0/8 +#mynetworks = $config_directory/mynetworks +#mynetworks = hash:/etc/postfix/network_table +mynetworks = 10.12.11.0/24 + +# The relay_domains parameter restricts what destinations this system will +# relay mail to. See the smtpd_recipient_restrictions description in +# postconf(5) for detailed information. +# +# By default, Postfix relays mail +# - from "trusted" clients (IP address matches $mynetworks) to any destination, +# - from "untrusted" clients to destinations that match $relay_domains or +# subdomains thereof, except addresses with sender-specified routing. +# The default relay_domains value is $mydestination. +# +# In addition to the above, the Postfix SMTP server by default accepts mail +# that Postfix is final destination for: +# - destinations that match $inet_interfaces or $proxy_interfaces, +# - destinations that match $mydestination +# - destinations that match $virtual_alias_domains, +# - destinations that match $virtual_mailbox_domains. +# These destinations do not need to be listed in $relay_domains. +# +# Specify a list of hosts or domains, /file/name patterns or type:name +# lookup tables, separated by commas and/or whitespace. Continue +# long lines by starting the next line with whitespace. A file name +# is replaced by its contents; a type:name table is matched when a +# (parent) domain appears as lookup key. +# +# NOTE: Postfix will not automatically forward mail for domains that +# list this system as their primary or backup MX host. See the +# permit_mx_backup restriction description in postconf(5). +# +#relay_domains = $mydestination + +# INTERNET OR INTRANET + +# The relayhost parameter specifies the default host to send mail to +# when no entry is matched in the optional transport(5) table. When +# no relayhost is given, mail is routed directly to the destination. +# +# On an intranet, specify the organizational domain name. If your +# internal DNS uses no MX records, specify the name of the intranet +# gateway host instead. +# +# In the case of SMTP, specify a domain, host, host:port, [host]:port, +# [address] or [address]:port; the form [host] turns off MX lookups. +# +# If you're connected via UUCP, see also the default_transport parameter. +# +#relayhost = $mydomain +#relayhost = [gateway.my.domain] +#relayhost = [mailserver.isp.tld] +#relayhost = uucphost +#relayhost = [an.ip.add.ress] + +# REJECTING UNKNOWN RELAY USERS +# +# The relay_recipient_maps parameter specifies optional lookup tables +# with all addresses in the domains that match $relay_domains. +# +# If this parameter is defined, then the SMTP server will reject +# mail for unknown relay users. This feature is off by default. +# +# The right-hand side of the lookup tables is conveniently ignored. +# In the left-hand side, specify an @domain.tld wild-card, or specify +# a user@domain.tld address. +# +#relay_recipient_maps = hash:/etc/postfix/relay_recipients + +# INPUT RATE CONTROL +# +# The in_flow_delay configuration parameter implements mail input +# flow control. This feature is turned on by default, although it +# still needs further development (it's disabled on SCO UNIX due +# to an SCO bug). +# +# A Postfix process will pause for $in_flow_delay seconds before +# accepting a new message, when the message arrival rate exceeds the +# message delivery rate. With the default 100 SMTP server process +# limit, this limits the mail inflow to 100 messages a second more +# than the number of messages delivered per second. +# +# Specify 0 to disable the feature. Valid delays are 0..10. +# +#in_flow_delay = 1s + +# ADDRESS REWRITING +# +# The ADDRESS_REWRITING_README document gives information about +# address masquerading or other forms of address rewriting including +# username->Firstname.Lastname mapping. + +# ADDRESS REDIRECTION (VIRTUAL DOMAIN) +# +# The VIRTUAL_README document gives information about the many forms +# of domain hosting that Postfix supports. + +# "USER HAS MOVED" BOUNCE MESSAGES +# +# See the discussion in the ADDRESS_REWRITING_README document. + +# TRANSPORT MAP +# +# See the discussion in the ADDRESS_REWRITING_README document. + +# ALIAS DATABASE +# +# The alias_maps parameter specifies the list of alias databases used +# by the local delivery agent. The default list is system dependent. +# +# On systems with NIS, the default is to search the local alias +# database, then the NIS alias database. See aliases(5) for syntax +# details. +# +# If you change the alias database, run "postalias /etc/aliases" (or +# wherever your system stores the mail alias file), or simply run +# "newaliases" to build the necessary DBM or DB file. +# +# It will take a minute or so before changes become visible. Use +# "postfix reload" to eliminate the delay. +# +#alias_maps = dbm:/etc/aliases +#alias_maps = hash:/etc/aliases +#alias_maps = hash:/etc/aliases, nis:mail.aliases +#alias_maps = netinfo:/aliases + +# The alias_database parameter specifies the alias database(s) that +# are built with "newaliases" or "sendmail -bi". This is a separate +# configuration parameter, because alias_maps (see above) may specify +# tables that are not necessarily all under control by Postfix. +# +#alias_database = dbm:/etc/aliases +#alias_database = dbm:/etc/mail/aliases +#alias_database = hash:/etc/aliases +#alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases + +# ADDRESS EXTENSIONS (e.g., user+foo) +# +# The recipient_delimiter parameter specifies the separator between +# user names and address extensions (user+foo). See canonical(5), +# local(8), relocated(5) and virtual(5) for the effects this has on +# aliases, canonical, virtual, relocated and .forward file lookups. +# Basically, the software tries user+foo and .forward+foo before +# trying user and .forward. +# +#recipient_delimiter = + + +# DELIVERY TO MAILBOX +# +# The home_mailbox parameter specifies the optional pathname of a +# mailbox file relative to a user's home directory. The default +# mailbox file is /var/spool/mail/user or /var/mail/user. Specify +# "Maildir/" for qmail-style delivery (the / is required). +# +#home_mailbox = Mailbox +#home_mailbox = Maildir/ + +# The mail_spool_directory parameter specifies the directory where +# UNIX-style mailboxes are kept. The default setting depends on the +# system type. +# +#mail_spool_directory = /var/mail +#mail_spool_directory = /var/spool/mail + +# The mailbox_command parameter specifies the optional external +# command to use instead of mailbox delivery. The command is run as +# the recipient with proper HOME, SHELL and LOGNAME environment settings. +# Exception: delivery for root is done as $default_user. +# +# Other environment variables of interest: USER (recipient username), +# EXTENSION (address extension), DOMAIN (domain part of address), +# and LOCAL (the address localpart). +# +# Unlike other Postfix configuration parameters, the mailbox_command +# parameter is not subjected to $parameter substitutions. This is to +# make it easier to specify shell syntax (see example below). +# +# Avoid shell meta characters because they will force Postfix to run +# an expensive shell process. Procmail alone is expensive enough. +# +# IF YOU USE THIS TO DELIVER MAIL SYSTEM-WIDE, YOU MUST SET UP AN +# ALIAS THAT FORWARDS MAIL FOR ROOT TO A REAL USER. +# +#mailbox_command = /some/where/procmail +#mailbox_command = /some/where/procmail -a "$EXTENSION" + +# The mailbox_transport specifies the optional transport in master.cf +# to use after processing aliases and .forward files. This parameter +# has precedence over the mailbox_command, fallback_transport and +# luser_relay parameters. +# +# Specify a string of the form transport:nexthop, where transport is +# the name of a mail delivery transport defined in master.cf. The +# :nexthop part is optional. For more details see the sample transport +# configuration file. +# +# NOTE: if you use this feature for accounts not in the UNIX password +# file, then you must update the "local_recipient_maps" setting in +# the main.cf file, otherwise the SMTP server will reject mail for +# non-UNIX accounts with "User unknown in local recipient table". +# +#mailbox_transport = lmtp:unix:/file/name +#mailbox_transport = cyrus + +# The fallback_transport specifies the optional transport in master.cf +# to use for recipients that are not found in the UNIX passwd database. +# This parameter has precedence over the luser_relay parameter. +# +# Specify a string of the form transport:nexthop, where transport is +# the name of a mail delivery transport defined in master.cf. The +# :nexthop part is optional. For more details see the sample transport +# configuration file. +# +# NOTE: if you use this feature for accounts not in the UNIX password +# file, then you must update the "local_recipient_maps" setting in +# the main.cf file, otherwise the SMTP server will reject mail for +# non-UNIX accounts with "User unknown in local recipient table". +# +#fallback_transport = lmtp:unix:/file/name +#fallback_transport = cyrus +#fallback_transport = + +# The luser_relay parameter specifies an optional destination address +# for unknown recipients. By default, mail for unknown@$mydestination, +# unknown@[$inet_interfaces] or unknown@[$proxy_interfaces] is returned +# as undeliverable. +# +# The following expansions are done on luser_relay: $user (recipient +# username), $shell (recipient shell), $home (recipient home directory), +# $recipient (full recipient address), $extension (recipient address +# extension), $domain (recipient domain), $local (entire recipient +# localpart), $recipient_delimiter. Specify ${name?value} or +# ${name:value} to expand value only when $name does (does not) exist. +# +# luser_relay works only for the default Postfix local delivery agent. +# +# NOTE: if you use this feature for accounts not in the UNIX password +# file, then you must specify "local_recipient_maps =" (i.e. empty) in +# the main.cf file, otherwise the SMTP server will reject mail for +# non-UNIX accounts with "User unknown in local recipient table". +# +#luser_relay = $user@other.host +#luser_relay = $local@other.host +#luser_relay = admin+$local + +# JUNK MAIL CONTROLS +# +# The controls listed here are only a very small subset. The file +# SMTPD_ACCESS_README provides an overview. + +# The header_checks parameter specifies an optional table with patterns +# that each logical message header is matched against, including +# headers that span multiple physical lines. +# +# By default, these patterns also apply to MIME headers and to the +# headers of attached messages. With older Postfix versions, MIME and +# attached message headers were treated as body text. +# +# For details, see "man header_checks". +# +#header_checks = regexp:/etc/postfix/header_checks + +# FAST ETRN SERVICE +# +# Postfix maintains per-destination logfiles with information about +# deferred mail, so that mail can be flushed quickly with the SMTP +# "ETRN domain.tld" command, or by executing "sendmail -qRdomain.tld". +# See the ETRN_README document for a detailed description. +# +# The fast_flush_domains parameter controls what destinations are +# eligible for this service. By default, they are all domains that +# this server is willing to relay mail to. +# +#fast_flush_domains = $relay_domains + +# SHOW SOFTWARE VERSION OR NOT +# +# The smtpd_banner parameter specifies the text that follows the 220 +# code in the SMTP server's greeting banner. Some people like to see +# the mail version advertised. By default, Postfix shows no version. +# +# You MUST specify $myhostname at the start of the text. That is an +# RFC requirement. Postfix itself does not care. +# +#smtpd_banner = $myhostname ESMTP $mail_name +#smtpd_banner = $myhostname ESMTP $mail_name ($mail_version) + +# PARALLEL DELIVERY TO THE SAME DESTINATION +# +# How many parallel deliveries to the same user or domain? With local +# delivery, it does not make sense to do massively parallel delivery +# to the same user, because mailbox updates must happen sequentially, +# and expensive pipelines in .forward files can cause disasters when +# too many are run at the same time. With SMTP deliveries, 10 +# simultaneous connections to the same domain could be sufficient to +# raise eyebrows. +# +# Each message delivery transport has its XXX_destination_concurrency_limit +# parameter. The default is $default_destination_concurrency_limit for +# most delivery transports. For the local delivery agent the default is 2. + +#local_destination_concurrency_limit = 2 +#default_destination_concurrency_limit = 20 + +# DEBUGGING CONTROL +# +# The debug_peer_level parameter specifies the increment in verbose +# logging level when an SMTP client or server host name or address +# matches a pattern in the debug_peer_list parameter. +# +debug_peer_level = 2 + +# The debug_peer_list parameter specifies an optional list of domain +# or network patterns, /file/name patterns or type:name tables. When +# an SMTP client or server host name or address matches a pattern, +# increase the verbose logging level by the amount specified in the +# debug_peer_level parameter. +# +#debug_peer_list = 127.0.0.1 +#debug_peer_list = some.domain + +# The debugger_command specifies the external command that is executed +# when a Postfix daemon program is run with the -D option. +# +# Use "command .. & sleep 5" so that the debugger can attach before +# the process marches on. If you use an X-based debugger, be sure to +# set up your XAUTHORITY environment variable before starting Postfix. +# +debugger_command = + PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin + ddd $daemon_directory/$process_name $process_id & sleep 5 + +# If you can't use X, use this to capture the call stack when a +# daemon crashes. The result is in a file in the configuration +# directory, and is named after the process name and the process ID. +# +# debugger_command = +# PATH=/bin:/usr/bin:/usr/local/bin; export PATH; (echo cont; +# echo where) | gdb $daemon_directory/$process_name $process_id 2>&1 +# >$config_directory/$process_name.$process_id.log & sleep 5 +# +# Another possibility is to run gdb under a detached screen session. +# To attach to the screen sesssion, su root and run "screen -r +# " where uniquely matches one of the detached +# sessions (from "screen -list"). +# +# debugger_command = +# PATH=/bin:/usr/bin:/sbin:/usr/sbin; export PATH; screen +# -dmS $process_name gdb $daemon_directory/$process_name +# $process_id & sleep 1 + +# INSTALL-TIME CONFIGURATION INFORMATION +# +# The following parameters are used when installing a new Postfix version. +# +# sendmail_path: The full pathname of the Postfix sendmail command. +# This is the Sendmail-compatible mail posting interface. +# +sendmail_path = /usr/sbin/sendmail + +# newaliases_path: The full pathname of the Postfix newaliases command. +# This is the Sendmail-compatible command to build alias databases. +# +newaliases_path = /usr/bin/newaliases + +# mailq_path: The full pathname of the Postfix mailq command. This +# is the Sendmail-compatible mail queue listing command. +# +mailq_path = /usr/bin/mailq + +# setgid_group: The group for mail submission and queue management +# commands. This must be a group name with a numerical group ID that +# is not shared with other accounts, not even with the Postfix account. +# +setgid_group = postdrop + +# html_directory: The location of the Postfix HTML documentation. +# +html_directory = /usr/share/doc/postfix-2.8.7/html + +# manpage_directory: The location of the Postfix on-line manual pages. +# +manpage_directory = /usr/share/man + +# sample_directory: The location of the Postfix sample configuration files. +# This parameter is obsolete as of Postfix 2.1. +# +sample_directory = /etc/postfix + +# readme_directory: The location of the Postfix README files. +# +readme_directory = /usr/share/doc/postfix-2.8.7/readme +home_mailbox = .maildir/ + +smtpd_sasl_auth_enable = yes +smtpd_sasl2_auth_enable = yes +smtpd_sasl_security_options = noanonymous +broken_sasl_auth_clients = yes +smtpd_sasl_local_domain = $myhostname + +# Authentifizierter Relay-Mail-Versand +smtp_sasl_auth_enable = yes +smtp_sasl_password_maps = hash:/etc/postfix/smtp_auth +smtp_sasl_security_options = noanonymous +relayhost = [mail.brehm-online.com] +#relayhost = [helga-six.brehm-online.com] + +smtpd_use_tls = yes +#smtpd_tls_auth_only = yes +smtpd_tls_key_file = /etc/postfix/postfix.pem +smtpd_tls_cert_file = /etc/postfix/postfix.pem +#smtpd_tls_CAfile = /etc/ssl/acwain-CA/CAcert.pem +smtpd_tls_loglevel = 1 +smtpd_tls_received_header = yes +smtpd_tls_session_cache_timeout = 3600s +tls_random_source = dev:/dev/urandom + +# schön tls verwenden +smtp_use_tls = yes +smtp_tls_key_file = /etc/postfix/postfix.pem +smtp_tls_cert_file = /etc/postfix/postfix.pem +#smtp_tls_CAfile = /etc/ssl/acwain-CA/CAcert.pem +# vermurkste zertifikate: egal +smtp_tls_enforce_peername = no + +#debug_peer_list = 217.237.40.156 + +inet_protocols = all diff --git a/config-archive/etc/postfix/main.cf.dist b/config-archive/etc/postfix/main.cf.dist index e556e0c3..f08724a0 100644 --- a/config-archive/etc/postfix/main.cf.dist +++ b/config-archive/etc/postfix/main.cf.dist @@ -640,7 +640,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.10.2/html +html_directory = /usr/share/doc/postfix-2.10.3/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -653,5 +653,5 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-2.10.2/readme +readme_directory = /usr/share/doc/postfix-2.10.3/readme home_mailbox = .maildir/ diff --git a/config-archive/etc/ssh/sshd_config.4 b/config-archive/etc/ssh/sshd_config.4 new file mode 100644 index 00000000..f3c6c252 --- /dev/null +++ b/config-archive/etc/ssh/sshd_config.4 @@ -0,0 +1,199 @@ +# $OpenBSD$ + +# This is the sshd server system-wide configuration file. See +# sshd_config(5) for more information. + +# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin + +# The strategy used for options in the default sshd_config shipped with +# OpenSSH is to specify options with their default value where +# possible, but leave them commented. Uncommented options change a +# default value. + +#Port 22 +#AddressFamily any +#ListenAddress 0.0.0.0 +#ListenAddress :: + +# The default requires explicit activation of protocol 1 +#Protocol 2 + +# HostKey for protocol version 1 +#HostKey /etc/ssh/ssh_host_key +# HostKeys for protocol version 2 +#HostKey /etc/ssh/ssh_host_rsa_key +#HostKey /etc/ssh/ssh_host_dsa_key +#HostKey /etc/ssh/ssh_host_ecdsa_key + +# "key type names" for X.509 certificates with RSA key +# Note first defined is used in signature operations! +#X509KeyAlgorithm x509v3-sign-rsa,rsa-md5 +#X509KeyAlgorithm x509v3-sign-rsa,rsa-sha1 + +# "key type names" for X.509 certificates with DSA key +# Note first defined is used in signature operations! +#X509KeyAlgorithm x509v3-sign-dss,dss-asn1 +#X509KeyAlgorithm x509v3-sign-dss,dss-raw + +# The intended use for the X509 client certificate. Without this option +# no chain verification will be done. Currently accepted uses are case +# insensitive: +# - "sslclient", "SSL client", "SSL_client" or "client" +# - "any", "Any Purpose", "Any_Purpose" or "AnyPurpose" +# - "skip" or ""(empty): don`t check purpose. +#AllowedCertPurpose sslclient + +# Specifies whether self-issued(self-signed) X.509 certificate can be +# allowed only by entry in AutorizedKeysFile that contain matching +# public key or certificate blob. +#KeyAllowSelfIssued no + +# Specifies whether CRL must present in store for all certificates in +# certificate chain with atribute "cRLDistributionPoints" +#MandatoryCRL no + +# A file with multiple certificates of certificate signers +# in PEM format concatenated together. +#CACertificateFile /etc/ssh/ca/ca-bundle.crt + +# A directory with certificates of certificate signers. +# The certificates should have name of the form: [HASH].[NUMBER] +# or have symbolic links to them of this form. +#CACertificatePath /etc/ssh/ca/crt + +# A file with multiple CRL of certificate signers +# in PEM format concatenated together. +#CARevocationFile /etc/ssh/ca/ca-bundle.crl + +# A directory with CRL of certificate signers. +# The CRL should have name of the form: [HASH].r[NUMBER] +# or have symbolic links to them of this form. +#CARevocationPath /etc/ssh/ca/crl + +# LDAP protocol version. +# Example: +# CAldapVersion 2 + +# Note because of OpenSSH options parser limitation +# use %3D instead of = ! +# LDAP initialization may require URL to be escaped, i.e. +# use %2C instead of ,(comma). Escaped URL don't depend from +# LDAP initialization method. +# Example: +# CAldapURL ldap://localhost:389/dc%3Dexample%2Cdc%3Dcom + +# SSH can use "Online Certificate Status Protocol"(OCSP) +# to validate certificate. Set VAType to +# - none : do not use OCSP to validate certificates; +# - ocspcert: validate only certificates that specify `OCSP +# Service Locator' URL; +# - ocspspec: use specified in the configuration 'OCSP Responder' +# to validate all certificates. +#VAType none + +# Lifetime and size of ephemeral version 1 server key +#KeyRegenerationInterval 1h +#ServerKeyBits 1024 + +# Logging +# obsoletes QuietMode and FascistLogging +#SyslogFacility AUTH +#LogLevel INFO + +# Authentication: + +#LoginGraceTime 2m +PermitRootLogin no +#StrictModes yes +#MaxAuthTries 6 +#MaxSessions 10 + +#RSAAuthentication yes +#PubkeyAuthentication yes +#AuthorizedKeysFile .ssh/authorized_keys + +# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts +#RhostsRSAAuthentication no +# similar for protocol version 2 +#HostbasedAuthentication no +# Change to yes if you don't trust ~/.ssh/known_hosts for +# RhostsRSAAuthentication and HostbasedAuthentication +#IgnoreUserKnownHosts no +# Don't read the user's ~/.rhosts and ~/.shosts files +#IgnoreRhosts yes + +# To disable tunneled clear text passwords, change to no here! +PasswordAuthentication no +#PasswordAuthentication yes +#PermitEmptyPasswords no + +# Change to no to disable s/key passwords +#ChallengeResponseAuthentication yes + +# Kerberos options +#KerberosAuthentication no +#KerberosOrLocalPasswd yes +#KerberosTicketCleanup yes +#KerberosGetAFSToken no + +# GSSAPI options +#GSSAPIAuthentication no +#GSSAPICleanupCredentials yes + +# Set this to 'yes' to enable PAM authentication, account processing, +# and session processing. If this is enabled, PAM authentication will +# be allowed through the ChallengeResponseAuthentication and +# PasswordAuthentication. Depending on your PAM configuration, +# PAM authentication via ChallengeResponseAuthentication may bypass +# the setting of "PermitRootLogin without-password". +# If you just want the PAM account and session checks to run without +# PAM authentication, then enable this but set PasswordAuthentication +# and ChallengeResponseAuthentication to 'no'. +UsePAM yes + +#AllowAgentForwarding yes +#AllowTcpForwarding yes +#GatewayPorts no +X11Forwarding yes +#X11DisplayOffset 10 +#X11UseLocalhost yes +PrintMotd no +PrintLastLog no +#TCPKeepAlive yes +#UseLogin no +#UsePrivilegeSeparation yes +#PermitUserEnvironment no +#Compression delayed +#ClientAliveInterval 0 +#ClientAliveCountMax 3 +#UseDNS yes +#PidFile /var/run/sshd.pid +#MaxStartups 10 +#PermitTunnel no +#ChrootDirectory none + +# no default banner path +#Banner none + +# override default of no subsystems +Subsystem sftp /usr/lib/misc/sftp-server + +# the following are HPN related configuration options +# tcp receive buffer polling. disable in non autotuning kernels +#TcpRcvBufPoll yes + +# allow the use of the none cipher +#NoneEnabled no + +# disable hpn performance boosts. +#HPNDisabled no + +# buffer size for hpn to non-hpn connections +#HPNBufferSize 2048 + + +# Example of overriding settings on a per-user basis +#Match User anoncvs +# X11Forwarding no +# AllowTcpForwarding no +# ForceCommand cvs server diff --git a/cups/cups-browsed.conf b/cups/cups-browsed.conf index 003d7543..df0a4158 100644 --- a/cups/cups-browsed.conf +++ b/cups/cups-browsed.conf @@ -43,4 +43,24 @@ BrowseRemoteProtocols DNSSD,CUPS # CreateIPPPrinterQueues Yes +# The AutoShutdown directive specifies whether cups-browsed should +# automatically terminate when it has no local raw queues set up +# pointing to any discovered remote printers (auto shutdown +# mode). Setting it to "On" activates the auto-shutdown mode, setting +# it to "Off" deactiivates it (the default). The special mode "avahi" +# turns auto shutdown off while avahi-daemon is running and on when +# avahi-daemon stops. This allows running cups-browsed on-demand when +# avahi-daemon is run on-demand. + +# AutoShutdown Off +# AutoShutdown On +# AutoShutdown avahi + +# The AutoShutdownTimeout directive specifies after how many seconds +# without local raw queues set up pointing to any discovered remote +# printers cups-browsed should actually shut down in auto shutdown +# mode. Default is 30 seconds, 0 means immediate shutdown. + +# AutoShutdownTimeout 30 + # Unknown directives are ignored, also unknown values. diff --git a/cups/printers.conf b/cups/printers.conf index fd4344c8..c96ae7df 100644 --- a/cups/printers.conf +++ b/cups/printers.conf @@ -1,5 +1,5 @@ # Printer configuration file for CUPS v1.7.1 -# Written by cupsd on 2014-03-15 23:01 +# Written by cupsd on 2014-05-09 17:19 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING UUID urn:uuid:37ccb9f9-f39f-3442-414c-7de19e42748d diff --git a/davfs2/davfs2.conf b/davfs2/davfs2.conf new file mode 100644 index 00000000..93b14d55 --- /dev/null +++ b/davfs2/davfs2.conf @@ -0,0 +1,77 @@ +# davfs2 configuration file 2012-07-19 +# version 9 +# ------------------------------------ + +# Copyright (C) 2006, 2007, 2008, 2009, 2012 Werner Baumann + +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. + + +# Please read the davfs2.conf (5) man page for a description of the +# configuration options and syntax rules. + + +# Available options and default values +# ==================================== + +# General Options +# --------------- + +# dav_user davfs2 # system wide config file only +# dav_group davfs2 # system wide config file only +# kernel_fs fuse +# buf_size 16 # KiByte + +# WebDAV Related Options +# ---------------------- + +# use_proxy 1 # system wide config file only +# proxy # system wide config file only +# servercert +# clientcert +# secrets ~/.davfs2/secrets # user config file only +# ask_auth 1 +# use_locks 1 +# lock_owner +# lock_timeout 1800 # seconds +# lock_refresh 60 # seconds +# use_expect100 0 +# if_match_bug 0 +# drop_weak_etags 0 +# allow_cookie 0 +# precheck 1 +# ignore_dav_header 0 +# server_charset +# connect_timeout 10 # seconds +# read_timeout 30 # seconds +# retry 30 # seconds +# max_retry 300 # seconds +# add_header + +# Cache Related Options +# --------------------- + +# backup_dir lost+found +# cache_dir /var/cache/davfs2 # system wide cache +# ~/.davfs2/cache # per user cache +# cache_size 50 # MiByte +# table_size 1024 +# dir_refresh 60 # seconds +# file_refresh 1 # second +# delay_upload 10 +# gui_optimize 0 + +# Debugging Options +# ----------------- + +# debug # possible values: config, kernel, cache, http, xml, + # httpauth, locks, ssl, httpbody, secrets, most + +[/mnt/hidrive] + +dav_user frank +dav_group users +ask_auth 0 + diff --git a/davfs2/secrets b/davfs2/secrets new file mode 100644 index 00000000..6898b099 --- /dev/null +++ b/davfs2/secrets @@ -0,0 +1,70 @@ +# davfs2 secrets file 2009-10-18 +# version 4 +# ------------------------------- + +# Copyright (C) 2006, 2007, 2008, 2009 Werner Baumann + +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. + + +# # This file must be readable and writeable by the owner only (mode 0600). + +# This file contains user-name and password for the proxy, the +# WebDAV resources and decryption passwords for client certificates. + +# Comments are indicated by a '#' character and the rest of the line +# is ignored. Empty lines are ignored too. + +# Each line consists of two or three items separated by spaces or tabs. +# If an item contains one of the characters space, tab, #, \ or ", this +# character must be escaped by a preceding \. Alternatively, the item +# may be enclosed in double quotes. (see also the davfs2.conf (5) man page) + + +# Proxy Line +# ---------- +# A proxy line consists of the fully qualified domain name of the proxy, +# the user-name and the password. The proxy name must not contain a scheme +# or path segment, but a port number should be added, separated by a colon. +# The password my be omitted. +# Instead of the name of the proxy, the keyword "proxy" may be used. + +# Examples +# foo.bar:3245 otto my\ secret +# foo.bar otto "my secret" +# proxy otto "my secret" + + +# Credential Line +# --------------- +# A credential line consists of the mount-point, the user-name and +# the password. The mount-point must be an absolute path, starting +# with /. The password may be omitted. +# For compatibility with older versions, instead of the mount-point +# the URL may be given. The URL must contain scheme, fully qualified +# domain name and path. If the path segment is missing, / is assumed. + +# Examples +# /home/otto/foo otto g3H\"x\ 7z\\ +# /media/dav/bar otto geheim +# Old style +# "http://foo.bar/my documents" otto "geh # heim" +# https://foo.bar:333/dav otto geh\ \#\ heim + +/mnt/hidrive frank.brehm 5eZXG-Ec + + +# Password for Client Certificate +# ------------------------------- +# It must contain the name of the certificate file and the encryption +# password. The name must be either absolute (starting with /) or the +# file-name only. If it is not absolute, it is assumed to be in the +# standard directory for client certificates. + +# Examples +# /home/otto/.davfs2/certs/private/otto.crt geheim +# otto_private.crt "this is extraordinary secret" +# "otto private.crt" this\ is\ secret,\ too. + diff --git a/dbus-1/system.d/bluetooth.conf b/dbus-1/system.d/bluetooth.conf index 81c51011..0ae606ee 100644 --- a/dbus-1/system.d/bluetooth.conf +++ b/dbus-1/system.d/bluetooth.conf @@ -18,6 +18,7 @@ + diff --git a/dbus-1/system.d/org.freedesktop.ModemManager1.conf b/dbus-1/system.d/org.freedesktop.ModemManager1.conf index 64c43ebc..5c963846 100644 --- a/dbus-1/system.d/org.freedesktop.ModemManager1.conf +++ b/dbus-1/system.d/org.freedesktop.ModemManager1.conf @@ -192,6 +192,13 @@ send_interface="org.freedesktop.ModemManager1.Sms" send_member="Send"/> + + + + + diff --git a/dbus-1/system.d/org.kde.kcontrol.kcmkwallet.conf b/dbus-1/system.d/org.kde.kcontrol.kcmkwallet.conf new file mode 100644 index 00000000..e267b37a --- /dev/null +++ b/dbus-1/system.d/org.kde.kcontrol.kcmkwallet.conf @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/etckeeper/pre-commit.d/30store-metadata b/etckeeper/pre-commit.d/30store-metadata index fa5b5c62..9e2792fb 100755 --- a/etckeeper/pre-commit.d/30store-metadata +++ b/etckeeper/pre-commit.d/30store-metadata @@ -29,7 +29,7 @@ filter_ignore() { ;; git) git ls-files --others --ignore --exclude-standard --directory > "$listfile" || true - grep -Fvf "$listfile" + sed 's/^\.\///' | grep -xFvf "$listfile" ;; esac rm -f "$listfile" diff --git a/etckeeper/update-ignore.d/01update-ignore b/etckeeper/update-ignore.d/01update-ignore index 8a4d6142..3b368e8a 100755 --- a/etckeeper/update-ignore.d/01update-ignore +++ b/etckeeper/update-ignore.d/01update-ignore @@ -101,7 +101,7 @@ writefile () { nl elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "qlist" ]; then comment "new and old versions of conffiles, stored by emerge" - ignore "*.cfg_*" + ignore "*._cfg*" nl fi diff --git a/fstab b/fstab index dc58d3e5..98f3509d 100644 --- a/fstab +++ b/fstab @@ -33,7 +33,8 @@ UUID=47afb6ae-d9bc-4129-a382-c9cd06a4bee2 /data/my_passport ext4 noauto,noatime, shm /dev/shm tmpfs nodev,nosuid,noexec 0 0 # Bind mountings ... -/data/all/Bilder /home/frank/Bilder none bind 0 0 +/data/all/Bilder /home/frank/Pictures none bind 0 0 +/data/all/Wallpapers /home/frank/Bilder none bind 0 0 /data/all/Dokumente/Frank /home/frank/Dokumente none bind 0 0 /data/all/Dokumente/Frank/sounds /home/frank/Musik none bind 0 0 /data/frank/Tracks /home/frank/Tracks none bind 0 0 @@ -41,3 +42,7 @@ shm /dev/shm tmpfs nodev,nosuid,noexec 0 0 /data/all/Dokumente/Doris /home/doris/Dokumente none bind 0 0 /data/all/Dokumente/Patrick /home/patrick/Dokumente none bind 0 0 +/dev/sde1 /mnt/usb_stick auto noauto,user 0 0 + +https://webdav.hidrive.strato.com /mnt/hidrive davfs noauto,user,uid=frank,gid=users 0 0 + diff --git a/gimp/2.0/gimprc b/gimp/2.0/gimprc index aa22bc40..1efcc434 100644 --- a/gimp/2.0/gimprc +++ b/gimp/2.0/gimprc @@ -42,7 +42,7 @@ # specified in bytes, kilobytes, megabytes or gigabytes. If no suffix is # specified the size defaults to being specified in kilobytes. # -# (tile-cache-size 2038820k) +# (tile-cache-size 2147483647) # Specifies the language to use for the user interface. This is a string # value. diff --git a/group b/group index fd630fe5..b1fd3219 100644 --- a/group +++ b/group @@ -73,3 +73,4 @@ systemd-journal:x:984: colord:x:983: geoclue:x:982: samba:x:981: +davfs2:x:980: diff --git a/group- b/group- index ee06b050..fd630fe5 100644 --- a/group- +++ b/group- @@ -72,3 +72,4 @@ qemu:x:77: systemd-journal:x:984: colord:x:983: geoclue:x:982: +samba:x:981: diff --git a/gshadow b/gshadow index 214156e3..2ea50900 100644 --- a/gshadow +++ b/gshadow @@ -71,3 +71,4 @@ systemd-journal:!:: colord:!:: geoclue:!:: samba:!:: +davfs2:!:: diff --git a/gshadow- b/gshadow- index c0095c26..214156e3 100644 --- a/gshadow- +++ b/gshadow- @@ -70,3 +70,4 @@ qemu:!:: systemd-journal:!:: colord:!:: geoclue:!:: +samba:!:: diff --git a/gtk-2.0/i686-pc-linux-gnu/gtk.immodules b/gtk-2.0/i686-pc-linux-gnu/gtk.immodules index f839b5d7..fca80ac0 100644 --- a/gtk-2.0/i686-pc-linux-gnu/gtk.immodules +++ b/gtk-2.0/i686-pc-linux-gnu/gtk.immodules @@ -1,8 +1,8 @@ # GTK+ Input Method Modules file # Automatically generated file, do not edit -# Created by gtk-query-immodules-2.0-32 from gtk+-2.24.17 +# Created by gtk-query-immodules-2.0-32 from gtk+-2.24.22 # -# ModulesPath = /root/.gtk-2.0/2.10.0/i686-pc-linux-gnu/immodules:/root/.gtk-2.0/2.10.0/immodules:/root/.gtk-2.0/i686-pc-linux-gnu/immodules:/root/.gtk-2.0/immodules:/usr/lib32/gtk-2.0/2.10.0/i686-pc-linux-gnu/immodules:/usr/lib32/gtk-2.0/2.10.0/immodules:/usr/lib32/gtk-2.0/i686-pc-linux-gnu/immodules:/usr/lib32/gtk-2.0/immodules +# ModulesPath = /var/tmp/portage/app-emulation/emul-linux-x86-gtklibs-20140406/homedir/.gtk-2.0/2.10.0/i686-pc-linux-gnu/immodules:/var/tmp/portage/app-emulation/emul-linux-x86-gtklibs-20140406/homedir/.gtk-2.0/2.10.0/immodules:/var/tmp/portage/app-emulation/emul-linux-x86-gtklibs-20140406/homedir/.gtk-2.0/i686-pc-linux-gnu/immodules:/var/tmp/portage/app-emulation/emul-linux-x86-gtklibs-20140406/homedir/.gtk-2.0/immodules:/usr/lib32/gtk-2.0/2.10.0/i686-pc-linux-gnu/immodules:/usr/lib32/gtk-2.0/2.10.0/immodules:/usr/lib32/gtk-2.0/i686-pc-linux-gnu/immodules:/usr/lib32/gtk-2.0/immodules # "/usr/lib32/gtk-2.0/2.10.0/immodules/im-viqr.so" "viqr" "Vietnamese (VIQR)" "gtk20" "/usr/share/locale" "vi" @@ -37,3 +37,4 @@ "/usr/lib32/gtk-2.0/2.10.0/immodules/im-inuktitut.so" "inuktitut" "Inuktitut (Transliterated)" "gtk20" "/usr/share/locale" "iu" + diff --git a/hosts.allow b/hosts.allow new file mode 100644 index 00000000..c473eb95 --- /dev/null +++ b/hosts.allow @@ -0,0 +1,17 @@ +# For more information, please see the hosts.allow(5) manpage + +# Rule format: +# daemon : client list +# The value for 'daemon' is determined by the name of the binary. +# OpenSSH runs as 'sshd' so you would use 'sshd' for 'daemon'. +# Client list can be a list of ip's or hostnames. + +# Allow only sshd connections from ips matching 192.168.0.* +#sshd: 192.168.0. + +# Only allow sendmail connections from the localhost +#sendmail: localhost + +# Allow everyone from foobar.edu to access everything except for +# the terminalserver +#ALL: .foobar.edu EXCEPT terminalserver.foobar.edu diff --git a/hotplug/usb/libsane.usermap b/hotplug/usb/libsane.usermap index d3fdab7e..337615c5 100644 --- a/hotplug/usb/libsane.usermap +++ b/hotplug/usb/libsane.usermap @@ -1,5 +1,5 @@ # This file was automatically created based on description files (*.desc) -# by sane-desc 3.5 from sane-backends 1.0.24 on Wed Jan 29 17:44:42 2014 +# by sane-desc 3.5 from sane-backends 1.0.24 on Tue May 13 00:54:43 2014 # # The entries below are used to detect a USB device and change owner # and permissions on the "device node" used by libusb. diff --git a/init.d/apache2 b/init.d/apache2 index c3ce4e77..76e2154b 100755 --- a/init.d/apache2 +++ b/init.d/apache2 @@ -77,12 +77,16 @@ start() { # Use start stop daemon to apply system limits #347301 start-stop-daemon --start -- ${APACHE2} ${APACHE2_OPTS} -k start - i=0 - while [ ! -e "${PIDFILE}" ] && [ $i -lt ${TIMEOUT} ]; do + local i=0 retval=1 + while [ $i -lt ${TIMEOUT} ] ; do + if [ -e "${PIDFILE}" ] ; then + retval=0 + break + fi sleep 1 && i=$(expr $i + 1) done - eend $(test $i -lt ${TIMEOUT}) + eend ${retval} } stop() { @@ -101,13 +105,14 @@ stop() { ebegin "Stopping ${SVCNAME}" ${APACHE2} ${APACHE2_OPTS} -k stop - i=0 + local i=0 retval=0 while ( test -f "${PIDFILE}" && pgrep -P ${PID} apache2 >/dev/null ) \ && [ $i -lt ${TIMEOUT} ]; do sleep 1 && i=$(expr $i + 1) done + [ -e "${PIDFILE}" ] && retval=1 - eend $(test $i -lt ${TIMEOUT}) + eend ${retval} } reload() { diff --git a/init.d/git-daemon b/init.d/git-daemon index c6ee19f5..ee9a64e3 100755 --- a/init.d/git-daemon +++ b/init.d/git-daemon @@ -1,30 +1,13 @@ #!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/files/git-daemon.initd,v 1.1 2010/03/17 15:13:27 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/files/git-daemon-r1.initd,v 1.4 2014/03/03 19:21:29 polynomial-c Exp $ -PIDFILE=/var/run/git-daemon.pid +pidfile="/var/run/git-daemon.pid" +command="/usr/bin/git" +command_args="daemon ${GITDAEMON_OPTS}" +start_stop_daemon_args="-e HOME= -e XDG_CONFIG_HOME= -b -m -p ${pidfile} -u ${GIT_USER:-nobody}:${GIT_GROUP:-nobody}" depend() { - need net use logger } - -start() { - [ -e /lib/librc.so ] || BL1_COMPAT="--name git-daemon" - ebegin "Starting git-daemon" - start-stop-daemon --start --quiet --background \ - --pidfile ${PIDFILE} ${BL1_COMPAT} \ - --exec /usr/bin/git -- daemon \ - --pid-file=${PIDFILE} \ - --user=${GIT_USER} --group=${GIT_GROUP} \ - ${GITDAEMON_OPTS} - eend $? -} - -stop() { - ebegin "Stopping git-daemon" - start-stop-daemon --stop --quiet \ - --pidfile ${PIDFILE} - eend $? -} diff --git a/init.d/net.lo b/init.d/net.lo index 5309423e..ed6fe0d0 100755 --- a/init.d/net.lo +++ b/init.d/net.lo @@ -463,7 +463,7 @@ _load_config() fi else if [ -z "$1" ]; then - ewarn "No configuration specified; defaulting to DHCP" + ewarn "config_${IFVAR} not specified; defaulting to DHCP" config_0="dhcp" config_index=1 fi diff --git a/init.d/rfcomm b/init.d/rfcomm deleted file mode 100755 index 18b0e1e3..00000000 --- a/init.d/rfcomm +++ /dev/null @@ -1,27 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/rfcomm-init.d,v 1.2 2013/12/23 23:05:20 eva Exp $ - -depend() { - after coldplug - need dbus localmount hostname -} - -start() { - if [ "${RFCOMM_ENABLE}" = "true" -a -x /usr/bin/rfcomm ]; then - if [ -f "${RFCOMM_CONFIG}" ]; then - ebegin "Starting rfcomm" - /usr/bin/rfcomm -f "${RFCOMM_CONFIG}" bind all - eend $? - else - ewarn "Not enabling rfcomm because RFCOMM_CONFIG does not exists" - fi - fi -} - -stop() { - ebegin "Shutting down rfcomm" - /usr/bin/rfcomm release all - eend $? -} diff --git a/libvirt/libvirtd.conf b/libvirt/libvirtd.conf index 53539275..aeba11d7 100644 --- a/libvirt/libvirtd.conf +++ b/libvirt/libvirtd.conf @@ -63,7 +63,7 @@ # unique on the immediate broadcast network. # # The default is "Virtualization Host HOSTNAME", where HOSTNAME -# is subsituted for the short hostname of the machine (without domain) +# is substituted for the short hostname of the machine (without domain) # #mdns_name = "Virtualization Host Joe Demo" @@ -83,8 +83,8 @@ # Set the UNIX socket permissions for the R/O socket. This is used # for monitoring VM status only # -# Default allows any user. If setting group ownership may want to -# restrict this to: +# Default allows any user. If setting group ownership, you may want to +# restrict this too. #unix_sock_ro_perms = "0777" # Set the UNIX socket permissions for the R/W socket. This is used @@ -94,7 +94,7 @@ # the default will change to allow everyone (eg, 0777) # # If not using PolicyKit and setting group ownership for access -# control then you may want to relax this to: +# control, then you may want to relax this too. #unix_sock_rw_perms = "0770" # Set the name of the directory in which sockets will be found/created. @@ -113,7 +113,7 @@ # - sasl: use SASL infrastructure. The actual auth scheme is then # controlled from /etc/sasl2/libvirt.conf. For the TCP # socket only GSSAPI & DIGEST-MD5 mechanisms will be used. -# For non-TCP or TLS sockets, any scheme is allowed. +# For non-TCP or TLS sockets, any scheme is allowed. # # - polkit: use PolicyKit to authenticate. This is only suitable # for use on the UNIX sockets. The default policy will @@ -216,7 +216,7 @@ #tls_no_verify_certificate = 1 -# A whitelist of allowed x509 Distinguished Names +# A whitelist of allowed x509 Distinguished Names # This list may contain wildcards such as # # "C=GB,ST=London,L=London,O=Red Hat,CN=*" @@ -255,7 +255,7 @@ # The maximum number of concurrent client connections to allow # over all sockets combined. -#max_clients = 20 +#max_clients = 5000 # The maximum length of queue of connections waiting to be # accepted by the daemon. Note, that some protocols supporting @@ -263,6 +263,10 @@ # connection succeeds. #max_queued_clients = 1000 +# The maximum length of queue of accepted but not yet not +# authenticated clients. The default value is zero, meaning +# the feature is disabled. +#max_anonymous_clients = 20 # The minimum limit sets the number of workers to start up # initially. If the number of active clients exceeds this, @@ -274,13 +278,13 @@ # The number of priority workers. If all workers from above -# pool will stuck, some calls marked as high priority +# pool are stuck, some calls marked as high priority # (notably domainDestroy) can be executed in this pool. #prio_workers = 5 # Total global limit on concurrent RPC calls. Should be # at least as large as max_workers. Beyond this, RPC requests -# will be read into memory and queued. This directly impact +# will be read into memory and queued. This directly impacts # memory usage, currently each request requires 256 KB of # memory. So by default up to 5 MB of memory is used # @@ -318,7 +322,7 @@ # 3: WARNING # 4: ERROR # -# Multiple filter can be defined in a single @filters, they just need to be +# Multiple filters can be defined in a single @filters, they just need to be # separated by spaces. # # e.g. to only get warning or errors from the remote layer and only errors @@ -340,16 +344,16 @@ # 3: WARNING # 4: ERROR # -# Multiple output can be defined, they just need to be separated by spaces. +# Multiple outputs can be defined, they just need to be separated by spaces. # e.g. to log all warnings and errors to syslog under the libvirtd ident: #log_outputs="3:syslog:libvirtd" # -# Log debug buffer size: default 64 -# The daemon keeps an internal debug log buffer which will be dumped in case -# of crash or upon receiving a SIGUSR2 signal. This setting allows to override -# the default buffer size in kilobytes. -# If value is 0 or less the debug log buffer is deactivated +# Log debug buffer size: +# +# This configuration option is no longer used, since the global +# log buffer functionality has been removed. Please configure +# suitable log_outputs/log_filters settings to obtain logs. #log_buffer_size = 64 @@ -387,7 +391,7 @@ ################################################################### # Keepalive protocol: # This allows libvirtd to detect broken client connections or even -# dead client. A keepalive message is sent to a client after +# dead clients. A keepalive message is sent to a client after # keepalive_interval seconds of inactivity to check if the client is # still responding; keepalive_count is a maximum number of keepalive # messages that are allowed to be sent to the client without getting @@ -396,7 +400,7 @@ # keepalive_interval * (keepalive_count + 1) seconds since the last # message received from the client. If keepalive_interval is set to # -1, libvirtd will never send keepalive requests; however clients -# can still send them and the deamon will send responses. When +# can still send them and the daemon will send responses. When # keepalive_count is set to 0, connections will be automatically # closed after keepalive_interval seconds of inactivity without # sending any keepalive messages. diff --git a/libvirt/qemu.conf b/libvirt/qemu.conf index 17f1b10a..f0e802f2 100644 --- a/libvirt/qemu.conf +++ b/libvirt/qemu.conf @@ -58,7 +58,7 @@ #vnc_tls_x509_verify = 1 -# The default VNC password. Only 8 letters are significant for +# The default VNC password. Only 8 bytes are significant for # VNC passwords. This parameter is only used if the per-domain # XML config does not already provide a password. To allow # access without passwords, leave this commented out. An empty @@ -180,7 +180,7 @@ # VNC WebSocket port policies, same rules apply as with remote display # ports. VNC WebSockets use similar display <-> port mappings, with -# the exception being that ports starts from 5700 instead of 5900. +# the exception being that ports start from 5700 instead of 5900. # #remote_websocket_port_min = 5700 #remote_websocket_port_max = 65535 @@ -333,7 +333,7 @@ # disable guest hugepage backing. # # NB, within this mount point, guests will create memory backing files -# in a location of $MOUNTPOINT/libvirt/qemu +# in a location of $MOUNTPOINT/libvirt/qemu # #hugetlbfs_mount = "/dev/hugepages" @@ -402,11 +402,13 @@ #allow_disk_format_probing = 1 -# To enable 'Sanlock' project based locking of the file -# content (to prevent two VMs writing to the same -# disk), uncomment this +# In order to prevent accidentally starting two domains that +# share one writable disk, libvirt offers two approaches for +# locking files. The first one is sanlock, the other one, +# virtlockd, is then our own implementation. Accepted values +# are "sanlock" and "lockd". # -#lock_manager = "sanlock" +#lock_manager = "lockd" @@ -421,14 +423,14 @@ # Keepalive protocol: # This allows qemu driver to detect broken connections to remote # libvirtd during peer-to-peer migration. A keepalive message is -# sent to the deamon after keepalive_interval seconds of inactivity -# to check if the deamon is still responding; keepalive_count is a +# sent to the daemon after keepalive_interval seconds of inactivity +# to check if the daemon is still responding; keepalive_count is a # maximum number of keepalive messages that are allowed to be sent -# to the deamon without getting any response before the connection +# to the daemon without getting any response before the connection # is considered broken. In other words, the connection is # automatically closed approximately after # keepalive_interval * (keepalive_count + 1) seconds since the last -# message received from the deamon. If keepalive_interval is set to +# message received from the daemon. If keepalive_interval is set to # -1, qemu driver will not send keepalive requests during # peer-to-peer migration; however, the remote libvirtd can still # send them and source libvirtd will send responses. When diff --git a/libvirt/virtlockd.conf b/libvirt/virtlockd.conf index 652e1560..4c935d0a 100644 --- a/libvirt/virtlockd.conf +++ b/libvirt/virtlockd.conf @@ -52,11 +52,11 @@ #log_outputs="3:syslog:virtlockd" # -# Log debug buffer size: default 64 -# The daemon keeps an internal debug log buffer which will be dumped in case -# of crash or upon receiving a SIGUSR2 signal. This setting allows to override -# the default buffer size in kilobytes. -# If value is 0 or less the debug log buffer is deactivated +# Log debug buffer size: +# +# This configuration option is no longer used, since the global +# log buffer functionality has been removed. Please configure +# suitable log_outputs/log_filters settings to obtain logs. #log_buffer_size = 64 # The maximum number of concurrent client connections to allow diff --git a/logrotate.d/syslog-ng b/logrotate.d/syslog-ng index 49cc62ec..f169c733 100644 --- a/logrotate.d/syslog-ng +++ b/logrotate.d/syslog-ng @@ -1,4 +1,4 @@ -# $Header: /etc/logrotate.d/.rcs/syslog-ng,v 1.1 2009/01/27 21:03:59 root Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/syslog-ng.logrotate.in,v 1.1 2014/01/22 04:25:35 mr_bones_ Exp $ # # Syslog-ng logrotate snippet for Gentoo Linux # contributed by Michael Sterrett diff --git a/pango/i686-pc-linux-gnu/pango.modules b/pango/i686-pc-linux-gnu/pango.modules index 42bda056..1a91ab3f 100644 --- a/pango/i686-pc-linux-gnu/pango.modules +++ b/pango/i686-pc-linux-gnu/pango.modules @@ -1,35 +1,18 @@ # Pango Modules file # Automatically generated file, do not edit # -# ModulesPath = /usr/lib32/pango/1.6.0/modules +# ModulesPath = /usr/lib32/pango/1.8.0/modules # -/usr/lib32/pango/1.6.0/modules/pango-syriac-fc.so SyriacScriptEngineFc PangoEngineShape PangoRenderFc syriac:* -/usr/lib32/pango/1.6.0/modules/pango-indic-lang.so devaIndicScriptEngineLang PangoEngineLang PangoRenderNone devanagari:* -/usr/lib32/pango/1.6.0/modules/pango-indic-lang.so bengIndicScriptEngineLang PangoEngineLang PangoRenderNone bengali:* -/usr/lib32/pango/1.6.0/modules/pango-indic-lang.so guruIndicScriptEngineLang PangoEngineLang PangoRenderNone gurmukhi:* -/usr/lib32/pango/1.6.0/modules/pango-indic-lang.so gujrIndicScriptEngineLang PangoEngineLang PangoRenderNone gujarati:* -/usr/lib32/pango/1.6.0/modules/pango-indic-lang.so oryaIndicScriptEngineLang PangoEngineLang PangoRenderNone oriya:* -/usr/lib32/pango/1.6.0/modules/pango-indic-lang.so tamlIndicScriptEngineLang PangoEngineLang PangoRenderNone tamil:* -/usr/lib32/pango/1.6.0/modules/pango-indic-lang.so teluIndicScriptEngineLang PangoEngineLang PangoRenderNone telugu:* -/usr/lib32/pango/1.6.0/modules/pango-indic-lang.so kndaIndicScriptEngineLang PangoEngineLang PangoRenderNone kannada:* -/usr/lib32/pango/1.6.0/modules/pango-indic-lang.so mlymIndicScriptEngineLang PangoEngineLang PangoRenderNone malayalam:* -/usr/lib32/pango/1.6.0/modules/pango-indic-lang.so sinhIndicScriptEngineLang PangoEngineLang PangoRenderNone sinhala:* -/usr/lib32/pango/1.6.0/modules/pango-basic-fc.so BasicScriptEngineFc PangoEngineShape PangoRenderFc latin:* cyrillic:* greek:* armenian:* georgian:* runic:* ogham:* bopomofo:* cherokee:* coptic:* deseret:* ethiopic:* gothic:* han:* hiragana:* katakana:* old-italic:* canadian-aboriginal:* yi:* braille:* cypriot:* limbu:* osmanya:* shavian:* linear-b:* ugaritic:* glagolitic:* cuneiform:* phoenician:* common: -/usr/lib32/pango/1.6.0/modules/pango-arabic-lang.so ArabicScriptEngineLang PangoEngineLang PangoRenderNone arabic:* -/usr/lib32/pango/1.6.0/modules/pango-thai-fc.so ThaiScriptEngineFc PangoEngineShape PangoRenderFc thai:* lao:* -/usr/lib32/pango/1.6.0/modules/pango-hebrew-fc.so HebrewScriptEngineFc PangoEngineShape PangoRenderFc hebrew:* -/usr/lib32/pango/1.6.0/modules/pango-arabic-fc.so ArabicScriptEngineFc PangoEngineShape PangoRenderFc arabic:* nko:* -/usr/lib32/pango/1.6.0/modules/pango-tibetan-fc.so TibetanScriptEngineFc PangoEngineShape PangoRenderFc tibetan:* -/usr/lib32/pango/1.6.0/modules/pango-khmer-fc.so KhmerScriptEngineFc PangoEngineShape PangoRenderFc khmer:* -/usr/lib32/pango/1.6.0/modules/pango-basic-x.so BasicScriptEngineX PangoEngineShape PangoRenderX common: -/usr/lib32/pango/1.6.0/modules/pango-hangul-fc.so HangulScriptEngineFc PangoEngineShape PangoRenderFc hangul:* -/usr/lib32/pango/1.6.0/modules/pango-indic-fc.so devaScriptEngineFc PangoEngineShape PangoRenderFc devanagari:* -/usr/lib32/pango/1.6.0/modules/pango-indic-fc.so bengScriptEngineFc PangoEngineShape PangoRenderFc bengali:* -/usr/lib32/pango/1.6.0/modules/pango-indic-fc.so guruScriptEngineFc PangoEngineShape PangoRenderFc gurmukhi:* -/usr/lib32/pango/1.6.0/modules/pango-indic-fc.so gujrScriptEngineFc PangoEngineShape PangoRenderFc gujarati:* -/usr/lib32/pango/1.6.0/modules/pango-indic-fc.so oryaScriptEngineFc PangoEngineShape PangoRenderFc oriya:* -/usr/lib32/pango/1.6.0/modules/pango-indic-fc.so tamlScriptEngineFc PangoEngineShape PangoRenderFc tamil:* -/usr/lib32/pango/1.6.0/modules/pango-indic-fc.so teluScriptEngineFc PangoEngineShape PangoRenderFc telugu:* -/usr/lib32/pango/1.6.0/modules/pango-indic-fc.so kndaScriptEngineFc PangoEngineShape PangoRenderFc kannada:* -/usr/lib32/pango/1.6.0/modules/pango-indic-fc.so mlymScriptEngineFc PangoEngineShape PangoRenderFc malayalam:* -/usr/lib32/pango/1.6.0/modules/pango-indic-fc.so sinhScriptEngineFc PangoEngineShape PangoRenderFc sinhala:* +/usr/lib32/pango/1.8.0/modules/pango-indic-lang.so devaIndicScriptEngineLang PangoEngineLang PangoRenderNone devanagari:* +/usr/lib32/pango/1.8.0/modules/pango-indic-lang.so bengIndicScriptEngineLang PangoEngineLang PangoRenderNone bengali:* +/usr/lib32/pango/1.8.0/modules/pango-indic-lang.so guruIndicScriptEngineLang PangoEngineLang PangoRenderNone gurmukhi:* +/usr/lib32/pango/1.8.0/modules/pango-indic-lang.so gujrIndicScriptEngineLang PangoEngineLang PangoRenderNone gujarati:* +/usr/lib32/pango/1.8.0/modules/pango-indic-lang.so oryaIndicScriptEngineLang PangoEngineLang PangoRenderNone oriya:* +/usr/lib32/pango/1.8.0/modules/pango-indic-lang.so tamlIndicScriptEngineLang PangoEngineLang PangoRenderNone tamil:* +/usr/lib32/pango/1.8.0/modules/pango-indic-lang.so teluIndicScriptEngineLang PangoEngineLang PangoRenderNone telugu:* +/usr/lib32/pango/1.8.0/modules/pango-indic-lang.so kndaIndicScriptEngineLang PangoEngineLang PangoRenderNone kannada:* +/usr/lib32/pango/1.8.0/modules/pango-indic-lang.so mlymIndicScriptEngineLang PangoEngineLang PangoRenderNone malayalam:* +/usr/lib32/pango/1.8.0/modules/pango-indic-lang.so sinhIndicScriptEngineLang PangoEngineLang PangoRenderNone sinhala:* +/usr/lib32/pango/1.8.0/modules/pango-basic-fc.so BasicScriptEngineFc PangoEngineShape PangoRenderFc common: +/usr/lib32/pango/1.8.0/modules/pango-arabic-lang.so ArabicScriptEngineLang PangoEngineLang PangoRenderNone arabic:* + diff --git a/portage/package.keywords b/portage/package.keywords index bacc7fef..779d8c69 100644 --- a/portage/package.keywords +++ b/portage/package.keywords @@ -66,10 +66,12 @@ app-emulation/virtualbox-modules ~dev-perl/Email-Sender-0.110.5 ~dev-python/astng-0.24.3 +~dev-python/bcrypt-1.0.2 dev-python/fbrehm-libs ~dev-python/iniparse-0.4 # ~dev-python/isodate-0.4.9 ~dev-python/logilab-common-0.59.1 +dev-python/passlib dev-python/pb-logging ~dev-python/pillow-2.3.0 ~dev-python/pygments-1.6 diff --git a/postfix/main.cf b/postfix/main.cf index 0436c1c4..5e3d60fd 100644 --- a/postfix/main.cf +++ b/postfix/main.cf @@ -645,7 +645,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.10.2/html +html_directory = /usr/share/doc/postfix-2.10.3/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -658,7 +658,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-2.10.2/readme +readme_directory = /usr/share/doc/postfix-2.10.3/readme home_mailbox = .maildir/ smtpd_sasl_auth_enable = yes diff --git a/resolv.conf b/resolv.conf index 798c010b..c3bac086 100644 --- a/resolv.conf +++ b/resolv.conf @@ -1,6 +1,4 @@ -# Hand made by Frank Brehm -domain home.brehm-online.com -search home.brehm-online.com brehm-online.com hennig-berlin.org uhu-banane.de pb.local dc1.pb.local dc2.pb.local -#nameserver 10.12.11.1 -nameserver 192.168.178.30 -nameserver 192.168.178.89 +# Generated by net-scripts for interface eth0 +domain brehm-online.com +search home.brehm-online.com home.hennig-berlin.org brehm-online.com hennig-berlin.org uhu-banane.de +nameserver 10.12.11.254 diff --git a/revdep-rebuild/10firefox b/revdep-rebuild/10firefox new file mode 100644 index 00000000..5b8899f2 --- /dev/null +++ b/revdep-rebuild/10firefox @@ -0,0 +1 @@ +SEARCH_DIRS_MASK=/usr/lib64/firefox diff --git a/revdep-rebuild/61-oracle-jdk-bin-1.7 b/revdep-rebuild/61-oracle-jdk-bin-1.7 index f822b666..a0ed67e6 100644 --- a/revdep-rebuild/61-oracle-jdk-bin-1.7 +++ b/revdep-rebuild/61-oracle-jdk-bin-1.7 @@ -1 +1 @@ -SEARCH_DIRS_MASK="/opt/oracle-jdk-bin-1.7.0.51" +SEARCH_DIRS_MASK="/opt/oracle-jdk-bin-1.7.0.55" diff --git a/revdep-rebuild/61-oracle-jre-bin-1.7 b/revdep-rebuild/61-oracle-jre-bin-1.7 index 3db052e8..4fbb53f9 100644 --- a/revdep-rebuild/61-oracle-jre-bin-1.7 +++ b/revdep-rebuild/61-oracle-jre-bin-1.7 @@ -1 +1 @@ -SEARCH_DIRS_MASK="/opt/oracle-jre-bin-1.7.0.51" +SEARCH_DIRS_MASK="/opt/oracle-jre-bin-1.7.0.55" diff --git a/runlevels/default/radvd b/runlevels/default/radvd deleted file mode 120000 index 76ffd3e5..00000000 --- a/runlevels/default/radvd +++ /dev/null @@ -1 +0,0 @@ -/etc/init.d/radvd \ No newline at end of file diff --git a/sane.d/canon_pp.conf b/sane.d/canon_pp.conf deleted file mode 100644 index 14b31103..00000000 --- a/sane.d/canon_pp.conf +++ /dev/null @@ -1,36 +0,0 @@ -# Define which port to use if one isn't specified - you should only have -# one of these lines! -# This is the default port to be used - others will be detected -ieee1284 parport0 - - -# Define the location of our pixel weight file, can begin with ~/ if needed. -# You can have as many of these as you like - lines with ports that don't exist -# will be ignored. -# -# Parameters are: -# calibrate /path/to/calibration-file port-name -# -# The format of port-name is dependant on your OS version. -# -# If a file isn't speficied, the default name will be -# ~/.sane/canon_pp-calibration-[port-name] - -calibrate ~/.sane/canon_pp-calibration-pp0 parport0 - -# calibrate /etc/sane/my_calibration parport1 - - -# Enable the next line if you're having trouble with ECP mode such as I/O -# errors. Nibble mode is slower, but more reliable. - -#force_nibble - -# Set a default initialisation mode for each port. Valid modes are: -# AUTO (attempts to automatically detect by trying both methods) -# FB620P (10101010 style.. also works for FB320P) -# FB630P (11001100 style.. also works for FB330P, N340P, N640P) - -init_mode AUTO parport0 -# init_mode FB620P parport0 -# init_mode FB630P parport0 diff --git a/sane.d/hpsj5s.conf b/sane.d/hpsj5s.conf deleted file mode 100644 index 77fb4e4d..00000000 --- a/sane.d/hpsj5s.conf +++ /dev/null @@ -1,2 +0,0 @@ -#hpsj5s.conf -#parport0 \ No newline at end of file diff --git a/sane.d/mustek_pp.conf b/sane.d/mustek_pp.conf deleted file mode 100644 index 17f0e265..00000000 --- a/sane.d/mustek_pp.conf +++ /dev/null @@ -1,103 +0,0 @@ -# For documentation see sane-mustek_pp(5) - -# Global options: -# =============== -# -# option no_epp -# -# Disable parallel port mode EPP: works around a known bug in -# the Linux parport code. Enable this option, if the backend -# hangs when trying to access the parallel port in EPP mode: -# -# # SANE_DEBUG_SANEI_PA4S2=128 scanimage -L -# ... -# hangs here -> [sanei_pa4s2] sanei_pa4s2_readbyte: read in EPP mode -# -# Scanner definition template: -# ============================ -# -# scanner -# option ? -# option ? -# ... -# -# where: -# -# is an arbitrary name for the scanner (eg. Mustek-1200CP) -# -# is the parallel port to which the scanner is connected -# Possible values are 0x378, 0x278, and 0x3bc. For Linux, the -# mapping between ports an numbers is different for kernel -# version 2.2 and 2.4. Port 0x378 corresponds to lp0 on 2.4 kernel. -# If you are using libieee1284, you can as well use parport0, etc.. -# If you use the magic value * the port is probed. -# -# is an identification of the scanner type. -# Possible values are: -# - cis600 (for Mustek 600CP & OEM versions), -# - cis1200 (for Mustek 1200CP & OEM versions), -# - cis1200+ (for Mustek 1200CP+ & OEM versions), -# - ccd300 (for Mustek 600 III EPP & OEM versions) -# - ... more types will be added in the future -# -# is a name of an option, and an optional value -# for the option. -# Currently available options for *CIS* type scanners are: -# - top_adjust : -# Vertical adjustment of origin, in millimeter. -# Values between -5.0 and +5.0 mm are possible -# (floating point). -# Default: 0.0 -# - slow_skip: -# Boolean option. Disables fast skipping to the start -# of the scan region. May be necessary in case fast -# skipping results in inaccuracies. -# Default: fast skipping enabled -# - bw : -# Black/white discrimination value for lineart scans. -# Pixel values below that value are considered black, -# others are considered white. Range: 0-255. -# Default: 127 -# -# Currently available options for *CCD* type scanners are: -# - wait_bank -# usecs to wait for a bank change. Positive integer -# values are possible. You shouldn't mess with this -# parameter. -# Default: 700 -# - bw -# Black/white discrimination value for lineart scans. -# Pixel values below that value are considered black, -# others are considered white. Range: 0-255. -# Default: 127 -# - top -# Scanlines to skip to the top area. Positive integer -# values are possible. 47 and 56 are values I know of. -# Default: 47 -# -# -# Example for a LifeTec LT9350 (Mustek 1200CP clone): -# -# scanner LT9350 0x378 cis1200 -# option top_adjust 0 -# option bw 127 -# -# Example for Mustek 6000P -# -# scanner 6000P 0x378 ccd300 -# option top 56 -# -# -# Uncomment/customize to your needs -# -# scanner Mustek-600CP 0x378 cis600 -# scanner Mustek-1200CP 0x378 cis1200 -# scanner Mustek-1200CP+ 0x378 cis1200+ -# scanner Mustek-600-IIIEP 0x378 ccd300 -# -# auto probing: -# -# scanner mustek-cis600 * cis600 -# scanner mustek-cis1200 * cis1200 -# scanner mustek-cis1200+ * cis1200+ -# scanner mustek-ccd300 * ccd300 diff --git a/ssh/ssh_host_ed25519_key b/ssh/ssh_host_ed25519_key new file mode 100644 index 00000000..9255e812 --- /dev/null +++ b/ssh/ssh_host_ed25519_key @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACAiIQWBzb79KdlZJ/sa7FQrILHrls/bQjZRTeYW8qlpyAAAAJBhxWu2YcVr +tgAAAAtzc2gtZWQyNTUxOQAAACAiIQWBzb79KdlZJ/sa7FQrILHrls/bQjZRTeYW8qlpyA +AAAEAd0nJvbYOcC2kjN+eNH47cky+Cnrfb71QNHP4jOvztzSIhBYHNvv0p2Vkn+xrsVCsg +seuWz9tCNlFN5hbyqWnIAAAACnJvb3RAYnJ1bmkBAgM= +-----END OPENSSH PRIVATE KEY----- diff --git a/ssh/ssh_host_ed25519_key.pub b/ssh/ssh_host_ed25519_key.pub new file mode 100644 index 00000000..10029c7a --- /dev/null +++ b/ssh/ssh_host_ed25519_key.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICIhBYHNvv0p2Vkn+xrsVCsgseuWz9tCNlFN5hbyqWnI root@bruni diff --git a/sysconfig/libvirtd b/sysconfig/libvirtd index 3af1f037..f15e5956 100644 --- a/sysconfig/libvirtd +++ b/sysconfig/libvirtd @@ -20,5 +20,14 @@ # #SDL_AUDIODRIVER=pulse -# Override the maximum number of opened files +# Override the maximum number of opened files. +# This only works with traditional init scripts. +# In the systemd world, the limit can only be changed by overriding +# LimitNOFILE for libvirtd.service. To do that, just create a *.conf +# file in /etc/systemd/system/libvirtd.service.d/ (for example +# /etc/systemd/system/libvirtd.service.d/openfiles.conf) and write +# the following two lines in it: +# [Service] +# LimitNOFILE=2048 +# #LIBVIRTD_NOFILES_LIMIT=2048 diff --git a/updatedb.conf b/updatedb.conf index 09f5db43..41bc4ab5 100644 --- a/updatedb.conf +++ b/updatedb.conf @@ -1,11 +1,11 @@ # /etc/updatedb.conf: config file for slocate -# $Id: updatedb.conf,v 1.5 2011/01/24 12:39:33 scarabeus Exp $ +# $Id: updatedb.conf,v 1.6 2014/05/05 06:42:03 polynomial-c Exp $ # This file sets variables that are used by updatedb. # For more info, see the updatedb.conf(5) manpage. # Filesystems that are pruned from updatedb database -PRUNEFS="afs anon_inodefs auto autofs bdev binfmt binfmt_misc cgroup cifs coda configfs cramfs cpuset debugfs devpts devtmps devfs devpts ecryptfs eventpollfs exofs futexfs ftpfs fuse fusectl gfs gfs2 hostfs hugetlbfs inotifyfs iso9660 jffs2 lustre misc mqueue ncpfs nfs NFS nfs4 nfsd nnpfs ocfs ocfs2 pipefs proc ramfs rpc_pipefs securityfs selinuxfs sfs shfs smbfs sockfs spufs sshfs subfs supermount sysfs tmpfs ubifs udf usbfs vboxsf vperfctrfs" +PRUNEFS="afs anon_inodefs auto autofs bdev binfmt binfmt_misc cgroup cifs coda configfs cramfs cpuset debugfs devfs devpts devtmpfs ecryptfs eventpollfs exofs futexfs ftpfs fuse fusectl gfs gfs2 hostfs hugetlbfs inotifyfs iso9660 jffs2 lustre misc mqueue ncpfs nfs NFS nfs4 nfsd nnpfs ocfs ocfs2 pipefs proc ramfs rpc_pipefs securityfs selinuxfs sfs shfs smbfs sockfs spufs sshfs subfs supermount sysfs tmpfs ubifs udf usbfs vboxsf vperfctrfs" # Paths which are pruned from updatedb database PRUNEPATHS="/tmp /var/tmp /var/cache /var/lock /var/run /var/spool" diff --git a/xdg/autostart/gnome-user-share-obexpush.desktop b/xdg/autostart/gnome-user-share-obexpush.desktop new file mode 100644 index 00000000..bf47f649 --- /dev/null +++ b/xdg/autostart/gnome-user-share-obexpush.desktop @@ -0,0 +1,21 @@ +[Desktop Entry] +Name=Personal File Sharing +Name[de]=Persönliche Dateifreigabe +Name[en_GB]=Personal File Sharing +Name[ru]=Общий доступ к личным файлам +Name[vi]=Chia sẻ Tập tin Cá nhân +Comment=Launch Personal File Sharing if enabled +Comment[de]=Persönliche Dateifreigabe starten, wenn aktiv +Comment[en_GB]=Launch Personal File Sharing if enabled +Comment[ru]=Открыть общий доступ к личным файлам, если включено +Comment[vi]=Khởi chạy Chia sẻ tập tin cá nhân nếu được bật +Keywords=share;files;bluetooth;obex;http;network;copy;send; +Keywords[de]=Freigabe;Dateien;bluetooth;obex;http;Netzwerk;kopieren;Transfer; +Keywords[ru]=доступ;файлы;bluetooth;obex;http;сеть;копировать;отправить; +AutostartCondition=GSETTINGS org.gnome.desktop.file-sharing bluetooth-obexpush-enabled +Icon=folder-remote +Exec=/usr/libexec/gnome-user-share +Terminal=false +Type=Application +Categories= +OnlyShowIn=GNOME; diff --git a/xdg/autostart/gnome-user-share-webdav.desktop b/xdg/autostart/gnome-user-share-webdav.desktop new file mode 100644 index 00000000..03359749 --- /dev/null +++ b/xdg/autostart/gnome-user-share-webdav.desktop @@ -0,0 +1,21 @@ +[Desktop Entry] +Name=Personal File Sharing +Name[de]=Persönliche Dateifreigabe +Name[en_GB]=Personal File Sharing +Name[ru]=Общий доступ к личным файлам +Name[vi]=Chia sẻ Tập tin Cá nhân +Comment=Launch Personal File Sharing if enabled +Comment[de]=Persönliche Dateifreigabe starten, wenn aktiv +Comment[en_GB]=Launch Personal File Sharing if enabled +Comment[ru]=Открыть общий доступ к личным файлам, если включено +Comment[vi]=Khởi chạy Chia sẻ tập tin cá nhân nếu được bật +Keywords=share;files;bluetooth;obex;http;network;copy;send; +Keywords[de]=Freigabe;Dateien;bluetooth;obex;http;Netzwerk;kopieren;Transfer; +Keywords[ru]=доступ;файлы;bluetooth;obex;http;сеть;копировать;отправить; +AutostartCondition=GSETTINGS org.gnome.desktop.file-sharing enabled +Icon=folder-remote +Exec=/usr/libexec/gnome-user-share +Terminal=false +Type=Application +Categories= +OnlyShowIn=GNOME; diff --git a/xml/catalog b/xml/catalog index 15b27827..1567d818 100644 --- a/xml/catalog +++ b/xml/catalog @@ -3,7 +3,6 @@ - @@ -17,4 +16,5 @@ + -- 2.39.5