]> Frank Brehm's Git Trees - config/bruni/etc.git/commitdiff
Current state
authorFrank Brehm <frank@brehm-online.com>
Tue, 18 Sep 2012 07:04:21 +0000 (09:04 +0200)
committerFrank Brehm <frank@brehm-online.com>
Tue, 18 Sep 2012 07:04:21 +0000 (09:04 +0200)
31 files changed:
ImageMagick/delegates.xml
ImageMagick/quantization-table.xml
ImageMagick/sRGB.icc [deleted file]
conf.d/memcached [new file with mode: 0644]
config-archive/etc/postfix/main.cf
config-archive/etc/postfix/main.cf.1
config-archive/etc/postfix/main.cf.2 [new file with mode: 0644]
config-archive/etc/postfix/main.cf.dist
cups/printers.conf
env.d/77kde
gconf/gconf.xml.defaults/%gconf-tree.xml
group
group-
gshadow
gshadow-
init.d/memcached [new file with mode: 0755]
init.d/postfix
ld.so.conf
passwd
passwd-
php/apache2-php5.3/php.ini
php/cgi-php5.3/php.ini
php/cli-php5.3/php.ini
php/embed-php5.3/php.ini
php/fpm-php5.3/php.ini
portage/bashrc
portage/etckeeper [deleted file]
postfix/main.cf
postfix/master.cf
shadow
shadow-

index a21e0e7f1bfa6ec1df7a123bddb30aed7b23d961..a1135dc71807901d198a3b46fc6d249041f2a407 100644 (file)
 
   Set option delegate:bimodal=true to process bimodal delegates otherwise they
   are ignored.
+
+  If stealth="True" the delegate is not listed in user requested
+  "-list delegate" listings. These are typically special internal delegates.
+
+  If spawn="True" ImageMagick will not way for the delegate to finish,
+  nor will it read any output image.  It will only wait for either the input
+  file to be removed (See "ephemeral:" coder) indicating that the input file
+  has been read, or a maximum time limit of 2 seconds.
 -->
 <delegatemap>
   <delegate decode="autotrace" stealth="True" command="&quot;convert&quot; &quot;%i&quot; &quot;pnm:%u&quot;\n&quot;autotrace&quot; -input-format pnm -output-format svg -output-file &quot;%o&quot; &quot;%u&quot;"/>
   <delegate decode="blender" command="&quot;blender&quot; -b &quot;%i&quot; -F PNG -o &quot;%o&quot;&quot;\n&quot;convert&quot; -concatenate &quot;%o*.png&quot; &quot;%o&quot;"/>
-  <delegate decode="browse" stealth="True" spawn="True" command="&quot;xdg-open&quot; http://www.imagemagick.org/"/>
+  <delegate decode="browse" stealth="True" spawn="True" command="&quot;xdg-open&quot; http://www.imagemagick.org/; rm &quot;%i&quot;"/>
   <delegate decode="cdr" command="&quot;uniconvertor&quot; &quot;%i&quot; &quot;%o.svg&quot;; mv &quot;%o.svg&quot; &quot;%o&quot;"/>
   <delegate decode="cgm" thread-support="False" command="&quot;ralcgm&quot; -d ps -oC &lt; &quot;%i&quot; &gt; &quot;%o&quot; 2&gt; &quot;%Z&quot;"/>
   <delegate decode="dvi" command="&quot;dvips&quot; -q -o &quot;%o&quot; &quot;%i&quot;"/>
   <delegate decode="dng:decode" command="&quot;/usr/bin/ufraw-batch&quot; --silent --create-id=also --out-type=png --out-depth=16 &quot;--output=%u.png&quot; &quot;%i&quot;"/>
+  <delegate decode="dot" command='&quot;dot&quot; -Tsvg &quot;%i&quot; -o &quot;%o&quot;' />
   <delegate decode="edit" stealth="True" command="&quot;xterm&quot; -title &quot;Edit Image Comment&quot; -e vi &quot;%o&quot;"/>
   <delegate decode="eps" encode="pdf" mode="bi" command="&quot;gs&quot; -q -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 &quot;-sDEVICE=pdfwrite&quot; &quot;-sOutputFile=%o&quot; &quot;-f%i&quot;"/>
   <delegate decode="eps" encode="ps" mode="bi" command="&quot;gs&quot; -q -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=pswrite&quot; &quot;-sOutputFile=%o&quot; &quot;-f%i&quot;"/>
@@ -79,7 +88,7 @@
   <delegate decode="https" command="&quot;curl&quot; -s -k -o &quot;%o&quot; &quot;https:%M&quot;"/>
   <delegate decode="ilbm" command="&quot;ilbmtoppm&quot; &quot;%i&quot; &gt; &quot;%o&quot;"/>
   <delegate decode="man" command="&quot;groff&quot; -man -Tps &quot;%i&quot; &gt; &quot;%o&quot;"/>
-  <delegate decode="mpeg:decode" command="&quot;ffmpeg&quot; -v -1 -vframes %S -i &quot;%i&quot; -vcodec pam -an -f rawvideo -y &quot;%u.pam&quot; 2&gt; &quot;%Z&quot;"/>
+  <delegate decode="mpeg:decode" command="&quot;ffmpeg&quot; -v -1 -i &quot;%i&quot; -vframes %S -vcodec pam -an -f rawvideo -y &quot;%u.pam&quot; 2&gt; &quot;%Z&quot;"/>
   <delegate encode="mpeg:encode" stealth="True" command="&quot;ffmpeg&quot; -v -1 -mbd rd -trellis 2 -cmp 2 -subcmp 2 -g 300 -i &quot;%M%%d.jpg&quot; &quot;%u.%m&quot; 2&gt; &quot;%Z&quot;"/>
   <delegate decode="sid" command="&quot;mrsidgeodecode&quot; -if sid -i &quot;%i&quot; -of tif -o &quot;%o&quot; &gt; &quot;%u&quot;"/>
   <delegate decode="pcl:color" stealth="True" command="&quot;pcl6&quot; -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=ppmraw&quot; -dTextAlphaBits=%u -dGraphicsAlphaBits=%u &quot;-r%s&quot; %s &quot;-sOutputFile=%s&quot; &quot;%s&quot;"/>
@@ -89,7 +98,7 @@
   <delegate decode="pdf" encode="ps" mode="bi" command="&quot;gs&quot; -q -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=pswrite&quot; &quot;-sOutputFile=%o&quot; &quot;-f%i&quot;"/>
   <delegate decode="tiff" encode="launch" mode="encode" command="&quot;gimp&quot; &quot;%i&quot;"/>
   <delegate decode="pnm" encode="ilbm" mode="encode" command="&quot;ppmtoilbm&quot; -24if &quot;%i&quot; &gt; &quot;%o&quot;"/>
