From f9a9912619d1dee1768928406278fc30d296200a Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Tue, 18 Sep 2012 09:04:21 +0200 Subject: [PATCH] Current state --- ImageMagick/delegates.xml | 15 +- ImageMagick/quantization-table.xml | 14 +- ImageMagick/sRGB.icc | Bin 6922 -> 0 bytes conf.d/memcached | 35 ++ config-archive/etc/postfix/main.cf | 4 +- config-archive/etc/postfix/main.cf.1 | 2 +- config-archive/etc/postfix/main.cf.2 | 692 +++++++++++++++++++++++ config-archive/etc/postfix/main.cf.dist | 13 +- cups/printers.conf | 2 +- env.d/77kde | 1 - gconf/gconf.xml.defaults/%gconf-tree.xml | 104 ++-- group | 1 + group- | 3 +- gshadow | 1 + gshadow- | 1 + init.d/memcached | 78 +++ init.d/postfix | 74 ++- ld.so.conf | 1 - passwd | 1 + passwd- | 1 + php/apache2-php5.3/php.ini | 6 +- php/cgi-php5.3/php.ini | 6 +- php/cli-php5.3/php.ini | 6 +- php/embed-php5.3/php.ini | 6 +- php/fpm-php5.3/php.ini | 6 +- portage/bashrc | 1 - portage/etckeeper | 14 - postfix/main.cf | 13 +- postfix/master.cf | 4 +- shadow | 3 +- shadow- | 3 +- 31 files changed, 978 insertions(+), 133 deletions(-) delete mode 100644 ImageMagick/sRGB.icc create mode 100644 conf.d/memcached create mode 100644 config-archive/etc/postfix/main.cf.2 create mode 100755 init.d/memcached delete mode 100755 portage/etckeeper diff --git a/ImageMagick/delegates.xml b/ImageMagick/delegates.xml index a21e0e7f..a1135dc7 100644 --- a/ImageMagick/delegates.xml +++ b/ImageMagick/delegates.xml @@ -58,15 +58,24 @@ 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. --> - + + @@ -79,7 +88,7 @@ - + @@ -89,7 +98,7 @@ - + diff --git a/ImageMagick/quantization-table.xml b/ImageMagick/quantization-table.xml index 9688f255..b65555dc 100644 --- a/ImageMagick/quantization-table.xml +++ b/ImageMagick/quantization-table.xml @@ -30,14 +30,14 @@ Chrominance Quantization Table - 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
diff --git a/ImageMagick/sRGB.icc b/ImageMagick/sRGB.icc deleted file mode 100644 index 6f3efbf02db0a9b7e9b0f0696a81c77d2d3042da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6922 zcmeI1XH-~($xKc5@^=mZ{2|B{-2XY=O#ny`xu+|b&p%6w zEqSkNbac-3(VMB(&Hv2(uO}iaiNgW_qVi|rS?p9MpLg;(mX*X3#ODQ^nUB@2{`5(mwwF&@N?kj90dSNjQPs=Qv#0q%H&=FGh?|)0LTpT^HrJ2 zTz-8SK`*6mYv2 zKpH3j6`%=pfe|nRmcSM`0e9dH0zfF(0+=8cBmpkS1bJW=C;}y*92^9-paC?4R?q>? zfF5ujTn5*`EpQi%gDJoRv*0CI0`I^o1VI>x1W_PqND)$lbRZ*$0a-&%kSF8^g+dWf z48(!bp*(0eR035%wNN9}3jG9~gDyiipi$@{Gz~34e?lK&1Wbgfuso~|>%$D#4)%Zp z;LUIhoC4>-h44PO8g7D5!QJp>_!c}4^Wc~8G6En72pU2Op^IQ391z}!Fhn$hi`aoE zMpPl15FLm<#1P^hf`?c{d_ba+6eJy~i?l?#A_I|3WD0TzvJ_d1Jc;Z^4kGU%r;$s@ zFDMd94yA*#K)InpP%)@XR1vBQ)q?6mT}6$fW>N3ZXfzG2fi^?CqC?T~=v;Iu`Y^f^ zeF;5^oVWg>A$3 zW5=*_*j1buP7P;)^Tx4o*|;)XGp-MJ2RDmb#f#%L@K*Q$d^~;^z8c?wzlwj1e?uS; zlnLepUqT#VC!v~fnsA*kP53}06SavB#BgFdaUbyn@e=VN@ePSYQYYDx!boYPeWX^> z71C4Edl8C=o`{UPNZ98Oyrd)PE<|QPIQZCj%bzWS^h zWy%)Io{@bd2g_;8`N`$V9g`cDTb5Ulcacw)uaUnZzo+tCy0)$~F7l9HT~t5UjBqtb}dsWuEMC#`p0pTE9$ z{cB?#W47@T;|C@b6EBlJCIcp)P0dWXrX8jWW~ycpX7y&13@XEiQOdY(jxx75&o@7B z{=vf3BF*BA#UGZsmI;<^mh&4lHn2A|Z?BeZC*}bwiu;gxw@5Xd%bz5>bbKmYh=t1=G_o(%F=Be$;_3ZP4z1+PHcs<^z zwvn^3#~XONc^~k8;-le{;`56y+SkXo&iA>Wp zZ3^46wv8t1Bo`&~QY=yqrYvzixGkwr>gLqmG%EimJ)EwY{$2WXhIK|=#{0~m%(GeI zS)8olZ0+p5*>gG0ImdI6xy;;wJf*x{dDGkNwm0s8c0}zM$XCfP%%9!qvh(CF{H}yu zw+jpkDhl524&L2YC||g-W~|{Zh;-zFA^W zQdRP)lv#T72g4t#e^}cWy>Fz>6OKmZx3!g zc%#a=s^Jj+Q2HTWwP$s2jcQGK&8OPf+VML3y3TsJ`n~llhgpZmj@TaQXpnCxY4~_F z?&yO?m&WcU^`@$0=wlhjo;L?I4;^P5Z*7rjDQWq9f^&j*((mM8t66Jnn_OF2JKUb$ zzHlo1)ZHH)f9&nh?P%6ElVER`;;UaMx{<+g&53Bi(n* z?)2U@zuPyuVYGkDX6*7k$9vcAyWPJvzHxkXB5>ltWcVcS0qep1!^DTLA7wmRo!a>r z^|<(n*psTKa!;Fn)%vxQXUe-U?KnOB%>UWc40Gn?Z>hh1nk{@zdR{fBIM+IFG=F}< zdExGhO)q9&Ccj)=Ec#vi_xe|wuYUf+_K)GEkfqtz+}CS=mcEgGbK+ks`D<)`nG z-mR__zn6Z0@&n_;(8u79bE}!3FrTVFYkltf;_>D2TGHB@PzwmPfKUqvwSZ6y2(^Gv z3kbD<&=(N;0zzLv=nDva0iiD-^acKpeSxp%ID9pL5GaCUlK=$d0^oTYfSOtW)T8<5 m3*l+(EdKcp0Gw@f=CFirstname.Lastname mapping. + +# ADDRESS REDIRECTION (VIRTUAL DOMAIN) +# +# The VIRTUAL_README document gives information about the many forms +# of domain hosting that Postfix supports. + +# "USER HAS MOVED" BOUNCE MESSAGES +# +# See the discussion in the ADDRESS_REWRITING_README document. + +# TRANSPORT MAP +# +# See the discussion in the ADDRESS_REWRITING_README document. + +# ALIAS DATABASE +# +# The alias_maps parameter specifies the list of alias databases used +# by the local delivery agent. The default list is system dependent. +# +# On systems with NIS, the default is to search the local alias +# database, then the NIS alias database. See aliases(5) for syntax +# details. +# +# If you change the alias database, run "postalias /etc/aliases" (or +# wherever your system stores the mail alias file), or simply run +# "newaliases" to build the necessary DBM or DB file. +# +# It will take a minute or so before changes become visible. Use +# "postfix reload" to eliminate the delay. +# +#alias_maps = dbm:/etc/aliases +#alias_maps = hash:/etc/aliases +#alias_maps = hash:/etc/aliases, nis:mail.aliases +#alias_maps = netinfo:/aliases + +# The alias_database parameter specifies the alias database(s) that +# are built with "newaliases" or "sendmail -bi". This is a separate +# configuration parameter, because alias_maps (see above) may specify +# tables that are not necessarily all under control by Postfix. +# +#alias_database = dbm:/etc/aliases +#alias_database = dbm:/etc/mail/aliases +#alias_database = hash:/etc/aliases +#alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases + +# ADDRESS EXTENSIONS (e.g., user+foo) +# +# The recipient_delimiter parameter specifies the separator between +# user names and address extensions (user+foo). See canonical(5), +# local(8), relocated(5) and virtual(5) for the effects this has on +# aliases, canonical, virtual, relocated and .forward file lookups. +# Basically, the software tries user+foo and .forward+foo before +# trying user and .forward. +# +#recipient_delimiter = + + +# DELIVERY TO MAILBOX +# +# The home_mailbox parameter specifies the optional pathname of a +# mailbox file relative to a user's home directory. The default +# mailbox file is /var/spool/mail/user or /var/mail/user. Specify +# "Maildir/" for qmail-style delivery (the / is required). +# +#home_mailbox = Mailbox +#home_mailbox = Maildir/ + +# The mail_spool_directory parameter specifies the directory where +# UNIX-style mailboxes are kept. The default setting depends on the +# system type. +# +#mail_spool_directory = /var/mail +#mail_spool_directory = /var/spool/mail + +# The mailbox_command parameter specifies the optional external +# command to use instead of mailbox delivery. The command is run as +# the recipient with proper HOME, SHELL and LOGNAME environment settings. +# Exception: delivery for root is done as $default_user. +# +# Other environment variables of interest: USER (recipient username), +# EXTENSION (address extension), DOMAIN (domain part of address), +# and LOCAL (the address localpart). +# +# Unlike other Postfix configuration parameters, the mailbox_command +# parameter is not subjected to $parameter substitutions. This is to +# make it easier to specify shell syntax (see example below). +# +# Avoid shell meta characters because they will force Postfix to run +# an expensive shell process. Procmail alone is expensive enough. +# +# IF YOU USE THIS TO DELIVER MAIL SYSTEM-WIDE, YOU MUST SET UP AN +# ALIAS THAT FORWARDS MAIL FOR ROOT TO A REAL USER. +# +#mailbox_command = /some/where/procmail +#mailbox_command = /some/where/procmail -a "$EXTENSION" + +# The mailbox_transport specifies the optional transport in master.cf +# to use after processing aliases and .forward files. This parameter +# has precedence over the mailbox_command, fallback_transport and +# luser_relay parameters. +# +# Specify a string of the form transport:nexthop, where transport is +# the name of a mail delivery transport defined in master.cf. The +# :nexthop part is optional. For more details see the sample transport +# configuration file. +# +# NOTE: if you use this feature for accounts not in the UNIX password +# file, then you must update the "local_recipient_maps" setting in +# the main.cf file, otherwise the SMTP server will reject mail for +# non-UNIX accounts with "User unknown in local recipient table". +# +#mailbox_transport = lmtp:unix:/file/name +#mailbox_transport = cyrus + +# The fallback_transport specifies the optional transport in master.cf +# to use for recipients that are not found in the UNIX passwd database. +# This parameter has precedence over the luser_relay parameter. +# +# Specify a string of the form transport:nexthop, where transport is +# the name of a mail delivery transport defined in master.cf. The +# :nexthop part is optional. For more details see the sample transport +# configuration file. +# +# NOTE: if you use this feature for accounts not in the UNIX password +# file, then you must update the "local_recipient_maps" setting in +# the main.cf file, otherwise the SMTP server will reject mail for +# non-UNIX accounts with "User unknown in local recipient table". +# +#fallback_transport = lmtp:unix:/file/name +#fallback_transport = cyrus +#fallback_transport = + +# The luser_relay parameter specifies an optional destination address +# for unknown recipients. By default, mail for unknown@$mydestination, +# unknown@[$inet_interfaces] or unknown@[$proxy_interfaces] is returned +# as undeliverable. +# +# The following expansions are done on luser_relay: $user (recipient +# username), $shell (recipient shell), $home (recipient home directory), +# $recipient (full recipient address), $extension (recipient address +# extension), $domain (recipient domain), $local (entire recipient +# localpart), $recipient_delimiter. Specify ${name?value} or +# ${name:value} to expand value only when $name does (does not) exist. +# +# luser_relay works only for the default Postfix local delivery agent. +# +# NOTE: if you use this feature for accounts not in the UNIX password +# file, then you must specify "local_recipient_maps =" (i.e. empty) in +# the main.cf file, otherwise the SMTP server will reject mail for +# non-UNIX accounts with "User unknown in local recipient table". +# +#luser_relay = $user@other.host +#luser_relay = $local@other.host +#luser_relay = admin+$local + +# JUNK MAIL CONTROLS +# +# The controls listed here are only a very small subset. The file +# SMTPD_ACCESS_README provides an overview. + +# The header_checks parameter specifies an optional table with patterns +# that each logical message header is matched against, including +# headers that span multiple physical lines. +# +# By default, these patterns also apply to MIME headers and to the +# headers of attached messages. With older Postfix versions, MIME and +# attached message headers were treated as body text. +# +# For details, see "man header_checks". +# +#header_checks = regexp:/etc/postfix/header_checks + +# FAST ETRN SERVICE +# +# Postfix maintains per-destination logfiles with information about +# deferred mail, so that mail can be flushed quickly with the SMTP +# "ETRN domain.tld" command, or by executing "sendmail -qRdomain.tld". +# See the ETRN_README document for a detailed description. +# +# The fast_flush_domains parameter controls what destinations are +# eligible for this service. By default, they are all domains that +# this server is willing to relay mail to. +# +#fast_flush_domains = $relay_domains + +# SHOW SOFTWARE VERSION OR NOT +# +# The smtpd_banner parameter specifies the text that follows the 220 +# code in the SMTP server's greeting banner. Some people like to see +# the mail version advertised. By default, Postfix shows no version. +# +# You MUST specify $myhostname at the start of the text. That is an +# RFC requirement. Postfix itself does not care. +# +#smtpd_banner = $myhostname ESMTP $mail_name +#smtpd_banner = $myhostname ESMTP $mail_name ($mail_version) + +# PARALLEL DELIVERY TO THE SAME DESTINATION +# +# How many parallel deliveries to the same user or domain? With local +# delivery, it does not make sense to do massively parallel delivery +# to the same user, because mailbox updates must happen sequentially, +# and expensive pipelines in .forward files can cause disasters when +# too many are run at the same time. With SMTP deliveries, 10 +# simultaneous connections to the same domain could be sufficient to +# raise eyebrows. +# +# Each message delivery transport has its XXX_destination_concurrency_limit +# parameter. The default is $default_destination_concurrency_limit for +# most delivery transports. For the local delivery agent the default is 2. + +#local_destination_concurrency_limit = 2 +#default_destination_concurrency_limit = 20 + +# DEBUGGING CONTROL +# +# The debug_peer_level parameter specifies the increment in verbose +# logging level when an SMTP client or server host name or address +# matches a pattern in the debug_peer_list parameter. +# +debug_peer_level = 2 + +# The debug_peer_list parameter specifies an optional list of domain +# or network patterns, /file/name patterns or type:name tables. When +# an SMTP client or server host name or address matches a pattern, +# increase the verbose logging level by the amount specified in the +# debug_peer_level parameter. +# +#debug_peer_list = 127.0.0.1 +#debug_peer_list = some.domain + +# The debugger_command specifies the external command that is executed +# when a Postfix daemon program is run with the -D option. +# +# Use "command .. & sleep 5" so that the debugger can attach before +# the process marches on. If you use an X-based debugger, be sure to +# set up your XAUTHORITY environment variable before starting Postfix. +# +debugger_command = + PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin + ddd $daemon_directory/$process_name $process_id & sleep 5 + +# If you can't use X, use this to capture the call stack when a +# daemon crashes. The result is in a file in the configuration +# directory, and is named after the process name and the process ID. +# +# debugger_command = +# PATH=/bin:/usr/bin:/usr/local/bin; export PATH; (echo cont; +# echo where) | gdb $daemon_directory/$process_name $process_id 2>&1 +# >$config_directory/$process_name.$process_id.log & sleep 5 +# +# Another possibility is to run gdb under a detached screen session. +# To attach to the screen sesssion, su root and run "screen -r +# " where uniquely matches one of the detached +# sessions (from "screen -list"). +# +# debugger_command = +# PATH=/bin:/usr/bin:/sbin:/usr/sbin; export PATH; screen +# -dmS $process_name gdb $daemon_directory/$process_name +# $process_id & sleep 1 + +# INSTALL-TIME CONFIGURATION INFORMATION +# +# The following parameters are used when installing a new Postfix version. +# +# sendmail_path: The full pathname of the Postfix sendmail command. +# This is the Sendmail-compatible mail posting interface. +# +sendmail_path = /usr/sbin/sendmail + +# newaliases_path: The full pathname of the Postfix newaliases command. +# This is the Sendmail-compatible command to build alias databases. +# +newaliases_path = /usr/bin/newaliases + +# mailq_path: The full pathname of the Postfix mailq command. This +# is the Sendmail-compatible mail queue listing command. +# +mailq_path = /usr/bin/mailq + +# setgid_group: The group for mail submission and queue management +# commands. This must be a group name with a numerical group ID that +# is not shared with other accounts, not even with the Postfix account. +# +setgid_group = postdrop + +# html_directory: The location of the Postfix HTML documentation. +# +html_directory = /usr/share/doc/postfix-2.8.7/html + +# manpage_directory: The location of the Postfix on-line manual pages. +# +manpage_directory = /usr/share/man + +# sample_directory: The location of the Postfix sample configuration files. +# This parameter is obsolete as of Postfix 2.1. +# +sample_directory = /etc/postfix + +# readme_directory: The location of the Postfix README files. +# +readme_directory = /usr/share/doc/postfix-2.8.7/readme +home_mailbox = .maildir/ + +smtpd_sasl_auth_enable = yes +smtpd_sasl2_auth_enable = yes +smtpd_sasl_security_options = noanonymous +broken_sasl_auth_clients = yes +smtpd_sasl_local_domain = $myhostname + +# Authentifizierter Relay-Mail-Versand +smtp_sasl_auth_enable = yes +smtp_sasl_password_maps = hash:/etc/postfix/smtp_auth +smtp_sasl_security_options = noanonymous +relayhost = [mail.brehm-online.com] +#relayhost = [helga-six.brehm-online.com] + +smtpd_use_tls = yes +#smtpd_tls_auth_only = yes +smtpd_tls_key_file = /etc/postfix/postfix.pem +smtpd_tls_cert_file = /etc/postfix/postfix.pem +#smtpd_tls_CAfile = /etc/ssl/acwain-CA/CAcert.pem +smtpd_tls_loglevel = 1 +smtpd_tls_received_header = yes +smtpd_tls_session_cache_timeout = 3600s +tls_random_source = dev:/dev/urandom + +# schön tls verwenden +smtp_use_tls = yes +smtp_tls_key_file = /etc/postfix/postfix.pem +smtp_tls_cert_file = /etc/postfix/postfix.pem +#smtp_tls_CAfile = /etc/ssl/acwain-CA/CAcert.pem +# vermurkste zertifikate: egal +smtp_tls_enforce_peername = no + +#debug_peer_list = 217.237.40.156 + +inet_protocols = all diff --git a/config-archive/etc/postfix/main.cf.dist b/config-archive/etc/postfix/main.cf.dist index 8526cf23..f608dfb5 100644 --- a/config-archive/etc/postfix/main.cf.dist +++ b/config-archive/etc/postfix/main.cf.dist @@ -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/ diff --git a/cups/printers.conf b/cups/printers.conf index abcc3260..a278adf5 100644 --- a/cups/printers.conf +++ b/cups/printers.conf @@ -1,5 +1,5 @@ # Printer configuration file for CUPS v1.5.2 -# Written by cupsd on 2012-08-14 10:54 +# Written by cupsd on 2012-09-16 12:17 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING UUID urn:uuid:7ae9b14e-20ad-3628-427d-870cdf4cdea4 diff --git a/env.d/77kde b/env.d/77kde index 7de73625..2d4479b5 100644 --- a/env.d/77kde +++ b/env.d/77kde @@ -1,3 +1,2 @@ COLON_SEPARATED=QT_PLUGIN_PATH QT_PLUGIN_PATH=/usr/lib64/kde4/plugins -LDPATH="/usr/lib64/kde4" diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml index 62d469f2..8a859008 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -2884,39 +2884,39 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -2989,9 +2989,9 @@ - - - + + + @@ -18073,13 +18073,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati evince-thumbnailer -s %s %u %o - - @@ -18089,13 +18087,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati evince-thumbnailer -s %s %u %o - - @@ -18105,13 +18101,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati evince-thumbnailer -s %s %u %o - - @@ -18121,13 +18115,11 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati evince-thumbnailer -s %s %u %o - - @@ -19799,13 +19791,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19813,7 +19805,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "ymsgr" URLs, if enabled. - + True if the command specified in the "command" key should handle "ymsgr" URLs. @@ -19821,13 +19813,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19835,7 +19827,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "xmpp" URLs, if enabled. - + True if the command specified in the "command" key should handle "xmpp" URLs. @@ -19843,13 +19835,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19857,7 +19849,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "sip" URLs, if enabled. - + True if the command specified in the "command" key should handle "sip" URLs. @@ -19865,13 +19857,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19879,7 +19871,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "msnim" URLs, if enabled. - + True if the command specified in the "command" key should handle "msnim" URLs. @@ -19887,13 +19879,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19901,7 +19893,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "irc" URLs, if enabled. - + True if the command specified in the "command" key should handle "irc" URLs. @@ -19909,13 +19901,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19923,7 +19915,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "icq" URLs, if enabled. - + True if the command specified in the "command" key should handle "icq" URLs. @@ -19931,13 +19923,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -19945,7 +19937,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "gg" URLs, if enabled. - + True if the command specified in the "command" key should handle "gg" URLs. @@ -20231,13 +20223,13 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + True if the command used to handle this type of URL should be run in a terminal. - + purple-url-handler "%s" @@ -20245,7 +20237,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The command used to handle "aim" URLs, if enabled. - + True if the command specified in the "command" key should handle "aim" URLs. diff --git a/group b/group index 1f557579..cda87577 100644 --- 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 70fe6436..1f557579 100644 --- 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 217ca8de..8f99cfd5 100644 --- a/gshadow +++ b/gshadow @@ -61,3 +61,4 @@ hsqldb:!:: postgres:!:: realtime:!:: vboxusers:!:: +dropbox:!:: diff --git a/gshadow- b/gshadow- index 20c6284d..217ca8de 100644 --- 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 index 00000000..6c9d2a64 --- /dev/null +++ b/init.d/memcached @@ -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 $? +} diff --git a/init.d/postfix b/init.d/postfix index b62bb7ff..aecd8e71 100755 --- a/init.d/postfix +++ b/init.d/postfix @@ -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 $? } diff --git a/ld.so.conf b/ld.so.conf index 5c9abda9..88b39f3f 100644 --- a/ld.so.conf +++ b/ld.so.conf @@ -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 ef0135b8..d458e932 100644 --- 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 93732779..ef0135b8 100644 --- 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 diff --git a/php/apache2-php5.3/php.ini b/php/apache2-php5.3/php.ini index 69d58d41..24e78a6c 100644 --- a/php/apache2-php5.3/php.ini +++ b/php/apache2-php5.3/php.ini @@ -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 diff --git a/php/cgi-php5.3/php.ini b/php/cgi-php5.3/php.ini index 69d58d41..24e78a6c 100644 --- a/php/cgi-php5.3/php.ini +++ b/php/cgi-php5.3/php.ini @@ -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 diff --git a/php/cli-php5.3/php.ini b/php/cli-php5.3/php.ini index 69d58d41..24e78a6c 100644 --- a/php/cli-php5.3/php.ini +++ b/php/cli-php5.3/php.ini @@ -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 diff --git a/php/embed-php5.3/php.ini b/php/embed-php5.3/php.ini index 69d58d41..24e78a6c 100644 --- a/php/embed-php5.3/php.ini +++ b/php/embed-php5.3/php.ini @@ -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 diff --git a/php/fpm-php5.3/php.ini b/php/fpm-php5.3/php.ini index 69d58d41..24e78a6c 100644 --- a/php/fpm-php5.3/php.ini +++ b/php/fpm-php5.3/php.ini @@ -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 diff --git a/portage/bashrc b/portage/bashrc index 383086c2..e69de29b 100644 --- a/portage/bashrc +++ b/portage/bashrc @@ -1 +0,0 @@ -source /etc/portage/etckeeper diff --git a/portage/etckeeper b/portage/etckeeper deleted file mode 100755 index 9ce5ac38..00000000 --- a/portage/etckeeper +++ /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 diff --git a/postfix/main.cf b/postfix/main.cf index 03fb0bfa..22ce4373 100644 --- a/postfix/main.cf +++ b/postfix/main.cf @@ -39,7 +39,7 @@ command_directory = /usr/sbin # daemon programs (i.e. programs listed in the master.cf file). This # directory must be owned by root. # -daemon_directory = /usr/lib64/postfix +daemon_directory = /usr/libexec/postfix # The data_directory parameter specifies the location of Postfix-writable # data files (caches, random numbers). This directory must be owned @@ -463,7 +463,12 @@ mynetworks = 10.12.11.0/24, 127.0.0.0/8, [::1]/128, [2001:6f8:1db7::]/64 # the main.cf file, otherwise the SMTP server will reject mail for # non-UNIX accounts with "User unknown in local recipient table". # -#mailbox_transport = lmtp:unix:/file/name +# Cyrus IMAP over LMTP. Specify ``lmtpunix cmd="lmtpd" +# listen="/var/imap/socket/lmtp" prefork=0'' in cyrus.conf. +#mailbox_transport = lmtp:unix:/var/imap/socket/lmtp +# +# Cyrus IMAP via command line. Uncomment the "cyrus...pipe" and +# subsequent line in master.cf. #mailbox_transport = cyrus # The fallback_transport specifies the optional transport in master.cf @@ -640,7 +645,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.8.9/html +html_directory = /usr/share/doc/postfix-2.9.3/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -653,7 +658,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-2.8.9/readme +readme_directory = /usr/share/doc/postfix-2.9.3/readme home_mailbox = .maildir/ smtpd_sasl_auth_enable = yes diff --git a/postfix/master.cf b/postfix/master.cf index be33f75d..90ad69aa 100644 --- a/postfix/master.cf +++ b/postfix/master.cf @@ -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 26714c20..13b3d805 100644 --- 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 cc7ad8f3..26714c20 100644 --- 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:::::: -- 2.39.5