From 6c5a7144116493d6f840ca78e9135eb70c6b4a0a Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Wed, 25 Mar 2015 22:59:39 +0100 Subject: [PATCH] Current state --- .etckeeper | 21 +- ca-certificates.conf | 32 +- conf.d/syslog-ng | 2 +- config-archive/etc/ntp.conf | 54 ++ config-archive/etc/ntp.conf.dist.new | 54 ++ config-archive/etc/postfix/main.cf | 8 +- config-archive/etc/postfix/main.cf.1 | 4 +- config-archive/etc/postfix/main.cf.2 | 4 +- config-archive/etc/postfix/main.cf.3 | 4 +- config-archive/etc/postfix/main.cf.4 | 4 +- config-archive/etc/postfix/main.cf.5 | 4 +- config-archive/etc/postfix/main.cf.6 | 4 +- config-archive/etc/postfix/main.cf.7 | 13 +- config-archive/etc/postfix/main.cf.8 | 4 +- config-archive/etc/postfix/main.cf.9 | 681 ++++++++++++++++ config-archive/etc/postfix/main.cf.dist | 26 +- config-archive/etc/syslog-ng/syslog-ng.conf | 4 +- config-archive/etc/syslog-ng/syslog-ng.conf.1 | 2 + config-archive/etc/syslog-ng/syslog-ng.conf.2 | 93 +++ .../etc/syslog-ng/syslog-ng.conf.dist.new | 4 +- cron.daily/{run_reoback.sh => reoback} | 0 cups/cups-browsed.conf | 1 + env.d/blas/lib64/config | 3 + env.d/blas/lib64/reference | 4 + env.d/cblas/lib64/config | 3 + env.d/cblas/lib64/reference | 5 + env.d/lapack/lib64/config | 3 + env.d/lapack/lib64/reference | 4 + init.d/syslog-ng | 22 +- mutt/Muttrc.dist | 64 +- nanorc | 166 ++-- portage/package.use | 7 +- postfix/main.cf | 31 +- postfix/master.cf | 2 +- postfix/postfix-files | 442 ++++++++++ ssl/certs/03f0efa4.0 | 1 - ssl/certs/064e0aa9.0 | 1 + ssl/certs/0ba01d19.0 | 1 + ssl/certs/1e09d511.0 | 1 + ssl/certs/20d096ba.0 | 1 - ssl/certs/2cfc4974.0 | 1 - ssl/certs/415660c1.0 | 2 +- ssl/certs/415660c1.1 | 1 + ssl/certs/5273a94c.0 | 1 + ssl/certs/55a10908.0 | 1 - ssl/certs/590d426f.0 | 1 - ssl/certs/5cd81ad7.0 | 1 + ssl/certs/5d63b0ae.0 | 1 + ssl/certs/5f15c80c.0 | 1 + ssl/certs/5f267794.0 | 1 - ssl/certs/607986c7.0 | 1 + ssl/certs/749e9e03.0 | 1 + ssl/certs/75d1b2ed.0 | 1 + ssl/certs/7f3d5d1d.0 | 1 + ssl/certs/8096d0a9.0 | 1 + ssl/certs/9af9f759.0 | 1 - ssl/certs/9b353c9a.0 | 1 - ssl/certs/9d04f354.0 | 1 + ssl/certs/ACCVRAIZ1.pem | 1 + ssl/certs/Atos_TrustedRoot_2011.pem | 1 + ssl/certs/DigiCert_Assured_ID_Root_G2.pem | 1 + ssl/certs/DigiCert_Assured_ID_Root_G3.pem | 1 + ssl/certs/DigiCert_Global_Root_G2.pem | 1 + ssl/certs/DigiCert_Global_Root_G3.pem | 1 + ssl/certs/DigiCert_Trusted_Root_G4.pem | 1 + ssl/certs/E-Tugra_Certification_Authority.pem | 1 + ssl/certs/Entrust.net_Secure_Server_CA.pem | 1 - ssl/certs/Firmaprofesional_Root_CA.pem | 1 - ssl/certs/QuoVadis_Root_CA_1_G3.pem | 1 + ssl/certs/QuoVadis_Root_CA_2_G3.pem | 1 + ssl/certs/QuoVadis_Root_CA_3_G3.pem | 1 + ssl/certs/RSA_Root_Certificate_1.pem | 1 - ssl/certs/SG_TRUST_SERVICES_RACINE.pem | 1 + .../StartCom_Certification_Authority_2.pem | 1 + ssl/certs/T-TeleSec_GlobalRoot_Class_2.pem | 1 + ssl/certs/TDC_Internet_Root_CA.pem | 1 - ssl/certs/TDC_OCES_Root_CA.pem | 1 - ssl/certs/TWCA_Global_Root_CA.pem | 1 + ssl/certs/TeliaSonera_Root_CA_v1.pem | 1 + ssl/certs/ValiCert_Class_1_VA.pem | 1 - ssl/certs/ValiCert_Class_2_VA.pem | 1 - ...blic_Primary_Certification_Authority_2.pem | 1 + ssl/certs/Wells_Fargo_Root_CA.pem | 1 - ssl/certs/WoSign.pem | 1 + ssl/certs/WoSign_China.pem | 1 + ssl/certs/a94d09e5.0 | 1 + ssl/certs/ae8153b9.0 | 2 +- ssl/certs/ae8153b9.1 | 1 + ssl/certs/ca-certificates.crt | 770 ++++++++++++------ ssl/certs/cacert.org_class3.pem | 1 - ssl/certs/ce026bf8.0 | 1 - ssl/certs/dd8e9d41.0 | 1 + ssl/certs/e18bfb83.0 | 1 + ssl/certs/e36a6752.0 | 1 + syslog-ng/scl.conf | 6 +- syslog-ng/syslog-ng.conf | 10 +- syslog-ng/syslog-ng.conf.orig | 14 +- xdg/autostart/gnome-keyring-gpg.desktop | 2 +- xdg/autostart/gnome-keyring-pkcs11.desktop | 2 +- xdg/autostart/gnome-keyring-secrets.desktop | 2 +- xdg/autostart/gnome-keyring-ssh.desktop | 2 +- 101 files changed, 2200 insertions(+), 447 deletions(-) create mode 100644 config-archive/etc/ntp.conf create mode 100644 config-archive/etc/ntp.conf.dist.new create mode 100644 config-archive/etc/postfix/main.cf.9 create mode 100644 config-archive/etc/syslog-ng/syslog-ng.conf.2 rename cron.daily/{run_reoback.sh => reoback} (100%) create mode 100644 env.d/blas/lib64/config create mode 100644 env.d/blas/lib64/reference create mode 100644 env.d/cblas/lib64/config create mode 100644 env.d/cblas/lib64/reference create mode 100644 env.d/lapack/lib64/config create mode 100644 env.d/lapack/lib64/reference create mode 100644 postfix/postfix-files delete mode 120000 ssl/certs/03f0efa4.0 create mode 120000 ssl/certs/064e0aa9.0 create mode 120000 ssl/certs/0ba01d19.0 create mode 120000 ssl/certs/1e09d511.0 delete mode 120000 ssl/certs/20d096ba.0 delete mode 120000 ssl/certs/2cfc4974.0 create mode 120000 ssl/certs/415660c1.1 create mode 120000 ssl/certs/5273a94c.0 delete mode 120000 ssl/certs/55a10908.0 delete mode 120000 ssl/certs/590d426f.0 create mode 120000 ssl/certs/5cd81ad7.0 create mode 120000 ssl/certs/5d63b0ae.0 create mode 120000 ssl/certs/5f15c80c.0 delete mode 120000 ssl/certs/5f267794.0 create mode 120000 ssl/certs/607986c7.0 create mode 120000 ssl/certs/749e9e03.0 create mode 120000 ssl/certs/75d1b2ed.0 create mode 120000 ssl/certs/7f3d5d1d.0 create mode 120000 ssl/certs/8096d0a9.0 delete mode 120000 ssl/certs/9af9f759.0 delete mode 120000 ssl/certs/9b353c9a.0 create mode 120000 ssl/certs/9d04f354.0 create mode 120000 ssl/certs/ACCVRAIZ1.pem create mode 120000 ssl/certs/Atos_TrustedRoot_2011.pem create mode 120000 ssl/certs/DigiCert_Assured_ID_Root_G2.pem create mode 120000 ssl/certs/DigiCert_Assured_ID_Root_G3.pem create mode 120000 ssl/certs/DigiCert_Global_Root_G2.pem create mode 120000 ssl/certs/DigiCert_Global_Root_G3.pem create mode 120000 ssl/certs/DigiCert_Trusted_Root_G4.pem create mode 120000 ssl/certs/E-Tugra_Certification_Authority.pem delete mode 120000 ssl/certs/Entrust.net_Secure_Server_CA.pem delete mode 120000 ssl/certs/Firmaprofesional_Root_CA.pem create mode 120000 ssl/certs/QuoVadis_Root_CA_1_G3.pem create mode 120000 ssl/certs/QuoVadis_Root_CA_2_G3.pem create mode 120000 ssl/certs/QuoVadis_Root_CA_3_G3.pem delete mode 120000 ssl/certs/RSA_Root_Certificate_1.pem create mode 120000 ssl/certs/SG_TRUST_SERVICES_RACINE.pem create mode 120000 ssl/certs/StartCom_Certification_Authority_2.pem create mode 120000 ssl/certs/T-TeleSec_GlobalRoot_Class_2.pem delete mode 120000 ssl/certs/TDC_Internet_Root_CA.pem delete mode 120000 ssl/certs/TDC_OCES_Root_CA.pem create mode 120000 ssl/certs/TWCA_Global_Root_CA.pem create mode 120000 ssl/certs/TeliaSonera_Root_CA_v1.pem delete mode 120000 ssl/certs/ValiCert_Class_1_VA.pem delete mode 120000 ssl/certs/ValiCert_Class_2_VA.pem create mode 120000 ssl/certs/Verisign_Class_3_Public_Primary_Certification_Authority_2.pem delete mode 120000 ssl/certs/Wells_Fargo_Root_CA.pem create mode 120000 ssl/certs/WoSign.pem create mode 120000 ssl/certs/WoSign_China.pem create mode 120000 ssl/certs/a94d09e5.0 create mode 120000 ssl/certs/ae8153b9.1 delete mode 120000 ssl/certs/cacert.org_class3.pem delete mode 120000 ssl/certs/ce026bf8.0 create mode 120000 ssl/certs/dd8e9d41.0 create mode 120000 ssl/certs/e18bfb83.0 create mode 120000 ssl/certs/e36a6752.0 diff --git a/.etckeeper b/.etckeeper index 6ae6054..5ab9218 100755 --- a/.etckeeper +++ b/.etckeeper @@ -7,6 +7,7 @@ mkdir -p './dpkg/dpkg.cfg.d' mkdir -p './fail2ban/fail2ban.d' mkdir -p './gtk-2.0/x86_64-pc-linux-gnu' mkdir -p './pango/x86_64-pc-linux-gnu' +mkdir -p './postfix/postfix-files.d' mkdir -p './salt/pki/minions_pre' mkdir -p './salt/pki/minions_rejected' mkdir -p './security/limits.d' @@ -421,6 +422,8 @@ maybe chmod 0644 'config-archive/etc/mysql/my.cnf.dist' maybe chmod 0755 'config-archive/etc/nagios' maybe chmod 0640 'config-archive/etc/nagios/nrpe.cfg' maybe chmod 0640 'config-archive/etc/nagios/nrpe.cfg.dist' +maybe chmod 0644 'config-archive/etc/ntp.conf' +maybe chmod 0644 'config-archive/etc/ntp.conf.dist.new' maybe chmod 0755 'config-archive/etc/openldap' maybe chmod 0600 'config-archive/etc/openldap/DB_CONFIG.example' maybe chmod 0600 'config-archive/etc/openldap/DB_CONFIG.example.dist' @@ -564,6 +567,7 @@ maybe chmod 0644 'config-archive/etc/postfix/main.cf.5' maybe chmod 0644 'config-archive/etc/postfix/main.cf.6' maybe chmod 0644 'config-archive/etc/postfix/main.cf.7' maybe chmod 0644 'config-archive/etc/postfix/main.cf.8' +maybe chmod 0644 'config-archive/etc/postfix/main.cf.9' maybe chmod 0644 'config-archive/etc/postfix/main.cf.dist' maybe chmod 0644 'config-archive/etc/profile' maybe chmod 0755 'config-archive/etc/profile.d' @@ -605,6 +609,7 @@ maybe chmod 0440 'config-archive/etc/sudoers.dist' maybe chmod 0755 'config-archive/etc/syslog-ng' maybe chmod 0644 'config-archive/etc/syslog-ng/syslog-ng.conf' maybe chmod 0644 'config-archive/etc/syslog-ng/syslog-ng.conf.1' +maybe chmod 0644 'config-archive/etc/syslog-ng/syslog-ng.conf.2' maybe chmod 0644 'config-archive/etc/syslog-ng/syslog-ng.conf.dist.new' maybe chmod 0644 'config-archive/etc/sysstat' maybe chmod 0644 'config-archive/etc/sysstat.dist' @@ -710,8 +715,8 @@ maybe chmod 0755 'cron.daily/00-logwatch' maybe chmod 0755 'cron.daily/logrotate' maybe chmod 0755 'cron.daily/makewhatis' maybe chmod 0755 'cron.daily/mlocate' +maybe chmod 0644 'cron.daily/reoback' maybe chmod 0755 'cron.daily/rkhunter' -maybe chmod 0644 'cron.daily/run_reoback.sh' maybe chmod 0644 'cron.deny' maybe chmod 0750 'cron.hourly' maybe chmod 0644 'cron.hourly/.keep_sys-process_cronbase-0' @@ -803,9 +808,21 @@ maybe chmod 0644 'env.d/99gentoolkit-env' maybe chmod 0755 'env.d/binutils' maybe chmod 0644 'env.d/binutils/config-x86_64-pc-linux-gnu' maybe chmod 0644 'env.d/binutils/x86_64-pc-linux-gnu-2.24' +maybe chmod 0755 'env.d/blas' +maybe chmod 0755 'env.d/blas/lib64' +maybe chmod 0644 'env.d/blas/lib64/config' +maybe chmod 0644 'env.d/blas/lib64/reference' +maybe chmod 0755 'env.d/cblas' +maybe chmod 0755 'env.d/cblas/lib64' +maybe chmod 0644 'env.d/cblas/lib64/config' +maybe chmod 0644 'env.d/cblas/lib64/reference' maybe chmod 0755 'env.d/gcc' maybe chmod 0644 'env.d/gcc/config-x86_64-pc-linux-gnu' maybe chmod 0644 'env.d/gcc/x86_64-pc-linux-gnu-4.8.3' +maybe chmod 0755 'env.d/lapack' +maybe chmod 0755 'env.d/lapack/lib64' +maybe chmod 0644 'env.d/lapack/lib64/config' +maybe chmod 0644 'env.d/lapack/lib64/reference' maybe chmod 0755 'env.d/python' maybe chmod 0644 'env.d/python/.keep_app-admin_eselect-python-0' maybe chmod 0644 'env.d/python/config' @@ -1581,6 +1598,8 @@ maybe chmod 0744 'postfix/mkpostfixcert' maybe chown 'frank' 'postfix/postfix-cert.cnf' maybe chgrp 'users' 'postfix/postfix-cert.cnf' maybe chmod 0644 'postfix/postfix-cert.cnf' +maybe chmod 0644 'postfix/postfix-files' +maybe chmod 0755 'postfix/postfix-files.d' maybe chmod 0600 'postfix/postfix.pem' maybe chgrp 'postgrey' 'postfix/postgrey_whitelist_clients' maybe chmod 0640 'postfix/postgrey_whitelist_clients' diff --git a/ca-certificates.conf b/ca-certificates.conf index 51d6687..5a3e6c0 100644 --- a/ca-certificates.conf +++ b/ca-certificates.conf @@ -1,9 +1,9 @@ -# Automatically generated by app-misc/ca-certificates-20130906-r1 -# Tue Apr 1 20:45:18 UTC 2014 +# Automatically generated by app-misc/ca-certificates-20140927.3.17.2 +# Mon Mar 23 14:13:26 UTC 2015 # Do not edit. -cacert.org/cacert.org_class3.crt cacert.org/cacert.org_root.crt mozilla/A-Trust-nQual-03.crt +mozilla/ACCVRAIZ1.crt mozilla/ACEDICOM_Root.crt mozilla/AC_Raíz_Certicámara_S.A..crt mozilla/Actalis_Authentication_Root_CA.crt @@ -18,6 +18,7 @@ mozilla/AffirmTrust_Premium_ECC.crt mozilla/America_Online_Root_Certification_Authority_1.crt mozilla/America_Online_Root_Certification_Authority_2.crt mozilla/ApplicationCA_-_Japanese_Government.crt +mozilla/Atos_TrustedRoot_2011.crt mozilla/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.crt mozilla/Baltimore_CyberTrust_Root.crt mozilla/Buypass_Class_2_CA_1.crt @@ -51,21 +52,25 @@ mozilla/DST_ACES_CA_X6.crt mozilla/DST_Root_CA_X3.crt mozilla/Deutsche_Telekom_Root_CA_2.crt mozilla/DigiCert_Assured_ID_Root_CA.crt +mozilla/DigiCert_Assured_ID_Root_G2.crt +mozilla/DigiCert_Assured_ID_Root_G3.crt mozilla/DigiCert_Global_Root_CA.crt +mozilla/DigiCert_Global_Root_G2.crt +mozilla/DigiCert_Global_Root_G3.crt mozilla/DigiCert_High_Assurance_EV_Root_CA.crt +mozilla/DigiCert_Trusted_Root_G4.crt mozilla/Digital_Signature_Trust_Co._Global_CA_1.crt mozilla/Digital_Signature_Trust_Co._Global_CA_3.crt mozilla/E-Guven_Kok_Elektronik_Sertifika_Hizmet_Saglayicisi.crt +mozilla/E-Tugra_Certification_Authority.crt mozilla/EBG_Elektronik_Sertifika_Hizmet_Sağlayıcısı.crt mozilla/EC-ACC.crt mozilla/EE_Certification_Centre_Root_CA.crt mozilla/Entrust.net_Premium_2048_Secure_Server_CA.crt -mozilla/Entrust.net_Secure_Server_CA.crt mozilla/Entrust_Root_Certification_Authority.crt mozilla/Equifax_Secure_CA.crt mozilla/Equifax_Secure_Global_eBusiness_CA.crt mozilla/Equifax_Secure_eBusiness_CA_1.crt -mozilla/Firmaprofesional_Root_CA.crt mozilla/GTE_CyberTrust_Global_Root.crt mozilla/GeoTrust_Global_CA.crt mozilla/GeoTrust_Global_CA_2.crt @@ -96,12 +101,15 @@ mozilla/Network_Solutions_Certificate_Authority.crt mozilla/OISTE_WISeKey_Global_Root_GA_CA.crt mozilla/PSCProcert.crt mozilla/QuoVadis_Root_CA.crt +mozilla/QuoVadis_Root_CA_1_G3.crt mozilla/QuoVadis_Root_CA_2.crt +mozilla/QuoVadis_Root_CA_2_G3.crt mozilla/QuoVadis_Root_CA_3.crt -mozilla/RSA_Root_Certificate_1.crt +mozilla/QuoVadis_Root_CA_3_G3.crt mozilla/RSA_Security_2048_v3.crt mozilla/Root_CA_Generalitat_Valenciana.crt mozilla/S-TRUST_Authentication_and_Encryption_Root_CA_2005_PN.crt +mozilla/SG_TRUST_SERVICES_RACINE.crt mozilla/SecureSign_RootCA11.crt mozilla/SecureTrust_CA.crt mozilla/Secure_Global_CA.crt @@ -116,6 +124,7 @@ mozilla/Starfield_Class_2_CA.crt mozilla/Starfield_Root_Certificate_Authority_-_G2.crt mozilla/Starfield_Services_Root_Certificate_Authority_-_G2.crt mozilla/StartCom_Certification_Authority.crt +mozilla/StartCom_Certification_Authority_2.crt mozilla/StartCom_Certification_Authority_G2.crt mozilla/SwissSign_Gold_CA_-_G2.crt mozilla/SwissSign_Platinum_CA_-_G2.crt @@ -123,17 +132,18 @@ mozilla/SwissSign_Silver_CA_-_G2.crt mozilla/Swisscom_Root_CA_1.crt mozilla/Swisscom_Root_CA_2.crt mozilla/Swisscom_Root_EV_CA_2.crt +mozilla/T-TeleSec_GlobalRoot_Class_2.crt mozilla/T-TeleSec_GlobalRoot_Class_3.crt mozilla/TC_TrustCenter_Class_2_CA_II.crt mozilla/TC_TrustCenter_Class_3_CA_II.crt mozilla/TC_TrustCenter_Universal_CA_I.crt -mozilla/TDC_Internet_Root_CA.crt -mozilla/TDC_OCES_Root_CA.crt mozilla/TURKTRUST_Certificate_Services_Provider_Root_1.crt mozilla/TURKTRUST_Certificate_Services_Provider_Root_2.crt mozilla/TURKTRUST_Certificate_Services_Provider_Root_2007.crt +mozilla/TWCA_Global_Root_CA.crt mozilla/TWCA_Root_Certification_Authority.crt mozilla/Taiwan_GRCA.crt +mozilla/TeliaSonera_Root_CA_v1.crt mozilla/Thawte_Premium_Server_CA.crt mozilla/Thawte_Server_CA.crt mozilla/Trustis_FPS_Root_CA.crt @@ -141,8 +151,6 @@ mozilla/TÜBİTAK_UEKAE_Kök_Sertifika_Hizmet_Sağlayıcısı_-_Sürüm_3.crt mozilla/UTN_DATACorp_SGC_Root_CA.crt mozilla/UTN_USERFirst_Email_Root_CA.crt mozilla/UTN_USERFirst_Hardware_Root_CA.crt -mozilla/ValiCert_Class_1_VA.crt -mozilla/ValiCert_Class_2_VA.crt mozilla/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G4.crt mozilla/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.crt mozilla/VeriSign_Universal_Root_Certification_Authority.crt @@ -154,10 +162,12 @@ mozilla/Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.crt mozilla/Verisign_Class_3_Public_Primary_Certification_Authority.crt mozilla/Verisign_Class_3_Public_Primary_Certification_Authority_-_G2.crt mozilla/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.crt +mozilla/Verisign_Class_3_Public_Primary_Certification_Authority_2.crt mozilla/Verisign_Class_4_Public_Primary_Certification_Authority_-_G3.crt mozilla/Visa_eCommerce_Root.crt mozilla/WellsSecure_Public_Root_Certificate_Authority.crt -mozilla/Wells_Fargo_Root_CA.crt +mozilla/WoSign.crt +mozilla/WoSign_China.crt mozilla/XRamp_Global_CA_Root.crt mozilla/certSIGN_ROOT_CA.crt mozilla/ePKI_Root_Certification_Authority.crt diff --git a/conf.d/syslog-ng b/conf.d/syslog-ng index 6a437d1..42fa26a 100644 --- a/conf.d/syslog-ng +++ b/conf.d/syslog-ng @@ -31,7 +31,7 @@ # SYSLOG_NG_CONFIGFILE=/etc/syslog-ng/syslog-ng.conf # SYSLOG_NG_STATEFILE_DIR=/var/lib/syslog-ng # SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist -# SYSLOG_NG_PIDFILE_DIR=/var/run +# SYSLOG_NG_PIDFILE_DIR=/run # SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE_DIR}/syslog-ng.pid # SYSLOG_NG_GROUP=root # SYSLOG_NG_USER=root diff --git a/config-archive/etc/ntp.conf b/config-archive/etc/ntp.conf new file mode 100644 index 0000000..b7ef1b3 --- /dev/null +++ b/config-archive/etc/ntp.conf @@ -0,0 +1,54 @@ +# NOTES: +# DHCP clients can append or replace NTP configuration files. +# You should consult your DHCP client documentation about its +# default behaviour and how to change it. + +# Name of the servers ntpd should sync with +# Please respect the access policy as stated by the responsible person. +#server ntp.example.tld iburst + +# Common pool for random people +#server pool.ntp.org + +# Pools for Gentoo users +server 0.debian.pool.ntp.org +server 1.debian.pool.ntp.org +server 2.debian.pool.ntp.org +server 3.debian.pool.ntp.org + +## +# A list of available servers can be found here: +# http://www.pool.ntp.org/ +# http://www.pool.ntp.org/#use +# A good way to get servers for your machine is: +# netselect -s 3 pool.ntp.org +## + +# you should not need to modify the following paths +driftfile /var/lib/ntp/ntp.drift + +#server ntplocal.example.com prefer +#server timeserver.example.org + +# Warning: Using default NTP settings will leave your NTP +# server accessible to all hosts on the Internet. + +# If you want to deny all machines (including your own) +# from accessing the NTP server, uncomment: +#restrict default ignore + + +# Default configuration: +# - Allow only time queries, at a limited rate, sending KoD when in excess. +# - Allow all local queries (IPv4, IPv6) +restrict default nomodify nopeer noquery limited kod +restrict 127.0.0.1 +restrict [::1] + + +# To allow machines within your network to synchronize +# their clocks with your server, but ensure they are +# not allowed to configure the server or used as peers +# to synchronize against, uncomment this line. +# +#restrict 192.168.0.0 mask 255.255.255.0 nomodify nopeer notrap diff --git a/config-archive/etc/ntp.conf.dist.new b/config-archive/etc/ntp.conf.dist.new new file mode 100644 index 0000000..97bed8d --- /dev/null +++ b/config-archive/etc/ntp.conf.dist.new @@ -0,0 +1,54 @@ +# NOTES: +# DHCP clients can append or replace NTP configuration files. +# You should consult your DHCP client documentation about its +# default behaviour and how to change it. + +# Name of the servers ntpd should sync with +# Please respect the access policy as stated by the responsible person. +#server ntp.example.tld iburst + +# Common pool for random people +#server pool.ntp.org + +# Pools for Gentoo users +server 0.gentoo.pool.ntp.org +server 1.gentoo.pool.ntp.org +server 2.gentoo.pool.ntp.org +server 3.gentoo.pool.ntp.org + +## +# A list of available servers can be found here: +# http://www.pool.ntp.org/ +# http://www.pool.ntp.org/#use +# A good way to get servers for your machine is: +# netselect -s 3 pool.ntp.org +## + +# you should not need to modify the following paths +driftfile /var/lib/ntp/ntp.drift + +#server ntplocal.example.com prefer +#server timeserver.example.org + +# Warning: Using default NTP settings will leave your NTP +# server accessible to all hosts on the Internet. + +# If you want to deny all machines (including your own) +# from accessing the NTP server, uncomment: +#restrict default ignore + + +# Default configuration: +# - Allow only time queries, at a limited rate, sending KoD when in excess. +# - Allow all local queries (IPv4, IPv6) +restrict default nomodify nopeer noquery limited kod +restrict 127.0.0.1 +restrict [::1] + + +# To allow machines within your network to synchronize +# their clocks with your server, but ensure they are +# not allowed to configure the server or used as peers +# to synchronize against, uncomment this line. +# +#restrict 192.168.0.0 mask 255.255.255.0 nomodify nopeer notrap diff --git a/config-archive/etc/postfix/main.cf b/config-archive/etc/postfix/main.cf index 2c7bd57..e839789 100644 --- a/config-archive/etc/postfix/main.cf +++ b/config-archive/etc/postfix/main.cf @@ -5,7 +5,7 @@ # 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/. +# http://www.postfix.org/BASIC_CONFIGURATION_README.html etc. # # For best results, change no more than 2-3 parameters at a time, # and test if Postfix still works after every change. @@ -640,7 +640,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.10.3/html +html_directory = /usr/share/doc/postfix-2.11.3/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.10.3/readme +readme_directory = /usr/share/doc/postfix-2.11.3/readme home_mailbox = .maildir/ broken_sasl_auth_clients = yes @@ -662,7 +662,7 @@ inet_protocols = all mydomain = uhu-banane.de # default: mynetworks = 127.0.0.0/8 46.16.73.175/32 [::1]/128 [fe80::%eth0]/64 -mynetworks = 127.0.0.0/8 46.16.73.175/32 [::1]/128 +mynetworks = 127.0.0.0/8 208.94.38.84/32 46.16.73.175/32 [::1]/128 myorigin = $mydomain recipient_delimiter = + diff --git a/config-archive/etc/postfix/main.cf.1 b/config-archive/etc/postfix/main.cf.1 index b155ad2..2c7bd57 100644 --- a/config-archive/etc/postfix/main.cf.1 +++ b/config-archive/etc/postfix/main.cf.1 @@ -640,7 +640,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.10.2/html +html_directory = /usr/share/doc/postfix-2.10.3/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -653,7 +653,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-2.10.2/readme +readme_directory = /usr/share/doc/postfix-2.10.3/readme home_mailbox = .maildir/ broken_sasl_auth_clients = yes diff --git a/config-archive/etc/postfix/main.cf.2 b/config-archive/etc/postfix/main.cf.2 index b47d5a0..b155ad2 100644 --- a/config-archive/etc/postfix/main.cf.2 +++ b/config-archive/etc/postfix/main.cf.2 @@ -640,7 +640,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.10.1/html +html_directory = /usr/share/doc/postfix-2.10.2/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -653,7 +653,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-2.10.1/readme +readme_directory = /usr/share/doc/postfix-2.10.2/readme home_mailbox = .maildir/ broken_sasl_auth_clients = yes diff --git a/config-archive/etc/postfix/main.cf.3 b/config-archive/etc/postfix/main.cf.3 index a3de299..b47d5a0 100644 --- a/config-archive/etc/postfix/main.cf.3 +++ b/config-archive/etc/postfix/main.cf.3 @@ -640,7 +640,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.10.0/html +html_directory = /usr/share/doc/postfix-2.10.1/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -653,7 +653,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-2.10.0/readme +readme_directory = /usr/share/doc/postfix-2.10.1/readme home_mailbox = .maildir/ broken_sasl_auth_clients = yes diff --git a/config-archive/etc/postfix/main.cf.4 b/config-archive/etc/postfix/main.cf.4 index f0345ad..a3de299 100644 --- a/config-archive/etc/postfix/main.cf.4 +++ b/config-archive/etc/postfix/main.cf.4 @@ -640,7 +640,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.9.5/html +html_directory = /usr/share/doc/postfix-2.10.0/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -653,7 +653,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-2.9.5/readme +readme_directory = /usr/share/doc/postfix-2.10.0/readme home_mailbox = .maildir/ broken_sasl_auth_clients = yes diff --git a/config-archive/etc/postfix/main.cf.5 b/config-archive/etc/postfix/main.cf.5 index d148c85..f0345ad 100644 --- a/config-archive/etc/postfix/main.cf.5 +++ b/config-archive/etc/postfix/main.cf.5 @@ -640,7 +640,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.9.4/html +html_directory = /usr/share/doc/postfix-2.9.5/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -653,7 +653,7 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-2.9.4/readme +readme_directory = /usr/share/doc/postfix-2.9.5/readme home_mailbox = .maildir/ broken_sasl_auth_clients = yes diff --git a/config-archive/etc/postfix/main.cf.6 b/config-archive/etc/postfix/main.cf.6 index fb2117d..d148c85 100644 --- a/config-archive/etc/postfix/main.cf.6 +++ b/config-archive/etc/postfix/main.cf.6 @@ -640,7 +640,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.9.3/html +html_directory = /usr/share/doc/postfix-2.9.4/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.9.3/readme +readme_directory = /usr/share/doc/postfix-2.9.4/readme home_mailbox = .maildir/ broken_sasl_auth_clients = yes diff --git a/config-archive/etc/postfix/main.cf.7 b/config-archive/etc/postfix/main.cf.7 index 95061cd..fb2117d 100644 --- a/config-archive/etc/postfix/main.cf.7 +++ b/config-archive/etc/postfix/main.cf.7 @@ -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,7 +653,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/ broken_sasl_auth_clients = yes diff --git a/config-archive/etc/postfix/main.cf.8 b/config-archive/etc/postfix/main.cf.8 index 2d40235..95061cd 100644 --- a/config-archive/etc/postfix/main.cf.8 +++ b/config-archive/etc/postfix/main.cf.8 @@ -635,7 +635,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. # @@ -648,7 +648,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/ broken_sasl_auth_clients = yes diff --git a/config-archive/etc/postfix/main.cf.9 b/config-archive/etc/postfix/main.cf.9 new file mode 100644 index 0000000..2d40235 --- /dev/null +++ b/config-archive/etc/postfix/main.cf.9 @@ -0,0 +1,681 @@ +# 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 + +# 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 + +# 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 + +# 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 + +# 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 + +# The relay_domains parameter restricts what destinations this system will +# relay mail to. See the smtpd_recipient_restrictions description in +# postconf(5) for detailed information. +# +# By default, Postfix relays mail +# - from "trusted" clients (IP address matches $mynetworks) to any destination, +# - from "untrusted" clients to destinations that match $relay_domains or +# subdomains thereof, except addresses with sender-specified routing. +# The default relay_domains value is $mydestination. +# +# In addition to the above, the Postfix SMTP server by default accepts mail +# that Postfix is final destination for: +# - destinations that match $inet_interfaces or $proxy_interfaces, +# - destinations that match $mydestination +# - destinations that match $virtual_alias_domains, +# - destinations that match $virtual_mailbox_domains. +# These destinations do not need to be listed in $relay_domains. +# +# Specify a list of hosts or domains, /file/name patterns or type:name +# lookup tables, separated by commas and/or whitespace. Continue +# long lines by starting the next line with whitespace. A file name +# is replaced by its contents; a type:name table is matched when a +# (parent) domain appears as lookup key. +# +# NOTE: Postfix will not automatically forward mail for domains that +# list this system as their primary or backup MX host. See the +# permit_mx_backup restriction description in postconf(5). +# +#relay_domains = $mydestination + +# INTERNET OR INTRANET + +# The relayhost parameter specifies the default host to send mail to +# when no entry is matched in the optional transport(5) table. When +# no relayhost is given, mail is routed directly to the destination. +# +# On an intranet, specify the organizational domain name. If your +# internal DNS uses no MX records, specify the name of the intranet +# gateway host instead. +# +# In the case of SMTP, specify a domain, host, host:port, [host]:port, +# [address] or [address]:port; the form [host] turns off MX lookups. +# +# If you're connected via UUCP, see also the default_transport parameter. +# +#relayhost = $mydomain +#relayhost = [gateway.my.domain] +#relayhost = [mailserver.isp.tld] +#relayhost = uucphost +#relayhost = [an.ip.add.ress] + +# REJECTING UNKNOWN RELAY USERS +# +# The relay_recipient_maps parameter specifies optional lookup tables +# with all addresses in the domains that match $relay_domains. +# +# If this parameter is defined, then the SMTP server will reject +# mail for unknown relay users. This feature is off by default. +# +# The right-hand side of the lookup tables is conveniently ignored. +# In the left-hand side, specify an @domain.tld wild-card, or specify +# a user@domain.tld address. +# +#relay_recipient_maps = hash:/etc/postfix/relay_recipients + +# INPUT RATE CONTROL +# +# The in_flow_delay configuration parameter implements mail input +# flow control. This feature is turned on by default, although it +# still needs further development (it's disabled on SCO UNIX due +# to an SCO bug). +# +# A Postfix process will pause for $in_flow_delay seconds before +# accepting a new message, when the message arrival rate exceeds the +# message delivery rate. With the default 100 SMTP server process +# limit, this limits the mail inflow to 100 messages a second more +# than the number of messages delivered per second. +# +# Specify 0 to disable the feature. Valid delays are 0..10. +# +#in_flow_delay = 1s + +# ADDRESS REWRITING +# +# The ADDRESS_REWRITING_README document gives information about +# address masquerading or other forms of address rewriting including +# username->Firstname.Lastname mapping. + +# ADDRESS REDIRECTION (VIRTUAL DOMAIN) +# +# The VIRTUAL_README document gives information about the many forms +# of domain hosting that Postfix supports. + +# "USER HAS MOVED" BOUNCE MESSAGES +# +# See the discussion in the ADDRESS_REWRITING_README document. + +# TRANSPORT MAP +# +# See the discussion in the ADDRESS_REWRITING_README document. + +# ALIAS DATABASE +# +# The alias_maps parameter specifies the list of alias databases used +# by the local delivery agent. The default list is system dependent. +# +# On systems with NIS, the default is to search the local alias +# database, then the NIS alias database. See aliases(5) for syntax +# details. +# +# If you change the alias database, run "postalias /etc/aliases" (or +# wherever your system stores the mail alias file), or simply run +# "newaliases" to build the necessary DBM or DB file. +# +# It will take a minute or so before changes become visible. Use +# "postfix reload" to eliminate the delay. +# +#alias_maps = dbm:/etc/aliases +#alias_maps = hash:/etc/aliases +#alias_maps = hash:/etc/aliases, nis:mail.aliases +#alias_maps = netinfo:/aliases + +# The alias_database parameter specifies the alias database(s) that +# are built with "newaliases" or "sendmail -bi". This is a separate +# configuration parameter, because alias_maps (see above) may specify +# tables that are not necessarily all under control by Postfix. +# +#alias_database = dbm:/etc/aliases +#alias_database = dbm:/etc/mail/aliases +#alias_database = hash:/etc/aliases +#alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases + +# ADDRESS EXTENSIONS (e.g., user+foo) +# +# The recipient_delimiter parameter specifies the separator between +# user names and address extensions (user+foo). See canonical(5), +# local(8), relocated(5) and virtual(5) for the effects this has on +# aliases, canonical, virtual, relocated and .forward file lookups. +# Basically, the software tries user+foo and .forward+foo before +# trying user and .forward. +# +#recipient_delimiter = + + +# DELIVERY TO MAILBOX +# +# The home_mailbox parameter specifies the optional pathname of a +# mailbox file relative to a user's home directory. The default +# mailbox file is /var/spool/mail/user or /var/mail/user. Specify +# "Maildir/" for qmail-style delivery (the / is required). +# +#home_mailbox = Mailbox +#home_mailbox = Maildir/ + +# The mail_spool_directory parameter specifies the directory where +# UNIX-style mailboxes are kept. The default setting depends on the +# system type. +# +#mail_spool_directory = /var/mail +#mail_spool_directory = /var/spool/mail + +# The mailbox_command parameter specifies the optional external +# command to use instead of mailbox delivery. The command is run as +# the recipient with proper HOME, SHELL and LOGNAME environment settings. +# Exception: delivery for root is done as $default_user. +# +# Other environment variables of interest: USER (recipient username), +# EXTENSION (address extension), DOMAIN (domain part of address), +# and LOCAL (the address localpart). +# +# Unlike other Postfix configuration parameters, the mailbox_command +# parameter is not subjected to $parameter substitutions. This is to +# make it easier to specify shell syntax (see example below). +# +# Avoid shell meta characters because they will force Postfix to run +# an expensive shell process. Procmail alone is expensive enough. +# +# IF YOU USE THIS TO DELIVER MAIL SYSTEM-WIDE, YOU MUST SET UP AN +# ALIAS THAT FORWARDS MAIL FOR ROOT TO A REAL USER. +# +#mailbox_command = /some/where/procmail +#mailbox_command = /some/where/procmail -a "$EXTENSION" + +# The mailbox_transport specifies the optional transport in master.cf +# to use after processing aliases and .forward files. This parameter +# has precedence over the mailbox_command, fallback_transport and +# luser_relay parameters. +# +# Specify a string of the form transport:nexthop, where transport is +# the name of a mail delivery transport defined in master.cf. The +# :nexthop part is optional. For more details see the sample transport +# configuration file. +# +# NOTE: if you use this feature for accounts not in the UNIX password +# file, then you must update the "local_recipient_maps" setting in +# the main.cf file, otherwise the SMTP server will reject mail for +# non-UNIX accounts with "User unknown in local recipient table". +# +#mailbox_transport = lmtp:unix:/file/name +#mailbox_transport = cyrus + +# The fallback_transport specifies the optional transport in master.cf +# to use for recipients that are not found in the UNIX passwd database. +# This parameter has precedence over the luser_relay parameter. +# +# Specify a string of the form transport:nexthop, where transport is +# the name of a mail delivery transport defined in master.cf. The +# :nexthop part is optional. For more details see the sample transport +# configuration file. +# +# NOTE: if you use this feature for accounts not in the UNIX password +# file, then you must update the "local_recipient_maps" setting in +# the main.cf file, otherwise the SMTP server will reject mail for +# non-UNIX accounts with "User unknown in local recipient table". +# +#fallback_transport = lmtp:unix:/file/name +#fallback_transport = cyrus +#fallback_transport = + +# The luser_relay parameter specifies an optional destination address +# for unknown recipients. By default, mail for unknown@$mydestination, +# unknown@[$inet_interfaces] or unknown@[$proxy_interfaces] is returned +# as undeliverable. +# +# The following expansions are done on luser_relay: $user (recipient +# username), $shell (recipient shell), $home (recipient home directory), +# $recipient (full recipient address), $extension (recipient address +# extension), $domain (recipient domain), $local (entire recipient +# localpart), $recipient_delimiter. Specify ${name?value} or +# ${name:value} to expand value only when $name does (does not) exist. +# +# luser_relay works only for the default Postfix local delivery agent. +# +# NOTE: if you use this feature for accounts not in the UNIX password +# file, then you must specify "local_recipient_maps =" (i.e. empty) in +# the main.cf file, otherwise the SMTP server will reject mail for +# non-UNIX accounts with "User unknown in local recipient table". +# +#luser_relay = $user@other.host +#luser_relay = $local@other.host +#luser_relay = admin+$local + +# JUNK MAIL CONTROLS +# +# The controls listed here are only a very small subset. The file +# SMTPD_ACCESS_README provides an overview. + +# The header_checks parameter specifies an optional table with patterns +# that each logical message header is matched against, including +# headers that span multiple physical lines. +# +# By default, these patterns also apply to MIME headers and to the +# headers of attached messages. With older Postfix versions, MIME and +# attached message headers were treated as body text. +# +# For details, see "man header_checks". +# +#header_checks = regexp:/etc/postfix/header_checks + +# FAST ETRN SERVICE +# +# Postfix maintains per-destination logfiles with information about +# deferred mail, so that mail can be flushed quickly with the SMTP +# "ETRN domain.tld" command, or by executing "sendmail -qRdomain.tld". +# See the ETRN_README document for a detailed description. +# +# The fast_flush_domains parameter controls what destinations are +# eligible for this service. By default, they are all domains that +# this server is willing to relay mail to. +# +#fast_flush_domains = $relay_domains + +# SHOW SOFTWARE VERSION OR NOT +# +# The smtpd_banner parameter specifies the text that follows the 220 +# code in the SMTP server's greeting banner. Some people like to see +# the mail version advertised. By default, Postfix shows no version. +# +# You MUST specify $myhostname at the start of the text. That is an +# RFC requirement. Postfix itself does not care. +# +#smtpd_banner = $myhostname ESMTP $mail_name +#smtpd_banner = $myhostname ESMTP $mail_name ($mail_version) + +# PARALLEL DELIVERY TO THE SAME DESTINATION +# +# How many parallel deliveries to the same user or domain? With local +# delivery, it does not make sense to do massively parallel delivery +# to the same user, because mailbox updates must happen sequentially, +# and expensive pipelines in .forward files can cause disasters when +# too many are run at the same time. With SMTP deliveries, 10 +# simultaneous connections to the same domain could be sufficient to +# raise eyebrows. +# +# Each message delivery transport has its XXX_destination_concurrency_limit +# parameter. The default is $default_destination_concurrency_limit for +# most delivery transports. For the local delivery agent the default is 2. + +#local_destination_concurrency_limit = 2 +#default_destination_concurrency_limit = 20 + +# DEBUGGING CONTROL +# +# The debug_peer_level parameter specifies the increment in verbose +# logging level when an SMTP client or server host name or address +# matches a pattern in the debug_peer_list parameter. +# +debug_peer_level = 2 + +# The debug_peer_list parameter specifies an optional list of domain +# or network patterns, /file/name patterns or type:name tables. When +# an SMTP client or server host name or address matches a pattern, +# increase the verbose logging level by the amount specified in the +# debug_peer_level parameter. +# +#debug_peer_list = 127.0.0.1 +#debug_peer_list = some.domain + +# The debugger_command specifies the external command that is executed +# when a Postfix daemon program is run with the -D option. +# +# Use "command .. & sleep 5" so that the debugger can attach before +# the process marches on. If you use an X-based debugger, be sure to +# set up your XAUTHORITY environment variable before starting Postfix. +# +debugger_command = + PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin + ddd $daemon_directory/$process_name $process_id & sleep 5 + +# If you can't use X, use this to capture the call stack when a +# daemon crashes. The result is in a file in the configuration +# directory, and is named after the process name and the process ID. +# +# debugger_command = +# PATH=/bin:/usr/bin:/usr/local/bin; export PATH; (echo cont; +# echo where) | gdb $daemon_directory/$process_name $process_id 2>&1 +# >$config_directory/$process_name.$process_id.log & sleep 5 +# +# Another possibility is to run gdb under a detached screen session. +# To attach to the screen sesssion, su root and run "screen -r +# " where uniquely matches one of the detached +# sessions (from "screen -list"). +# +# debugger_command = +# PATH=/bin:/usr/bin:/sbin:/usr/sbin; export PATH; screen +# -dmS $process_name gdb $daemon_directory/$process_name +# $process_id & sleep 1 + +# INSTALL-TIME CONFIGURATION INFORMATION +# +# The following parameters are used when installing a new Postfix version. +# +# sendmail_path: The full pathname of the Postfix sendmail command. +# This is the Sendmail-compatible mail posting interface. +# +sendmail_path = /usr/sbin/sendmail + +# newaliases_path: The full pathname of the Postfix newaliases command. +# This is the Sendmail-compatible command to build alias databases. +# +newaliases_path = /usr/bin/newaliases + +# mailq_path: The full pathname of the Postfix mailq command. This +# is the Sendmail-compatible mail queue listing command. +# +mailq_path = /usr/bin/mailq + +# setgid_group: The group for mail submission and queue management +# commands. This must be a group name with a numerical group ID that +# is not shared with other accounts, not even with the Postfix account. +# +setgid_group = postdrop + +# html_directory: The location of the Postfix HTML documentation. +# +html_directory = /usr/share/doc/postfix-2.8.7/html + +# manpage_directory: The location of the Postfix on-line manual pages. +# +manpage_directory = /usr/share/man + +# sample_directory: The location of the Postfix sample configuration files. +# This parameter is obsolete as of Postfix 2.1. +# +sample_directory = /etc/postfix + +# readme_directory: The location of the Postfix README files. +# +readme_directory = /usr/share/doc/postfix-2.8.7/readme +home_mailbox = .maildir/ +broken_sasl_auth_clients = yes + +inet_protocols = all + +mydomain = uhu-banane.de + +# default: mynetworks = 127.0.0.0/8 46.16.73.175/32 [::1]/128 [fe80::%eth0]/64 +mynetworks = 127.0.0.0/8 46.16.73.175/32 [::1]/128 + +myorigin = $mydomain +recipient_delimiter = + +relayhost = [mail.brehm-online.com] +smtp_sasl_auth_enable = yes +smtp_sasl_password_maps = hash:/etc/postfix/smtp_auth +smtp_sasl_security_options = noanonymous +smtp_tls_cert_file = /etc/postfix/postfix.pem +smtp_tls_enforce_peername = no +smtp_tls_key_file = /etc/postfix/postfix.pem +smtp_use_tls = yes +smtpd_sasl_auth_enable = yes +smtpd_sasl_local_domain = $myhostname +smtpd_sasl_security_options = noanonymous +smtpd_tls_cert_file = /etc/postfix/postfix.pem +smtpd_tls_key_file = /etc/postfix/postfix.pem +smtpd_tls_loglevel = 1 +smtpd_tls_received_header = yes +smtpd_tls_session_cache_timeout = 3600s +smtpd_use_tls = yes +tls_random_source = dev:/dev/urandom diff --git a/config-archive/etc/postfix/main.cf.dist b/config-archive/etc/postfix/main.cf.dist index 85273d8..df2f3d0 100644 --- a/config-archive/etc/postfix/main.cf.dist +++ b/config-archive/etc/postfix/main.cf.dist @@ -10,6 +10,25 @@ # For best results, change no more than 2-3 parameters at a time, # and test if Postfix still works after every change. +# COMPATIBILITY +# +# The compatibility_level determines what default settings Postfix +# will use for main.cf and master.cf settings. These defaults will +# change over time. +# +# To avoid breaking things, Postfix will use backwards-compatible +# default settings and log where it uses those old backwards-compatible +# default settings, until the system administrator has determined +# if any backwards-compatible default settings need to be made +# permanent in main.cf or master.cf. +# +# When this review is complete, update the compatibility_level setting +# below as recommended in the RELEASE_NOTES file. +# +# The level below is what should be used with new (not upgrade) installs. +# +#compatibility_level = 2 + # SOFT BOUNCE # # The soft_bounce parameter provides a limited safety net for @@ -640,7 +659,7 @@ setgid_group = postdrop # html_directory: The location of the Postfix HTML documentation. # -html_directory = /usr/share/doc/postfix-2.11.3/html +html_directory = /usr/share/doc/postfix-3.0.0/html # manpage_directory: The location of the Postfix on-line manual pages. # @@ -653,5 +672,8 @@ sample_directory = /etc/postfix # readme_directory: The location of the Postfix README files. # -readme_directory = /usr/share/doc/postfix-2.11.3/readme +readme_directory = /usr/share/doc/postfix-3.0.0/readme +inet_protocols = ipv4 +meta_directory = /etc/postfix +shlib_directory = /usr/lib64/postfix/${mail_version} home_mailbox = .maildir/ diff --git a/config-archive/etc/syslog-ng/syslog-ng.conf b/config-archive/etc/syslog-ng/syslog-ng.conf index 2286f6d..3398e0b 100644 --- a/config-archive/etc/syslog-ng/syslog-ng.conf +++ b/config-archive/etc/syslog-ng/syslog-ng.conf @@ -1,7 +1,7 @@ -@version: 3.2 +@version: 3.4 options { - long_hostnames(off); +# long_hostnames(off); chain_hostnames(no); flush_lines(0); diff --git a/config-archive/etc/syslog-ng/syslog-ng.conf.1 b/config-archive/etc/syslog-ng/syslog-ng.conf.1 index cd61378..2286f6d 100644 --- a/config-archive/etc/syslog-ng/syslog-ng.conf.1 +++ b/config-archive/etc/syslog-ng/syslog-ng.conf.1 @@ -15,6 +15,8 @@ options { # people so turn it down to once an hour. Set it to zero # if you don't want the functionality at all. mark_freq(3600); + frac_digits(3); + ts_format(iso); }; source src { diff --git a/config-archive/etc/syslog-ng/syslog-ng.conf.2 b/config-archive/etc/syslog-ng/syslog-ng.conf.2 new file mode 100644 index 0000000..cd61378 --- /dev/null +++ b/config-archive/etc/syslog-ng/syslog-ng.conf.2 @@ -0,0 +1,93 @@ +@version: 3.2 + +options { + long_hostnames(off); + chain_hostnames(no); + flush_lines(0); + + # The default action of syslog-ng is to log a STATS line + # to the file every 10 minutes. That's pretty ugly after a while. + # Change it to every 12 hours so you get a nice daily update of + # how many messages syslog-ng missed (0). + stats_freq(43200); + # The default action of syslog-ng is to log a MARK line + # to the file every 20 minutes. That's seems high for most + # people so turn it down to once an hour. Set it to zero + # if you don't want the functionality at all. + mark_freq(3600); +}; + +source src { + unix-stream("/dev/log" max-connections(256)); + internal(); + file("/proc/kmsg"); + #udp(); +}; + +######################################################### +# Logging-Ziele + +destination d_syslog { file("/var/log/syslog"); }; +destination d_fac { file("/var/log/syslog.d/$FACILITY"); }; +destination d_debug { file("/var/log/debug"); }; +destination d_all { file("/var/log/all"); }; +destination d_messages { file("/var/log/messages"); }; + +destination d_console { usertty("root"); }; +destination d_console_all { usertty("*"); }; +#destination loghost { udp("loghost" port(999)); }; + +# By default messages are logged to tty12... +destination d_console_12 { file("/dev/tty12"); }; +# ...if you intend to use /dev/console for programs like xconsole +# you can comment out the destination line above that references /dev/tty12 +# and uncomment the line below. +#destination console_all { file("/dev/console"); }; + +#destination d_xconsole { pipe("/dev/xconsole"); }; +destination d_xconsole { pipe("/dev/console"); }; + +######################################################### +# Filter-Definitionen + +filter f_syslog { not facility(authpriv, mail); }; +filter f_debug { not facility(auth, authpriv, news, mail); }; +filter f_messages { level(info..emerg) + and not facility(auth, authpriv, mail, news); }; +filter f_emergency { level(emerg); }; + +filter f_warnings { level(warn..emerg) + and not facility( mail, news); }; + +filter f_info { level(info); }; +filter f_notice { level(notice); }; +filter f_warn { level(warn); }; +filter f_crit { level(crit); }; +filter f_err { level(err); }; +filter f_alarm { level(crit, alert); }; + +######################################################## +# Log-Definitionen + +log { source(src); destination(d_fac); }; + +log { source(src); filter(f_messages); destination(d_messages); }; +#log { source(src); filter(f_messages); destination(d_xconsole); }; +log { source(src); filter(f_warnings); destination(d_console_12); }; +log { source(src); filter(f_alarm); destination(d_console); }; +log { source(src); filter(f_emergency); destination(d_console_all); }; +log { source(src); filter(f_syslog); destination(d_syslog); }; +log { source(src); filter(f_debug); destination(d_debug); }; +log { source(src); destination(d_all); }; + +# By default messages are logged to tty12... +#destination console_all { file("/dev/tty12"); }; +# ...if you intend to use /dev/console for programs like xconsole +# you can comment out the destination line above that references /dev/tty12 +# and uncomment the line below. +#destination console_all { file("/dev/console"); }; + +#log { source(src); destination(messages); }; +#log { source(src); destination(console_all); }; + + diff --git a/config-archive/etc/syslog-ng/syslog-ng.conf.dist.new b/config-archive/etc/syslog-ng/syslog-ng.conf.dist.new index e8d3b4f..fed10b1 100644 --- a/config-archive/etc/syslog-ng/syslog-ng.conf.dist.new +++ b/config-archive/etc/syslog-ng/syslog-ng.conf.dist.new @@ -1,5 +1,5 @@ -@version: 3.4 -# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.conf.gentoo,v 1.2 2013/06/02 01:18:35 mr_bones_ Exp $ +@version: 3.6 +# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.6/syslog-ng.conf.gentoo,v 1.1 2014/11/09 08:10:43 mr_bones_ Exp $ # # Syslog-ng default configuration file for Gentoo Linux diff --git a/cron.daily/run_reoback.sh b/cron.daily/reoback similarity index 100% rename from cron.daily/run_reoback.sh rename to cron.daily/reoback diff --git a/cups/cups-browsed.conf b/cups/cups-browsed.conf index df0a415..b90f1de 100644 --- a/cups/cups-browsed.conf +++ b/cups/cups-browsed.conf @@ -14,6 +14,7 @@ BrowseRemoteProtocols DNSSD,CUPS # BrowseProtocols none # Only browse remote printers from selected servers +# BrowseAllow All # BrowseAllow cups.example.com # BrowseAllow 192.168.1.12 # BrowseAllow 192.168.1.0/24 diff --git a/env.d/blas/lib64/config b/env.d/blas/lib64/config new file mode 100644 index 0000000..a818389 --- /dev/null +++ b/env.d/blas/lib64/config @@ -0,0 +1,3 @@ +# Configuration file for eselect +# This file has been automatically generated. +CURRENT="reference" diff --git a/env.d/blas/lib64/reference b/env.d/blas/lib64/reference new file mode 100644 index 0000000..edb10dd --- /dev/null +++ b/env.d/blas/lib64/reference @@ -0,0 +1,4 @@ +blas/reference/libblas.so /usr/@LIBDIR@/libblas.so +blas/reference/libblas.so.0 /usr/@LIBDIR@/libblas.so.0 +blas/reference/libblas.a /usr/@LIBDIR@/libblas.a +../blas/reference/blas.pc /usr/@LIBDIR@/pkgconfig/blas.pc diff --git a/env.d/cblas/lib64/config b/env.d/cblas/lib64/config new file mode 100644 index 0000000..a818389 --- /dev/null +++ b/env.d/cblas/lib64/config @@ -0,0 +1,3 @@ +# Configuration file for eselect +# This file has been automatically generated. +CURRENT="reference" diff --git a/env.d/cblas/lib64/reference b/env.d/cblas/lib64/reference new file mode 100644 index 0000000..62b5818 --- /dev/null +++ b/env.d/cblas/lib64/reference @@ -0,0 +1,5 @@ +blas/reference/libcblas.so /usr/@LIBDIR@/libcblas.so +blas/reference/libcblas.so.0 /usr/@LIBDIR@/libcblas.so.0 +blas/reference/libcblas.a /usr/@LIBDIR@/libcblas.a +../blas/reference/cblas.pc /usr/@LIBDIR@/pkgconfig/cblas.pc +cblas/cblas.h /usr/include/cblas.h diff --git a/env.d/lapack/lib64/config b/env.d/lapack/lib64/config new file mode 100644 index 0000000..a818389 --- /dev/null +++ b/env.d/lapack/lib64/config @@ -0,0 +1,3 @@ +# Configuration file for eselect +# This file has been automatically generated. +CURRENT="reference" diff --git a/env.d/lapack/lib64/reference b/env.d/lapack/lib64/reference new file mode 100644 index 0000000..fe1a777 --- /dev/null +++ b/env.d/lapack/lib64/reference @@ -0,0 +1,4 @@ +lapack/reference/liblapack.so /usr/@LIBDIR@/liblapack.so +lapack/reference/liblapack.so.0 /usr/@LIBDIR@/liblapack.so.0 +lapack/reference/liblapack.a /usr/@LIBDIR@/liblapack.a +../lapack/reference/lapack.pc /usr/@LIBDIR@/pkgconfig/lapack.pc diff --git a/init.d/syslog-ng b/init.d/syslog-ng index eb28bb8..8242c2b 100755 --- a/init.d/syslog-ng +++ b/init.d/syslog-ng @@ -1,12 +1,12 @@ #!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6,v 1.6 2013/08/31 17:44:03 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.6/syslog-ng.rc6,v 1.2 2014/12/18 19:51:36 mr_bones_ Exp $ SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf} SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_STATEFILE_DIR:-/var/lib/syslog-ng} SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE:-${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist} -SYSLOG_NG_PIDFILE_DIR=${SYSLOG_NG_PIDFILE_DIR:-/var/run} +SYSLOG_NG_PIDFILE_DIR=${SYSLOG_NG_PIDFILE_DIR:-/run} SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE:-${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid} SYSLOG_NG_GROUP=${SYSLOG_NG_GROUP:-root} @@ -38,17 +38,17 @@ checkconfig() { } start_pre() { - checkconfig || return 1 - checkpath \ - -d \ - --mode 0700 \ - --owner "${SYSLOG_NG_OWNER}:${SYSLOG_NG_GROUP}" \ - "${SYSLOG_NG_STATEFILE_DIR}" + checkconfig || return 1 + checkpath \ + -d \ + --mode 0700 \ + --owner "${SYSLOG_NG_OWNER}:${SYSLOG_NG_GROUP}" \ + "${SYSLOG_NG_STATEFILE_DIR}" } stop_pre() { - [ "$RC_CMD" = restart ] && sleep 1 - return 0 + [ "$RC_CMD" = restart ] && sleep 1 + return 0 } reload() { diff --git a/mutt/Muttrc.dist b/mutt/Muttrc.dist index d60afdf..5a492d5 100644 --- a/mutt/Muttrc.dist +++ b/mutt/Muttrc.dist @@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\ "call urlview to extract URLs out of a message" # Show documentation when pressing F1 -macro generic,pager " less /usr/share/doc/mutt-1.5.22-r3/manual.txt" "show Mutt documentation" +macro generic,pager " less /usr/share/doc/mutt-1.5.23-r5/manual.txt" "show Mutt documentation" # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y" macro index,pager y "?" "show incoming mailboxes list" @@ -3038,6 +3038,30 @@ attachments -I message/external-body # other screens. # # +# set sidebar_delim_chars="/." +# +# Name: sidebar_delim_chars +# Type: string +# Default: "/." +# +# +# This contains the list of characters which you would like to treat +# as folder separators for displaying paths in the sidebar. If +# you're not using IMAP folders, you probably prefer setting this to "/" +# alone. +# +# +# set sidebar_indentstr=" " +# +# Name: sidebar_indentstr +# Type: string +# Default: " " +# +# +# This specifies the string that is used to indent items +# with sidebar_folderindent= yes +# +# # set sidebar_visible=no # # Name: sidebar_visible @@ -3068,17 +3092,39 @@ attachments -I message/external-body # The width of the sidebar. # # -# set sidebar_delim_chars="/." +# set sidebar_shortpath=no # -# Name: sidebar_delim_chars +# Name: sidebar_shortpath +# Type: boolean +# Default: no +# +# +# Should the sidebar shorten the path showed. +# +# +# set sidebar_format="%B%?F? [%F]?%* %?N?%N/?%4S" +# +# Name: sidebar_format # Type: string -# Default: "/." +# Default: "%B%?F? [%F]?%* %?N?%N/?%4S" # # -# This contains the list of characters which you would like to treat -# as folder separators for displaying paths in the sidebar. If -# you're not using IMAP folders, you probably prefer setting this to "/" -# alone. +# Format string for the sidebar. The sequences `%N', `%F' and `%S' +# will be replaced by the number of new or flagged messages or the total +# size of them mailbox. `%B' will be replaced with the name of the mailbox. +# The `%!' sequence will be expanded to `!' if there is one flagged message; +# to `!!' if there are two flagged messages; and to `n!' for n flagged +# messages, n>2. +# +# +# set sidebar_folderindent=no +# +# Name: sidebar_folderindent +# Type: boolean +# Default: no +# +# +# Should folders be indented in the sidebar. # # # set pgp_use_gpg_agent=no @@ -3505,7 +3551,7 @@ attachments -I message/external-body # # # Controls how quoted lines will be quoted. If set, one quote -# character will be added to the end of existing prefix. Otherwise, +# character will be prepended to the existing prefix. Otherwise, # quoted lines will be prepended by ``indent_string''. # # diff --git a/nanorc b/nanorc index 1124f97..4421213 100644 --- a/nanorc +++ b/nanorc @@ -5,7 +5,7 @@ ## DOS or Mac format, and that characters specially interpreted by the ## shell should not be escaped here. ## -## To make sure a value is disabled, use "unset