-  <delegate decode="pov" command="&quot;povray&quot; &quot;+i%i&quot; -D0 +o&quot;%o&quot; +fn%q +w%w +h%h +a -q9 -kfi&quot;%s&quot; -kff&quot;%n&quot;\n&quot;convert&quot; -concatenate &quot;%o*.png&quot; &quot;%o&quot;"/>
+  <delegate decode="pov" command="&quot;povray&quot; &quot;+i%i&quot; -D0 &quot;+o%o&quot; +fn%q +w%w +h%h +a -q9 &quot;-kfi%s&quot; &quot;-kff%n&quot;;&quot;convert&quot; -concatenate &quot;%o*.png&quot; &quot;%o&quot;"/>
   <delegate decode="ps" encode="eps" mode="bi" command="&quot;gs&quot; -q -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=epswrite&quot; &quot;-sOutputFile=%o&quot; &quot;-f%i&quot;"/>
   <delegate decode="ps" encode="pdf" mode="bi" command="&quot;gs&quot; -q -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 &quot;-sDEVICE=pdfwrite&quot; &quot;-sOutputFile=%o&quot; &quot;-f%i&quot;"/>
   <delegate decode="ps" encode="print" mode="encode" command="lpr &quot;%i&quot;"/>
index 9688f255582927942ebc82f6a9552cdfc32a84b2..b65555dc4acf6f89199f3eb778eb95d98f294b52 100644 (file)
   <table slot="1" alias="chrominance">
     <description>Chrominance Quantization Table</description>
     <levels width="8" height="8" divisor="1">
-      17,  18,  22,  31,  50,  92,   193,  465,
-      18,  19,  24,  33,  54,  98,   207,  498,
-      22,  24,  29,  41,  66,  120,  253,  609,
-      31,  33,  41,  57,  92,  169,  355,  854,
-      50,  54,  66,  92,  148, 271,  570,  1370,
-      92,  98,  120, 169, 271, 498,  1046, 2516,
+      17, 18, 22, 31, 50, 92, 193, 465,
+      18, 19, 24, 33, 54, 98, 207, 498,
+      22, 24, 29, 41, 66, 120, 253, 609,
+      31, 33, 41, 57, 92, 169, 355, 854,
+      50, 54, 66, 92, 148, 271, 570, 1370,
+      92, 98, 120, 169, 271, 498, 1046, 2516,
       193, 207, 253, 355, 570, 1046, 2198, 5289,
-      465, 498, 609, 854, 1370,2516, 5289, 12725
+      465, 498, 609, 854, 1370, 2516, 5289, 12725
     </levels>
   </table>
 </quantization-tables>
diff --git a/ImageMagick/sRGB.icc b/ImageMagick/sRGB.icc
deleted file mode 100644 (file)
index 6f3efbf..0000000
Binary files a/ImageMagick/sRGB.icc and /dev/null differ
diff --git a/conf.d/memcached b/conf.d/memcached
new file mode 100644 (file)
index 0000000..7acf662
--- /dev/null
@@ -0,0 +1,35 @@
+# Copyright 2003 Gentoo Technologies, Inc
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/files/1.3.3/conf,v 1.1 2009/05/26 00:03:09 robbat2 Exp $
+# memcached config file
+
+MEMCACHED_BINARY="/usr/bin/memcached"
+
+#Specify memory usage in megabytes (do not use letters)
+#64MB is default
+MEMUSAGE="64"
+
+#User to run as
+MEMCACHED_RUNAS="memcached"
+
+#Specify maximum number of concurrent connections
+#1024 is default
+MAXCONN="1024"
+
+#Listen for connections on what address?
+# If this is empty, memcached will listen on 0.0.0.0
+# be sure you have a firewall in place!
+LISTENON=""
+
+#Listen for connections on what port?
+PORT="11211"
+
+# Listen for UDP connecitons on what port? 0 means turn off UDP
+UDPPORT="${PORT}"
+
+#PID file location
+# '-${PORT}.${CONF}.pid' will be appended to this!
+# You do not normally need to change this.
+PIDBASE="/var/run/memcached/memcached"
+
+#Other Options
+MISC_OPTS=""
index 76d1551dda6c859ecd070fa6854ce4200fd9139a..03fb0bfa6fae81fca0290a22e00b561185b27819 100644 (file)
@@ -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
index dba4ff004da5ca7cf91cfb9b30a7415f72ef9938..76d1551dda6c859ecd070fa6854ce4200fd9139a 100644 (file)
@@ -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.2 b/config-archive/etc/postfix/main.cf.2
new file mode 100644 (file)
index 0000000..dba4ff0
--- /dev/null
@@ -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
+# <id_string>" where <id_string> 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
index 8526cf23cbfbd08999c8c3ef22d000cb908bc0b6..f608dfb50f66eb2d7023e685ae24ca5eed59e7f1 100644 (file)
@@ -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
@@ -458,7 +458,12 @@ unknown_local_recipient_reject_code = 550
 # 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
@@ -635,7 +640,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.
 #
@@ -648,5 +653,5 @@ 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/
index abcc32602bafb34b5989377130e77d246dd29b76..a278adf5cad9f3a18d28fca6091a29cf422b6f46 100644 (file)
@@ -1,5 +1,5 @@
 # Printer configuration file for CUPS v1.5.2
-# Written by cupsd on 2012-08-14 10:54
+# Written by cupsd on 2012-09-16 12:17
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <Printer Virtual_Printer>
 UUID urn:uuid:7ae9b14e-20ad-3628-427d-870cdf4cdea4
index 7de7362561f1e484420e26123ef5a07e4e54da6b..2d4479b56ff4089b23123252e1531bffbf81dbab 100644 (file)
@@ -1,3 +1,2 @@
 COLON_SEPARATED=QT_PLUGIN_PATH
 QT_PLUGIN_PATH=/usr/lib64/kde4/plugins
-LDPATH="/usr/lib64/kde4"
index 62d469f262491c117ef3eb94a7c99118f23705d7..8a8590084885ded1195cd796278975bc8df5d5e2 100644 (file)
                        </dir>
                        <dir name="url-handlers">
                                <dir name="ymsgr">
-                                       <entry name="needs_terminal" mtime="1338419853" schema="/schemas/desktop/gnome/url-handlers/ymsgr/needs_terminal"/>
-                                       <entry name="command" mtime="1338419853" schema="/schemas/desktop/gnome/url-handlers/ymsgr/command"/>
-                                       <entry name="enabled" mtime="1338419853" schema="/schemas/desktop/gnome/url-handlers/ymsgr/enabled"/>
+                                       <entry name="needs_terminal" mtime="1344942348" schema="/schemas/desktop/gnome/url-handlers/ymsgr/needs_terminal"/>
+                                       <entry name="command" mtime="1344942348" schema="/schemas/desktop/gnome/url-handlers/ymsgr/command"/>
+                                       <entry name="enabled" mtime="1344942348" schema="/schemas/desktop/gnome/url-handlers/ymsgr/enabled"/>
                                </dir>
                                <dir name="xmpp">
-                                       <entry name="needs_terminal" mtime="1338419853" schema="/schemas/desktop/gnome/url-handlers/xmpp/needs_terminal"/>
-                                       <entry name="command" mtime="1338419853" schema="/schemas/desktop/gnome/url-handlers/xmpp/command"/>
-                                       <entry name="enabled" mtime="1338419853" schema="/schemas/desktop/gnome/url-handlers/xmpp/enabled"/>
+                                       <entry name="needs_terminal" mtime="1344942348" schema="/schemas/desktop/gnome/url-handlers/xmpp/needs_terminal"/>
+                                       <entry name="command" mtime="1344942348" schema="/schemas/desktop/gnome/url-handlers/xmpp/command"/>
+                                       <entry name="enabled" mtime="1344942348" schema="/schemas/desktop/gnome/url-handlers/xmpp/enabled"/>
                                </dir>
                                <dir name="sip">
-                                       <entry name="needs_terminal" mtime="1338419853" schema="/schemas/desktop/gnome/url-handlers/sip/needs_terminal"/>
-                                       <entry name="command" mtime="1338419853" schema="/schemas/desktop/gnome/url-handlers/sip/command"/>
-                                       <entry name="enabled" mtime="1338419853" schema="/schemas/desktop/gnome/url-handlers/sip/enabled"/>
+                                       <entry name="needs_terminal" mtime="1344942348" schema="/schemas/desktop/gnome/url-handlers/sip/needs_terminal"/>
+                                       <entry name="command" mtime="1344942348" schema="/schemas/desktop/gnome/url-handlers/sip/command"/>
+                                       <entry name="enabled" mtime="1344942348" schema="/schemas/desktop/gnome/url-handlers/sip/enabled"/>
                                </dir>
                                <dir name="msnim">
-                                       <entry name="needs_terminal" mtime="1338419853" schema="/schemas/desktop/gnome/url-handlers/msnim/needs_terminal"/>
-                                       <entry name="command" mtime="1338419853" schema="/schemas/desktop/gnome/url-handlers/msnim/command"/>
-                                       <entry name="enabled" mtime="1338419853" schema="/schemas/desktop/gnome/url-handlers/msnim/enabled"/>
+                                       <entry name="needs_terminal" mtime="1344942348" schema="/schemas/desktop/gnome/url-handlers/msnim/needs_terminal"/>
+                                       <entry name="command" mtime="1344942348" schema="/schemas/desktop/gnome/url-handlers/msnim/command"/>
+                                       <entry name="enabled" mtime="1344942348" schema="/schemas/desktop/gnome/url-handlers/msnim/enabled"/>
                                </dir>
                                <dir name="irc">
-                                       <entry name="needs_terminal" mtime="1338419853" schema="/schemas/desktop/gnome/url-handlers/irc/needs_terminal"/>
-                                       <entry name="command" mtime="1338419853" schema="/schemas/desktop/gnome/url-handlers/irc/command"/>
-                                       <entry name="enabled" mtime="1338419853" schema="/schemas/desktop/gnome/url-handlers/irc/enabled"/>
+                                       <entry name="needs_terminal" mtime="1344942348" schema="/schemas/desktop/gnome/url-handlers/irc/needs_terminal"/>
+                                       <entry name="command" mtime="1344942348" schema="/schemas/desktop/gnome/url-handlers/irc/command"/>
+                                       <entry name="enabled" mtime="1344942348" schema="/schemas/desktop/gnome/url-handlers/irc/enabled"/>
                                </dir>
                                <dir name="icq">
-                                       <entry name="needs_terminal" mtime="1338419853" schema="/schemas/desktop/gnome/url-handlers/icq/needs_terminal"/>
-                                       <entry name="command" mtime="1338419853" schema="/schemas/desktop/gnome/url-handlers/icq/command"/>
-                                       <entry name="enabled" mtime="1338419853" schema="/schemas/desktop/gnome/url-handlers/icq/enabled"/>
+                                       <entry name="needs_terminal" mtime="1344942348" schema="/schemas/desktop/gnome/url-handlers/icq/needs_terminal"/>
+                                       <entry name="command" mtime="1344942348" schema="/schemas/desktop/gnome/url-handlers/icq/command"/>
+                                       <entry name="enabled" mtime="1344942348" schema="/schemas/desktop/gnome/url-handlers/icq/enabled"/>
                                </dir>
                                <dir name="gg">
-                                       <entry name="needs_terminal" mtime="1338419853" schema="/schemas/desktop/gnome/url-handlers/gg/needs_terminal"/>
-                                       <entry name="command" mtime="1338419853" schema="/schemas/desktop/gnome/url-handlers/gg/command"/>
-                                       <entry name="enabled" mtime="1338419853" schema="/schemas/desktop/gnome/url-handlers/gg/enabled"/>
+                                       <entry name="needs_terminal" mtime="1344942348" schema="/schemas/desktop/gnome/url-handlers/gg/needs_terminal"/>
+                                       <entry name="command" mtime="1344942348" schema="/schemas/desktop/gnome/url-handlers/gg/command"/>
+                                       <entry name="enabled" mtime="1344942348" schema="/schemas/desktop/gnome/url-handlers/gg/enabled"/>
                                </dir>
                                <dir name="icyx">
                                        <entry name="enabled" mtime="1331569282" schema="/schemas/desktop/gnome/url-handlers/icyx/enabled"/>
                                        <entry name="enabled" mtime="1326729921" schema="/schemas/desktop/gnome/url-handlers/callto/enabled"/>
                                </dir>
                                <dir name="aim">
-                                       <entry name="needs_terminal" mtime="1338419853" schema="/schemas/desktop/gnome/url-handlers/aim/needs_terminal"/>
-                                       <entry name="command" mtime="1338419853" schema="/schemas/desktop/gnome/url-handlers/aim/command"/>
-                                       <entry name="enabled" mtime="1338419853" schema="/schemas/desktop/gnome/url-handlers/aim/enabled"/>
+                                       <entry name="needs_terminal" mtime="1344942348" schema="/schemas/desktop/gnome/url-handlers/aim/needs_terminal"/>
+                                       <entry name="command" mtime="1344942348" schema="/schemas/desktop/gnome/url-handlers/aim/command"/>
+                                       <entry name="enabled" mtime="1344942347" schema="/schemas/desktop/gnome/url-handlers/aim/enabled"/>
                                </dir>
                                <dir name="mailto">
                                        <entry name="needs_terminal" mtime="1326729921" schema="/schemas/desktop/gnome/url-handlers/mailto/needs_terminal"/>
@@ -18073,13 +18073,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>evince-thumbnailer -s %s %u %o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1342526498" type="schema" stype="bool" owner="evince">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18089,13 +18087,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>evince-thumbnailer -s %s %u %o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1342526498" type="schema" stype="bool" owner="evince">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18105,13 +18101,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>evince-thumbnailer -s %s %u %o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1342526498" type="schema" stype="bool" owner="evince">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -18121,13 +18115,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <default type="string">
                                                                        <stringvalue>evince-thumbnailer -s %s %u %o</stringvalue>
                                                                </default>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                                <entry name="enable" mtime="1342526498" type="schema" stype="bool" owner="evince">
                                                        <local_schema locale="C" short_desc="">
                                                                <default type="bool" value="true"/>
-                                                               <longdesc></longdesc>
                                                        </local_schema>
                                                </entry>
                                        </dir>
@@ -19799,13 +19791,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                </dir>
                                <dir name="url-handlers">
                                        <dir name="ymsgr">
-                                               <entry name="needs_terminal" mtime="1338419853" type="schema" stype="bool" owner="purple">
+                                               <entry name="needs_terminal" mtime="1344942348" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Run the command in a terminal">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>True if the command used to handle this type of URL should be run in a terminal.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="command" mtime="1338419853" type="schema" stype="string" owner="purple">
+                                               <entry name="command" mtime="1344942348" type="schema" stype="string" owner="purple">
                                                        <local_schema locale="C" short_desc="The handler for &quot;ymsgr&quot; URLs">
                                                                <default type="string">
                                                                        <stringvalue>purple-url-handler &quot;%s&quot;</stringvalue>
@@ -19813,7 +19805,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The command used to handle &quot;ymsgr&quot; URLs, if enabled.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enabled" mtime="1338419853" type="schema" stype="bool" owner="purple">
+                                               <entry name="enabled" mtime="1344942348" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Whether the specified command should handle &quot;ymsgr&quot; URLs">
                                                                <default type="bool" value="true"/>
                                                                <longdesc>True if the command specified in the &quot;command&quot; key should handle &quot;ymsgr&quot; URLs.</longdesc>
@@ -19821,13 +19813,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </entry>
                                        </dir>
                                        <dir name="xmpp">
-                                               <entry name="needs_terminal" mtime="1338419853" type="schema" stype="bool" owner="purple">
+                                               <entry name="needs_terminal" mtime="1344942348" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Run the command in a terminal">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>True if the command used to handle this type of URL should be run in a terminal.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="command" mtime="1338419853" type="schema" stype="string" owner="purple">
+                                               <entry name="command" mtime="1344942348" type="schema" stype="string" owner="purple">
                                                        <local_schema locale="C" short_desc="The handler for &quot;xmpp&quot; URLs">
                                                                <default type="string">
                                                                        <stringvalue>purple-url-handler &quot;%s&quot;</stringvalue>
@@ -19835,7 +19827,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The command used to handle &quot;xmpp&quot; URLs, if enabled.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enabled" mtime="1338419853" type="schema" stype="bool" owner="purple">
+                                               <entry name="enabled" mtime="1344942348" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Whether the specified command should handle &quot;xmpp&quot; URLs">
                                                                <default type="bool" value="true"/>
                                                                <longdesc>True if the command specified in the &quot;command&quot; key should handle &quot;xmpp&quot; URLs.</longdesc>
@@ -19843,13 +19835,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </entry>
                                        </dir>
                                        <dir name="sip">
-                                               <entry name="needs_terminal" mtime="1338419853" type="schema" stype="bool" owner="purple">
+                                               <entry name="needs_terminal" mtime="1344942348" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Run the command in a terminal">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>True if the command used to handle this type of URL should be run in a terminal.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="command" mtime="1338419853" type="schema" stype="string" owner="purple">
+                                               <entry name="command" mtime="1344942348" type="schema" stype="string" owner="purple">
                                                        <local_schema locale="C" short_desc="The handler for &quot;sip&quot; URLs">
                                                                <default type="string">
                                                                        <stringvalue>purple-url-handler &quot;%s&quot;</stringvalue>
@@ -19857,7 +19849,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The command used to handle &quot;sip&quot; URLs, if enabled.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enabled" mtime="1338419853" type="schema" stype="bool" owner="purple">
+                                               <entry name="enabled" mtime="1344942348" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Whether the specified command should handle &quot;sip&quot; URLs">
                                                                <default type="bool" value="true"/>
                                                                <longdesc>True if the command specified in the &quot;command&quot; key should handle &quot;sip&quot; URLs.</longdesc>
@@ -19865,13 +19857,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </entry>
                                        </dir>
                                        <dir name="msnim">
-                                               <entry name="needs_terminal" mtime="1338419853" type="schema" stype="bool" owner="purple">
+                                               <entry name="needs_terminal" mtime="1344942348" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Run the command in a terminal">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>True if the command used to handle this type of URL should be run in a terminal.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="command" mtime="1338419853" type="schema" stype="string" owner="purple">
+                                               <entry name="command" mtime="1344942348" type="schema" stype="string" owner="purple">
                                                        <local_schema locale="C" short_desc="The handler for &quot;msnim&quot; URLs">
                                                                <default type="string">
                                                                        <stringvalue>purple-url-handler &quot;%s&quot;</stringvalue>
@@ -19879,7 +19871,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The command used to handle &quot;msnim&quot; URLs, if enabled.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enabled" mtime="1338419853" type="schema" stype="bool" owner="purple">
+                                               <entry name="enabled" mtime="1344942348" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Whether the specified command should handle &quot;msnim&quot; URLs">
                                                                <default type="bool" value="true"/>
                                                                <longdesc>True if the command specified in the &quot;command&quot; key should handle &quot;msnim&quot; URLs.</longdesc>
@@ -19887,13 +19879,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </entry>
                                        </dir>
                                        <dir name="irc">
-                                               <entry name="needs_terminal" mtime="1338419853" type="schema" stype="bool" owner="purple">
+                                               <entry name="needs_terminal" mtime="1344942348" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Run the command in a terminal">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>True if the command used to handle this type of URL should be run in a terminal.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="command" mtime="1338419853" type="schema" stype="string" owner="purple">
+                                               <entry name="command" mtime="1344942348" type="schema" stype="string" owner="purple">
                                                        <local_schema locale="C" short_desc="The handler for &quot;irc&quot; URLs">
                                                                <default type="string">
                                                                        <stringvalue>purple-url-handler &quot;%s&quot;</stringvalue>
@@ -19901,7 +19893,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The command used to handle &quot;irc&quot; URLs, if enabled.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enabled" mtime="1338419853" type="schema" stype="bool" owner="purple">
+                                               <entry name="enabled" mtime="1344942348" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Whether the specified command should handle &quot;irc&quot; URLs">
                                                                <default type="bool" value="true"/>
                                                                <longdesc>True if the command specified in the &quot;command&quot; key should handle &quot;irc&quot; URLs.</longdesc>
@@ -19909,13 +19901,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </entry>
                                        </dir>
                                        <dir name="icq">
-                                               <entry name="needs_terminal" mtime="1338419853" type="schema" stype="bool" owner="purple">
+                                               <entry name="needs_terminal" mtime="1344942348" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Run the command in a terminal">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>True if the command used to handle this type of URL should be run in a terminal.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="command" mtime="1338419853" type="schema" stype="string" owner="purple">
+                                               <entry name="command" mtime="1344942348" type="schema" stype="string" owner="purple">
                                                        <local_schema locale="C" short_desc="The handler for &quot;icq&quot; URLs">
                                                                <default type="string">
                                                                        <stringvalue>purple-url-handler &quot;%s&quot;</stringvalue>
@@ -19923,7 +19915,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The command used to handle &quot;icq&quot; URLs, if enabled.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enabled" mtime="1338419853" type="schema" stype="bool" owner="purple">
+                                               <entry name="enabled" mtime="1344942348" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Whether the specified command should handle &quot;icq&quot; URLs">
                                                                <default type="bool" value="true"/>
                                                                <longdesc>True if the command specified in the &quot;command&quot; key should handle &quot;icq&quot; URLs.</longdesc>
@@ -19931,13 +19923,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </entry>
                                        </dir>
                                        <dir name="gg">
-                                               <entry name="needs_terminal" mtime="1338419853" type="schema" stype="bool" owner="purple">
+                                               <entry name="needs_terminal" mtime="1344942348" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Run the command in a terminal">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>True if the command used to handle this type of URL should be run in a terminal.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="command" mtime="1338419853" type="schema" stype="string" owner="purple">
+                                               <entry name="command" mtime="1344942348" type="schema" stype="string" owner="purple">
                                                        <local_schema locale="C" short_desc="The handler for &quot;gg&quot; URLs">
                                                                <default type="string">
                                                                        <stringvalue>purple-url-handler &quot;%s&quot;</stringvalue>
@@ -19945,7 +19937,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The command used to handle &quot;gg&quot; URLs, if enabled.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enabled" mtime="1338419853" type="schema" stype="bool" owner="purple">
+                                               <entry name="enabled" mtime="1344942348" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Whether the specified command should handle &quot;gg&quot; URLs">
                                                                <default type="bool" value="true"/>
                                                                <longdesc>True if the command specified in the &quot;command&quot; key should handle &quot;gg&quot; URLs.</longdesc>
@@ -20231,13 +20223,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                </entry>
                                        </dir>
                                        <dir name="aim">
-                                               <entry name="needs_terminal" mtime="1338419853" type="schema" stype="bool" owner="purple">
+                                               <entry name="needs_terminal" mtime="1344942348" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Run the command in a terminal">
                                                                <default type="bool" value="false"/>
                                                                <longdesc>True if the command used to handle this type of URL should be run in a terminal.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="command" mtime="1338419853" type="schema" stype="string" owner="purple">
+                                               <entry name="command" mtime="1344942348" type="schema" stype="string" owner="purple">
                                                        <local_schema locale="C" short_desc="The handler for &quot;aim&quot; URLs">
                                                                <default type="string">
                                                                        <stringvalue>purple-url-handler &quot;%s&quot;</stringvalue>
@@ -20245,7 +20237,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                                                <longdesc>The command used to handle &quot;aim&quot; URLs, if enabled.</longdesc>
                                                        </local_schema>
                                                </entry>
-                                               <entry name="enabled" mtime="1338419853" type="schema" stype="bool" owner="purple">
+                                               <entry name="enabled" mtime="1344942348" type="schema" stype="bool" owner="purple">
                                                        <local_schema locale="C" short_desc="Whether the specified command should handle &quot;aim&quot; URLs">
                                                                <default type="bool" value="true"/>
                                                                <longdesc>True if the command specified in the &quot;command&quot; key should handle &quot;aim&quot; URLs.</longdesc>
diff --git a/group b/group
index 1f5575793ecb914a06b86944798240b0ff882fe0..cda8757712c6c9d68a1af1ddc3fc8eaf84d1fd26 100644 (file)
--- a/group
+++ b/group
@@ -63,3 +63,4 @@ hsqldb:x:991:
 postgres:x:70:
 realtime:x:990:
 vboxusers:x:989:frank
+dropbox:x:988:
diff --git a/group- b/group-
index 70fe6436c106dc89b72b4e3ce8f6ce966303aae8..1f5575793ecb914a06b86944798240b0ff882fe0 100644 (file)
--- a/group-
+++ b/group-
@@ -23,7 +23,7 @@ users:x:100:
 portage:x:250:portage
 utmp:x:406:
 nogroup:x:65533:
-nobody:x:65534:
+nobody:x:65534:frank,doris,heiko,patrick,robert,steffen
 man:x:15:
 sshd:x:22:
 cron:x:16:frank,heiko,patrick,vivi,doris,robert,steffen
@@ -62,3 +62,4 @@ postdrop:x:208:
 hsqldb:x:991:
 postgres:x:70:
 realtime:x:990:
+vboxusers:x:989:frank
diff --git a/gshadow b/gshadow
index 217ca8de3e608fdd5457880c85cb68c37600412f..8f99cfd506799a557ff9ccd93ccb8559bc0a73c3 100644 (file)
--- a/gshadow
+++ b/gshadow
@@ -61,3 +61,4 @@ hsqldb:!::
 postgres:!::
 realtime:!::
 vboxusers:!::
+dropbox:!::
index 20c6284d4f6518603d207d7bfca6d66c774b605b..217ca8de3e608fdd5457880c85cb68c37600412f 100644 (file)
--- a/gshadow-
+++ b/gshadow-
@@ -60,3 +60,4 @@ postdrop:!::
 hsqldb:!::
 postgres:!::
 realtime:!::
+vboxusers:!::
diff --git a/init.d/memcached b/init.d/memcached
new file mode 100755 (executable)
index 0000000..6c9d2a6
--- /dev/null
@@ -0,0 +1,78 @@
+#!/sbin/runscript
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/files/1.3.3/init,v 1.2 2011/12/31 20:36:20 idl0r Exp $
+
+CONF="${SVCNAME#*.}"
+CONFBASE="/etc/conf.d/memcached"
+
+[ -z "${PIDBASE}" ] && PIDBASE="/var/run/memcached/memcached"
+[ "${CONF}" == "memcached" ] && CONF=''
+
+if [ -n "${CONF}" ]; then
+        PIDFILE="${PIDBASE}-${PORT}.${CONF}.pid"
+        CONFSRC="${CONFBASE}.${CONF}"
+        if [ -f "${CONFSRC}" ]; then
+         source "${CONFSRC}"
+        else
+         eerror "The configuration file $CONFSRC was not found!"
+        fi
+else
+        PIDFILE="${PIDBASE}-${PORT}.pid"
+        CONFSRC="${CONFBASE}"
+fi
+
+depend() {
+        need net
+               # per bug #269022, accurate time is important for memcached!
+               # We include the full list of ways it might be set on boot.
+               after ntp-client ntpd rdate openrdate adjtimex hwclock
+}
+
+checkconfig() {
+        if [ -z "${LISTENON}" ]; then
+          ewarn "You should edit $CONFSRC and specify an address to listen on."
+          ewarn "Listening on any address (check your firewall!)"
+        fi
+}
+
+start() {
+        if [ -n "${CONF}" ]; then
+                ebegin "Starting memcached (${CONF})"
+        else
+                ebegin "Starting memcached"
+        fi
+        checkconfig
+        local dir="$(dirname ${PIDFILE})"
+        if [ ! -d "${dir}" ]; then
+          einfo " Creating ${dir}"
+          mkdir -p "${dir}"
+        fi
+        chown ${MEMCACHED_RUNAS} "${dir}"
+        if [ -f "${PIDFILE}" ]; then
+          einfo "  Removing stale pidfile ${PIDFILE}"
+          rm -f "${PIDFILE}" 1>/dev/null
+        fi
+
+        if [ -z "${LISTENON}" ]; then
+          c_LISTENON=""
+        else
+          c_LISTENON="-l ${LISTENON}"
+        fi
+
+        /sbin/start-stop-daemon --start --pidfile "${PIDFILE}" \
+                --exec "${MEMCACHED_BINARY}" -- \
+                -d -p ${PORT} -U ${UDPPORT} ${c_LISTENON} -m ${MEMUSAGE} \
+                -c ${MAXCONN} -u ${MEMCACHED_RUNAS} -P "${PIDFILE}" \
+                               ${MISC_OPTS}
+        eend $?
+}
+
+stop() {
+        if [ -n "${CONF}" ]; then
+                ebegin "Stopping memcached (${CONF})"
+        else
+                ebegin "Stopping memcached"
+        fi
+        start-stop-daemon --stop --quiet --pidfile "${PIDFILE}"
+        rm -f "${PIDFILE}"
+        eend $?
+}
index b62bb7ff42e1851179bb205a6f96305778e275e4..aecd8e71f9d809207e56359f6ff8ba26b93467c5 100755 (executable)
@@ -1,48 +1,86 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/files/postfix.rc6.2.5,v 1.4 2011/10/24 12:52:32 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/files/postfix.rc6.2.7,v 1.2 2012/03/07 10:27:37 eras Exp $
 
-# If you plan to simultaneously use several Postfix instances, don't forget
-# to specify your alternate_config_directories variable in your main main.cf file.
-# Then make a symlink from /etc/init.d/postfix to /etc/init.d/postfix.alt,
-# prepare your new /etc/postfix.alt environment, and at least change these working paths:
-# queue_directory = /var/spool/postfix.alt
-# data_directory = /var/lib/postfix.alt
+extra_started_commands="reload abort flush"
 
+description_reload="Re-read configuration files. Running processes terminate at their earliest convenience."
+description_abort="Stop the Postfix mail system abruptly. Running processes are signaled to stop immediately."
+description_flush="Force delivery: attempt to deliver every message in the deferred mail queue."
+
+# Please read http://www.postfix.org/MULTI_INSTANCE_README.html for multi instance support
 CONF_DIR="/etc/postfix"
 CONF_OPT="${SVCNAME##*.}"
 if [ -n ${CONF_OPT} -a ${SVCNAME} != "postfix" ]; then
        CONF_DIR="${CONF_DIR}.${CONF_OPT}"
 fi
-
-extra_started_commands="reload"
+if [ "${CONF_DIR}" = "/etc/postfix" ]; then
+       CONF_PARAM=""
+       CONF_MESSAGE=""
+else
+       CONF_PARAM="-c ${CONF_DIR}"
+       CONF_MESSAGE="(${CONF_DIR})"
+fi
 
 depend() {
-       use logger dns ypbind amavisd mysql postgresql antivirus postfix_greylist net saslauthd
+       use logger dns ypbind amavisd antivirus postfix_greylist net saslauthd
        if [ "${SVCNAME}" = "postfix" ]; then
                provide mta
        fi
 }
 
 start() {
-       ebegin "Starting postfix (${CONF_DIR})"
+       if [ ! -z "${CONF_PARAM}" ]; then
+               einfo "Please consider updating your config for postmulti support."
+       fi
+       ebegin "Starting postfix ${CONF_MESSAGE}"
        if [ ! -d ${CONF_DIR} ]; then
                eend 1 "${CONF_DIR} does not exist"
                return 1
        fi
-       /usr/sbin/postfix -c ${CONF_DIR} start >/dev/null 2>&1
+       /usr/sbin/postfix ${CONF_PARAM} start >/dev/null 2>&1
        eend $?
 }
 
 stop() {
-       ebegin "Stopping postfix (${CONF_DIR})"
-       /usr/sbin/postfix -c ${CONF_DIR} stop >/dev/null 2>&1
-       eend $?
+       ebegin "Stopping postfix ${CONF_MESSAGE}"
+       /usr/sbin/postfix ${CONF_PARAM} stop >/dev/null 2>&1
+       eend
+}
+
+status() {
+       local _retval
+       einfon ""
+       /usr/sbin/postfix ${CONF_PARAM} status
+       _retval=$?
+       if [ x${_retval} = 'x0' ]; then
+               mark_service_started "${SVCNAME}"
+               eend 0
+       else
+               mark_service_stopped "${SVCNAME}"
+               eend 3
+       fi
 }
 
 reload() {
-       ebegin "Reloading postfix (${CONF_DIR})"
-       /usr/sbin/postfix -c ${CONF_DIR} reload >/dev/null 2>&1
+       ebegin "Reloading postfix ${CONF_MESSAGE}"
+       /usr/sbin/postfix ${CONF_PARAM} reload >/dev/null 2>&1
+       eend $?
+}
+
+abort() {
+       ebegin "Aborting postfix ${CONF_MESSAGE}"
+
+       if service_started "${SVCNAME}"; then
+               mark_service_stopped "${SVCNAME}"
+       fi
+       /usr/sbin/postfix ${CONF_PARAM} abort >/dev/null 2>&1
+       eend $?
+}
+
+flush() {
+       ebegin "Flushing postfix ${CONF_MESSAGE}"
+       /usr/sbin/postfix ${CONF_PARAM} flush >/dev/null 2>&1
        eend $?
 }
index 5c9abda9dd98a9046768367bc063b776fc39b7aa..88b39f3fa37b28185aaae0ee0b48443745807c5d 100644 (file)
@@ -21,7 +21,6 @@ include ld.so.conf.d/*.conf
 /usr/lib64/postgresql-9.1/lib64/
 /usr/lib64/sidplay/builders
 /usr/lib/sidplay/builders
-/usr/lib64/kde4
 /usr/games/lib64
 /usr/games/lib32
 /usr/games/lib
diff --git a/passwd b/passwd
index ef0135b8da9cba14834b7cdebec3ad8b3568f82c..d458e9327e31c609e17724e492651b87fb1a65a0 100644 (file)
--- a/passwd
+++ b/passwd
@@ -49,3 +49,4 @@ dovenull:x:113:113:added by portage for dovecot:/dev/null:/sbin/nologin
 postfix:x:207:207:added by portage for postfix:/var/spool/postfix:/sbin/nologin
 hsqldb:x:114:991:added by portage for hsqldb:/dev/null:/bin/sh
 postgres:x:70:70:added by portage for postgresql-server:/var/lib/postgresql:/bin/bash
+memcached:x:115:2:added by portage for memcached:/dev/null:/sbin/nologin
diff --git a/passwd- b/passwd-
index 9373277924a1eaa3236184a264f30f85c5581264..ef0135b8da9cba14834b7cdebec3ad8b3568f82c 100644 (file)
--- a/passwd-
+++ b/passwd-
@@ -48,3 +48,4 @@ dovecot:x:97:97:added by portage for dovecot:/dev/null:/sbin/nologin
 dovenull:x:113:113:added by portage for dovecot:/dev/null:/sbin/nologin
 postfix:x:207:207:added by portage for postfix:/var/spool/postfix:/sbin/nologin
 hsqldb:x:114:991:added by portage for hsqldb:/dev/null:/bin/sh
+postgres:x:70:70:added by portage for postgresql-server:/var/lib/postgresql:/bin/bash
index 69d58d41f97d3da5ff79ee3c602f4c712efb58a0..24e78a6ce02fac63b24bd937c372b1221494a5c8 100644 (file)
@@ -842,7 +842,7 @@ enable_dl = Off
 ; will look for to know it is OK to continue execution.  Setting this variable MAY
 ; cause security issues, KNOW WHAT YOU ARE DOING FIRST.
 ; http://php.net/cgi.redirect-status-env
-;cgi.redirect_status_env = ;
+;cgi.redirect_status_env = 
 
 ; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI.  PHP's
 ; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok
@@ -859,7 +859,7 @@ enable_dl = Off
 ; does not currently support this feature (03/17/2002)
 ; Set to 1 if running under IIS.  Default is zero.
 ; http://php.net/fastcgi.impersonate
-;fastcgi.impersonate = 1;
+;fastcgi.impersonate = 1
 
 ; Disable logging through FastCGI connection. PHP's default behavior is to enable
 ; this feature.
@@ -1909,7 +1909,7 @@ ldap.max_links = -1
 
 [xsl]
 ; Write operations from within XSLT are disabled by default.
-; XSL_SECPREF_CREATE_DIRECTORY | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_WRITE_FILE = 44
+; XSL_SECPREF_CREATE_DIRECTORY | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_WRITE_FILE = 44
 ; Set it to 0 to allow all operations
 ;xsl.security_prefs = 44
 
index 69d58d41f97d3da5ff79ee3c602f4c712efb58a0..24e78a6ce02fac63b24bd937c372b1221494a5c8 100644 (file)
@@ -842,7 +842,7 @@ enable_dl = Off
 ; will look for to know it is OK to continue execution.  Setting this variable MAY
 ; cause security issues, KNOW WHAT YOU ARE DOING FIRST.
 ; http://php.net/cgi.redirect-status-env
-;cgi.redirect_status_env = ;
+;cgi.redirect_status_env = 
 
 ; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI.  PHP's
 ; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok
@@ -859,7 +859,7 @@ enable_dl = Off
 ; does not currently support this feature (03/17/2002)
 ; Set to 1 if running under IIS.  Default is zero.
 ; http://php.net/fastcgi.impersonate
-;fastcgi.impersonate = 1;
+;fastcgi.impersonate = 1
 
 ; Disable logging through FastCGI connection. PHP's default behavior is to enable
 ; this feature.
@@ -1909,7 +1909,7 @@ ldap.max_links = -1
 
 [xsl]
 ; Write operations from within XSLT are disabled by default.
-; XSL_SECPREF_CREATE_DIRECTORY | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_WRITE_FILE = 44
+; XSL_SECPREF_CREATE_DIRECTORY | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_WRITE_FILE = 44
 ; Set it to 0 to allow all operations
 ;xsl.security_prefs = 44
 
index 69d58d41f97d3da5ff79ee3c602f4c712efb58a0..24e78a6ce02fac63b24bd937c372b1221494a5c8 100644 (file)
@@ -842,7 +842,7 @@ enable_dl = Off
 ; will look for to know it is OK to continue execution.  Setting this variable MAY
 ; cause security issues, KNOW WHAT YOU ARE DOING FIRST.
 ; http://php.net/cgi.redirect-status-env
-;cgi.redirect_status_env = ;
+;cgi.redirect_status_env = 
 
 ; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI.  PHP's
 ; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok
@@ -859,7 +859,7 @@ enable_dl = Off
 ; does not currently support this feature (03/17/2002)
 ; Set to 1 if running under IIS.  Default is zero.
 ; http://php.net/fastcgi.impersonate
-;fastcgi.impersonate = 1;
+;fastcgi.impersonate = 1
 
 ; Disable logging through FastCGI connection. PHP's default behavior is to enable
 ; this feature.
@@ -1909,7 +1909,7 @@ ldap.max_links = -1
 
 [xsl]
 ; Write operations from within XSLT are disabled by default.
-; XSL_SECPREF_CREATE_DIRECTORY | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_WRITE_FILE = 44
+; XSL_SECPREF_CREATE_DIRECTORY | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_WRITE_FILE = 44
 ; Set it to 0 to allow all operations
 ;xsl.security_prefs = 44
 
index 69d58d41f97d3da5ff79ee3c602f4c712efb58a0..24e78a6ce02fac63b24bd937c372b1221494a5c8 100644 (file)
@@ -842,7 +842,7 @@ enable_dl = Off
 ; will look for to know it is OK to continue execution.  Setting this variable MAY
 ; cause security issues, KNOW WHAT YOU ARE DOING FIRST.
 ; http://php.net/cgi.redirect-status-env
-;cgi.redirect_status_env = ;
+;cgi.redirect_status_env = 
 
 ; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI.  PHP's
 ; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok
@@ -859,7 +859,7 @@ enable_dl = Off
 ; does not currently support this feature (03/17/2002)
 ; Set to 1 if running under IIS.  Default is zero.
 ; http://php.net/fastcgi.impersonate
-;fastcgi.impersonate = 1;
+;fastcgi.impersonate = 1
 
 ; Disable logging through FastCGI connection. PHP's default behavior is to enable
 ; this feature.
@@ -1909,7 +1909,7 @@ ldap.max_links = -1
 
 [xsl]
 ; Write operations from within XSLT are disabled by default.
-; XSL_SECPREF_CREATE_DIRECTORY | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_WRITE_FILE = 44
+; XSL_SECPREF_CREATE_DIRECTORY | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_WRITE_FILE = 44
 ; Set it to 0 to allow all operations
 ;xsl.security_prefs = 44
 
index 69d58d41f97d3da5ff79ee3c602f4c712efb58a0..24e78a6ce02fac63b24bd937c372b1221494a5c8 100644 (file)
@@ -842,7 +842,7 @@ enable_dl = Off
 ; will look for to know it is OK to continue execution.  Setting this variable MAY
 ; cause security issues, KNOW WHAT YOU ARE DOING FIRST.
 ; http://php.net/cgi.redirect-status-env
-;cgi.redirect_status_env = ;
+;cgi.redirect_status_env = 
 
 ; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI.  PHP's
 ; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok
@@ -859,7 +859,7 @@ enable_dl = Off
 ; does not currently support this feature (03/17/2002)
 ; Set to 1 if running under IIS.  Default is zero.
 ; http://php.net/fastcgi.impersonate
-;fastcgi.impersonate = 1;
+;fastcgi.impersonate = 1
 
 ; Disable logging through FastCGI connection. PHP's default behavior is to enable
 ; this feature.
@@ -1909,7 +1909,7 @@ ldap.max_links = -1
 
 [xsl]
 ; Write operations from within XSLT are disabled by default.
-; XSL_SECPREF_CREATE_DIRECTORY | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_WRITE_FILE = 44
+; XSL_SECPREF_CREATE_DIRECTORY | XSL_SECPREF_WRITE_NETWORK | XSL_SECPREF_WRITE_FILE = 44
 ; Set it to 0 to allow all operations
 ;xsl.security_prefs = 44
 
index 383086c2b50426507325bffd6976f0032d2efac5..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
@@ -1 +0,0 @@
-source /etc/portage/etckeeper
diff --git a/portage/etckeeper b/portage/etckeeper
deleted file mode 100755 (executable)
index 9ce5ac3..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-case "$EBUILD_PHASE" in
-
-       "preinst" | "prerm" )
-                       if [ -x /usr/bin/etckeeper ]; then
-                                       etckeeper pre-install
-                       fi
-       ;;
-
-       "postinst" | "postrm" )
-                       if [ -x /usr/bin/etckeeper ]; then
-                                       etckeeper post-install
-                       fi
-               ;;
-       esac
index 03fb0bfa6fae81fca0290a22e00b561185b27819..22ce437315d6da6fa033208c45656a99e2824738 100644 (file)
@@ -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
index be33f75ddaf06d3b3af7b0ce1843efa7cac4863f..90ad69aa8828782516da250406b7f65191bb62aa 100644 (file)
@@ -14,11 +14,13 @@ smtp      inet  n       -       n       -       -       smtpd
 #dnsblog   unix  -       -       n       -       0       dnsblog
 #tlsproxy  unix  -       -       n       -       0       tlsproxy
 #submission inet n       -       n       -       -       smtpd
+#  -o syslog_name=postfix/submission
 #  -o smtpd_tls_security_level=encrypt
 #  -o smtpd_sasl_auth_enable=yes
 #  -o smtpd_client_restrictions=permit_sasl_authenticated,reject
 #  -o milter_macro_daemon_name=ORIGINATING
 #smtps     inet  n       -       n       -       -       smtpd
+#  -o syslog_name=postfix/smtps
 #  -o smtpd_tls_wrappermode=yes
 #  -o smtpd_sasl_auth_enable=yes
 #  -o smtpd_client_restrictions=permit_sasl_authenticated,reject
@@ -38,9 +40,7 @@ flush     unix  n       -       n       1000?   0       flush
 proxymap  unix  -       -       n       -       -       proxymap
 proxywrite unix -       -       n       -       1       proxymap
 smtp      unix  -       -       n       -       -       smtp
-# When relaying mail as backup MX, disable fallback_relay to avoid MX loops
 relay     unix  -       -       n       -       -       smtp
-       -o smtp_fallback_relay=
 #       -o smtp_helo_timeout=5 -o smtp_connect_timeout=5
 showq     unix  n       -       n       -       -       showq
 error     unix  -       -       n       -       -       error
diff --git a/shadow b/shadow
index 26714c20fd16a979fd24d29ab66434d5e81b804f..13b3d80597c187070d33b6f208d07b9d8a13f06f 100644 (file)
--- a/shadow
+++ b/shadow
@@ -32,7 +32,7 @@ tcpdump:!:15355::::::
 pcguest:!:15352::::::
 frank:$6$cX.uoegn$QJ4gODV46s22yZL5568YNM/TqhlRqVOK42ulOijyMRZN4A049BLsbTB/M/8XO/rJwFs8w4sSS7mEPsdZtyzQI1:15354:0:99999:7:::
 doris:$6$aaBD.v4x$kR6SRHU0BmEMnK5SVaU/UcHl.xw.pfq7naPf8Wb6xkA4c1ENK.9XKvc/Tj5iF4/9yQOYSgjR5iKiD7w7MMZhn1:15357:0:99999:7:::
-heiko:$1$jI8r4jt2$BrVSxlQMrtsSmnia1zqOd/:14147:0:99999:7:::
+heiko:$6$H4HqXLQP$C8z9qeK1thF1pEN.ABVIghuRwNU4eIVBLbEo3N7RcnEebwNevoulYo.mGH/tXcEfnE2WsVTILMpPH1FHKD5AK/:15590:0:99999:7:::
 patrick:$1$GLbMMbFN$CAnFjqpvABrKPsMgioPbx0:14147:0:99999:7:::
 robert:$1$3dN7L0X7$wjwYf5TMs4XAzX8yA8iRz0:14147:0:99999:7:::
 thomas:!$1$TnH.ZwKd$6fG79iLoCvVzMC5DGSzmL.:14147:0:99999:7:::
@@ -48,3 +48,4 @@ dovenull:!:15356::::::
 postfix:!:15356::::::
 hsqldb:!:15356::::::
 postgres:!:15371::::::
+memcached:!:15566::::::
diff --git a/shadow- b/shadow-
index cc7ad8f303b018bdc1ab5385f9af31f024b4c68b..26714c20fd16a979fd24d29ab66434d5e81b804f 100644 (file)
--- a/shadow-
+++ b/shadow-
@@ -1,4 +1,4 @@
-root:$6$aYHr2tN.$Pso7OJNdBEO5p2hdp8wJ1RCgq.RLHKJIcTUc85VVSW303vXRqDujDfDEVaJTWK.BQH3jy/nAJZCp4uGO/28y1/:15354:0:::::
+root:$6$5MlZFauv$uzAYYtc97lTnpfCzwd2PXRk2PHNNpQOudnR49iYJTOJANZtU/C.AQn1FFBeO.7I6PIhFbq6QkDE.sv.IUStXx.:15482:0:::::
 halt:*:9797:0:::::
 operator:*:9797:0:::::
 shutdown:*:9797:0:::::
@@ -47,3 +47,4 @@ dovecot:!:15356::::::
 dovenull:!:15356::::::
 postfix:!:15356::::::
 hsqldb:!:15356::::::
+postgres:!:15371::::::