From: Frank Brehm <frank.brehm@profitbricks.com>
Date: Tue, 4 Dec 2012 10:43:07 +0000 (+0100)
Subject: Current state
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=39f5d359825ac541dbdf1ccc6489a7b0bd6df50e;p=config%2Fsamara%2Fetc.git

Current state
---

diff --git a/.etckeeper b/.etckeeper
index 67515ac..d90725b 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -264,7 +264,6 @@ maybe chmod 0644 './conf.d/ntp-client'
 maybe chmod 0644 './conf.d/ntpd'
 maybe chmod 0644 './conf.d/openvpn'
 maybe chmod 0644 './conf.d/pciparm'
-maybe chmod 0644 './conf.d/postgresql-9.1'
 maybe chmod 0644 './conf.d/postgresql-9.2'
 maybe chmod 0644 './conf.d/pydoc-2.7'
 maybe chmod 0644 './conf.d/pydoc-3.2'
@@ -879,13 +878,8 @@ maybe chmod 0755 './eselect/postgresql'
 maybe chmod 0644 './eselect/postgresql/.keep_app-admin_eselect-postgresql-0'
 maybe chmod 0644 './eselect/postgresql/active'
 maybe chmod 0644 './eselect/postgresql/active.links'
-maybe chmod 0644 './eselect/postgresql/active.links91'
 maybe chmod 0644 './eselect/postgresql/active.links92'
 maybe chmod 0755 './eselect/postgresql/slots'
-maybe chmod 0755 './eselect/postgresql/slots/9.1'
-maybe chmod 0644 './eselect/postgresql/slots/9.1/base'
-maybe chmod 0644 './eselect/postgresql/slots/9.1/docs'
-maybe chmod 0644 './eselect/postgresql/slots/9.1/server'
 maybe chmod 0755 './eselect/postgresql/slots/9.2'
 maybe chmod 0644 './eselect/postgresql/slots/9.2/base'
 maybe chmod 0644 './eselect/postgresql/slots/9.2/docs'
@@ -1282,7 +1276,6 @@ maybe chmod 0755 './init.d/openvpn'
 maybe chmod 0755 './init.d/pciparm'
 maybe chmod 0755 './init.d/php-fpm'
 maybe chmod 0755 './init.d/postfix'
-maybe chmod 0755 './init.d/postgresql-9.1'
 maybe chmod 0755 './init.d/postgresql-9.2'
 maybe chmod 0755 './init.d/procfs'
 maybe chmod 0755 './init.d/pwcheck'
@@ -1462,6 +1455,8 @@ maybe chmod 0644 './modprobe.d/usb-load-ehci-first.conf'
 maybe chmod 0644 './motd'
 maybe chmod 0644 './motd.tail'
 maybe chmod 0644 './mtab'
+maybe chgrp users './mtab.fuselock'
+maybe chmod 0600 './mtab.fuselock'
 maybe chmod 0755 './mtools'
 maybe chmod 0644 './mtools/mtools.conf'
 maybe chmod 0755 './mysql'
@@ -1654,8 +1649,6 @@ maybe chmod 0644 './postfix/.keep_mail-mta_postfix-0'
 maybe chmod 0644 './postfix/main.cf'
 maybe chmod 0644 './postfix/master.cf'
 maybe chmod 0600 './postfix/saslpass'
-maybe chmod 0755 './postgresql-9.1'
-maybe chmod 0644 './postgresql-9.1/.keep_dev-db_postgresql-base-9.1'
 maybe chmod 0755 './postgresql-9.2'
 maybe chmod 0644 './postgresql-9.2/.keep_dev-db_postgresql-base-9.2'
 maybe chmod 0755 './ppp'
diff --git a/conf.d/postgresql-9.1 b/conf.d/postgresql-9.1
deleted file mode 100644
index 54cf5cc..0000000
--- a/conf.d/postgresql-9.1
+++ /dev/null
@@ -1,58 +0,0 @@
-# Which port and socket to bind PostgreSQL
-PGPORT="5432"
-
-# How long to wait for server to start in seconds
-START_TIMEOUT=10
-
-# NICE_QUIT ignores new connections and wait for clients to disconnect from
-# server before shutting down. NICE_TIMEOUT in seconds determines how long to
-# wait for this to succeed.
-NICE_TIMEOUT=60
-
-# Forecfully disconnect clients from server and shut down. This is performed
-# after NICE_QUIT. Terminated client connections have their open transactions
-# rolled back.
-# Set RUDE_QUIT to "NO" to disable. RUDE_TIMEOUT in seconds.
-RUDE_QUIT="YES"
-RUDE_TIMEOUT=30
-
-# If the server still fails to shutdown, you can force it to quit by setting
-# this to YES and a recover-run will execute on the next startup.
-# Set FORCE_QUIT to "YES" to enable. FORCE_TIMEOUT in seconds.
-FORCE_QUIT="NO"
-FORCE_TIMEOUT=2
-
-# Extra options to run postmaster with, e.g.:
-# -N is the maximal number of client connections
-# -B is the number of shared buffers and has to be at least 2x the value for -N
-# Please read the man-page to postmaster for more options. Many of these
-# options can be set directly in the configuration file.
-#PGOPTS="-N 512 -B 1024"
-
-# Pass extra environment variables. If you have to export environment variables
-# for the database process, this can be done here.
-# Don't forget to escape quotes.
-#PG_EXTRA_ENV="PGPASSFILE=\"/path/to/.pgpass\""
-
-##############################################################################
-#
-# The following values should not be arbitrarily changed.
-#
-# `emerge --config dev-db/postgresql-server:9.1' uses these values to
-# determine where to create the data directory, where to place the
-# configuration files, and any additional options to pass to initdb.
-#
-# The initscript also uses these variables to inform PostgreSQL where to find
-# its data directory and configuration files.
-#
-##############################################################################
-
-# Location of configuration files
-PGDATA="/etc/postgresql-9.1/"
-
-# Where the data directory is located/to be created
-DATA_DIR="/var/lib/postgresql/9.1/data"
-
-# Additional options to pass to initdb.
-# See `man initdb' for available options.
-#PG_INITDB_OPTS="--locale=en_US.UTF-8"
diff --git a/csh.env b/csh.env
index d51242f..53fc40c 100644
--- a/csh.env
+++ b/csh.env
@@ -29,7 +29,7 @@ setenv LC_TIME 'de_DE.utf8'
 setenv LESS '-R -M --shift 5'
 setenv LESSOPEN '|lesspipe %s'
 setenv LIBBLURAY_CP '/usr/share/libbluray/lib/libbluray.jar'
-setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.4/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/man:/etc/java-config/system-vm/man/:/usr/lib64/php5.4/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.2/man/:/usr/share/postgresql-9.1/man/'
+setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.4/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/man:/etc/java-config/system-vm/man/:/usr/lib64/php5.4/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.2/man/'
 setenv MULTIOSDIRS '../lib64:../lib32'
 setenv OPENGL_PROFILE 'xorg-x11'
 setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.4:/usr/lib64/subversion/bin:/usr/games/bin'
diff --git a/env.d/50postgresql b/env.d/50postgresql
index cb65cb5..e71633d 100644
--- a/env.d/50postgresql
+++ b/env.d/50postgresql
@@ -1,4 +1,4 @@
 # Configuration file for eselect
 # This file has been automatically generated.
-LDPATH="/usr/lib/postgresql:/usr/lib64/postgresql:/usr/lib64/postgresql-9.2/lib64/:/usr/lib64/postgresql-9.1/lib64/"
-MANPATH="/usr/share/postgresql/man/:/usr/share/postgresql-9.2/man/:/usr/share/postgresql-9.1/man/"
+LDPATH="/usr/lib/postgresql:/usr/lib64/postgresql:/usr/lib64/postgresql-9.2/lib64/"
+MANPATH="/usr/share/postgresql/man/:/usr/share/postgresql-9.2/man/"
diff --git a/eselect/postgresql/active b/eselect/postgresql/active
index 28a2186..1a2c355 100644
--- a/eselect/postgresql/active
+++ b/eselect/postgresql/active
@@ -1 +1 @@
-9.1
+9.2
diff --git a/eselect/postgresql/active.links b/eselect/postgresql/active.links
index ab54832..b55ae1b 100644
--- a/eselect/postgresql/active.links
+++ b/eselect/postgresql/active.links
@@ -5,20 +5,20 @@
 /usr/include/postgres_ext.h
 /usr/lib64/postgresql
 /usr/lib64/libpgtypes.so.3
+/usr/lib64/libecpg_compat.so.3.4
 /usr/lib64/libpgport.a
 /usr/lib64/libecpg_compat.so
-/usr/lib64/libpq.so.5.4
-/usr/lib64/libpgtypes.so.3.2
+/usr/lib64/libpq.so.5.5
 /usr/lib64/libpq.a
 /usr/lib64/libecpg.so
 /usr/lib64/libecpg.a
 /usr/lib64/libecpg_compat.so.3
+/usr/lib64/libecpg.so.6.4
+/usr/lib64/libpgtypes.so.3.3
 /usr/lib64/libpgtypes.so
 /usr/lib64/libpgtypes.a
 /usr/lib64/libpq.so
-/usr/lib64/libecpg_compat.so.3.3
 /usr/lib64/libecpg.so.6
-/usr/lib64/libecpg.so.6.3
 /usr/lib64/libpq.so.5
 /usr/lib64/libpqwalreceiver.so
 /usr/lib64/libecpg_compat.a
@@ -28,6 +28,7 @@
 /usr/bin/createuser
 /usr/bin/createlang
 /usr/bin/pg_config
+/usr/bin/pg_receivexlog
 /usr/bin/pg_dump
 /usr/bin/pg_archivecleanup
 /usr/bin/clusterdb
@@ -36,6 +37,7 @@
 /usr/bin/dropuser
 /usr/bin/reindexdb
 /usr/bin/pg_controldata
+/usr/bin/pg_test_timing
 /usr/bin/pg_restore
 /usr/bin/vacuumlo
 /usr/bin/pg_test_fsync
diff --git a/eselect/postgresql/active.links91 b/eselect/postgresql/active.links91
deleted file mode 100644
index f3ab663..0000000
--- a/eselect/postgresql/active.links91
+++ /dev/null
@@ -1,29 +0,0 @@
-/usr/bin/pg_upgrade91
-/usr/bin/createdb91
-/usr/bin/ecpg91
-/usr/bin/createuser91
-/usr/bin/createlang91
-/usr/bin/pg_config91
-/usr/bin/pg_dump91
-/usr/bin/pg_archivecleanup91
-/usr/bin/clusterdb91
-/usr/bin/dropdb91
-/usr/bin/postgres91
-/usr/bin/dropuser91
-/usr/bin/reindexdb91
-/usr/bin/pg_controldata91
-/usr/bin/pg_restore91
-/usr/bin/vacuumlo91
-/usr/bin/pg_test_fsync91
-/usr/bin/vacuumdb91
-/usr/bin/postmaster91
-/usr/bin/pg_ctl91
-/usr/bin/oid2name91
-/usr/bin/pg_dumpall91
-/usr/bin/psql91
-/usr/bin/pg_resetxlog91
-/usr/bin/initdb91
-/usr/bin/pg_basebackup91
-/usr/bin/droplang91
-/usr/bin/pg_standby91
-/usr/bin/pgbench91
diff --git a/eselect/postgresql/slots/9.1/base b/eselect/postgresql/slots/9.1/base
deleted file mode 100644
index 6906b08..0000000
--- a/eselect/postgresql/slots/9.1/base
+++ /dev/null
@@ -1 +0,0 @@
-postgres_ebuilds="${postgres_ebuilds} postgresql-base-9.1.5"
diff --git a/eselect/postgresql/slots/9.1/docs b/eselect/postgresql/slots/9.1/docs
deleted file mode 100644
index 1d8eb18..0000000
--- a/eselect/postgresql/slots/9.1/docs
+++ /dev/null
@@ -1 +0,0 @@
-postgres_ebuilds="${postgres_ebuilds} postgresql-docs-9.1.5"
diff --git a/eselect/postgresql/slots/9.1/server b/eselect/postgresql/slots/9.1/server
deleted file mode 100644
index 2b99aaa..0000000
--- a/eselect/postgresql/slots/9.1/server
+++ /dev/null
@@ -1 +0,0 @@
-postgres_ebuilds="${postgres_ebuilds} postgresql-server-9.1.5"
diff --git a/init.d/postgresql-9.1 b/init.d/postgresql-9.1
deleted file mode 100755
index 5cac664..0000000
--- a/init.d/postgresql-9.1
+++ /dev/null
@@ -1,136 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-extra_started_commands="reload"
-
-get_config() {
-    [ -f ${PGDATA%/}/postgresql.conf ] || return 1
-
-    eval echo $(sed -e 's:#.*::' ${PGDATA%/}/postgresql.conf | awk '$1 == "'$1'" { print ($2 == "=" ? $3 : $2) }')
-}
-
-depend() {
-    use net
-    provide postgresql
-
-    if [ "$(get_config log_destination)" = "syslog" ]; then
-        need logger
-    fi
-}
-
-configured_port=$(get_config port)
-: ${configured_port:=${PGPORT}}
-socket_path=$(get_config unix_socket_directory)
-: ${socket_path:=/run/postgresql}
-
-checkconfig() {
-    # Check that DATA_DIR has been set
-    if [ -z ${DATA_DIR} ] ; then
-        eerror "DATA_DIR not set"
-        eerror "HINT: Perhaps you need to update /etc/conf.d/postgresql-9.1"
-        return 1
-    fi
-
-    # Check that DATA_DIR exists
-    if [ ! -d ${DATA_DIR} ] ; then
-        eerror "Directory not found: ${DATA_DIR}"
-        eerror "HINT: Ensure that DATA_DIR points to the right path."
-        eerror "HINT: Or perhaps you need to create the database cluster:"
-        eerror "    emerge --config dev-db/postgresql-server:9.1"
-        return 1
-    fi
-
-    # Check for the existence of PostgreSQL's config files, and set the
-    # proper mode and ownership.
-    # Only three files should be checked as potentially other files
-    # may be in PGDATA that should not be touched.
-    local file
-    for file in postgresql pg_hba pg_ident ; do
-        file="${PGDATA%/}/${file}.conf"
-        if [ -f ${file} ] ; then
-            checkpath -f -m 0600 -o postgres:postgres ${file}
-        else
-            eerror "${file} not found"
-            eerror "HINT: mv ${DATA_DIR%/}/*.conf ${PGDATA}"
-            return 1
-        fi
-    done
-
-    # Set the proper permission for the socket path and create it if
-    # it doesn't exist.
-    checkpath -d -m 0770 -o postgres:postgres ${socket_path}
-    if [ -e ${socket_path%/}/.s.PGSQL.${configured_port} ] ; then
-        eerror "Socket conflict."
-        eerror "A server is already listening on:"
-        eerror "    ${socket_path%/}/.s.PGSQL.${configured_port}"
-        eerror "HINT: Change PGPORT to listen on a different socket."
-        return 1
-    fi
-}
-
-start() {
-    checkconfig || return 1
-
-    ebegin "Starting PostgreSQL"
-
-    rm -f ${DATA_DIR%/}/postmaster.pid
-
-    local extraenv
-    local x
-    for x in ${PG_EXTRA_ENV} ; do
-        extraenv="${extraenv} --env ${x}"
-    done
-
-    start-stop-daemon --start \
-        --user postgres \
-        --exec /usr/lib/postgresql-9.1/bin/postgres \
-        --env "PGPORT=${configured_port}" \
-        ${extraenv} \
-        --wait $((${START_TIMEOUT}*1000)) \
-        --pidfile ${DATA_DIR%/}/postmaster.pid \
-        -- -D ${PGDATA} --data-directory=${DATA_DIR} --silent-mode=true ${PGOPTS}
-    local retval=$?
-
-    if [ $retval -ne 0 ] ; then
-        eerror "Check the log for a possible explanation of the above error."
-        eerror "    ${DATA_DIR%/}/postmaster.log"
-        eend $retval
-        return $retval
-    fi
-
-    eend $retval
-}
-
-stop() {
-    local seconds=$(( ${NICE_TIMEOUT} + ${RUDE_TIMEOUT} + ${FORCE_TIMEOUT} ))
-    ebegin "Stopping PostgreSQL (this can take up to ${seconds} seconds)"
-
-    local retval
-    local retries=SIGTERM/${NICE_TIMEOUT}
-
-    if [ "${RUDE_QUIT}" != "NO" ] ; then
-        einfo "RUDE_QUIT enabled."
-        retries="${retries}/SIGINT/${RUDE_TIMEOUT}"
-    fi
-    if [ "${FORCE_QUIT}" = "YES" ] ; then
-        einfo "FORCE_QUIT enabled."
-        ewarn "A recover-run might be executed on next startup."
-        retries="${retries}/SIGQUIT/${FORCE_TIMEOUT}"
-    fi
-
-    # Loops through nice, rude, and force quit in one go.
-    start-stop-daemon --stop \
-        --exec /usr/lib/postgresql-9.1/bin/postgres \
-        --retry ${retries} \
-        --pidfile ${DATA_DIR%/}/postmaster.pid
-
-    eend
-}
-
-reload() {
-    ebegin "Reloading PostgreSQL configuration"
-    kill -HUP $(head -n1 ${DATA_DIR%/}/postmaster.pid)
-    eend $?
-}
diff --git a/ld.so.conf b/ld.so.conf
index 64b0b3e..ab2e6e4 100644
--- a/ld.so.conf
+++ b/ld.so.conf
@@ -19,7 +19,6 @@ include ld.so.conf.d/*.conf
 /usr/lib/postgresql
 /usr/lib64/postgresql
 /usr/lib64/postgresql-9.2/lib64/
-/usr/lib64/postgresql-9.1/lib64/
 /usr/lib64/sidplay/builders
 /usr/lib/sidplay/builders
 /usr/games/lib64
diff --git a/postgresql-9.1/.keep_dev-db_postgresql-base-9.1 b/postgresql-9.1/.keep_dev-db_postgresql-base-9.1
deleted file mode 100644
index e69de29..0000000
diff --git a/profile.env b/profile.env
index 7f9ace0..4eddf77 100644
--- a/profile.env
+++ b/profile.env
@@ -29,7 +29,7 @@ export LC_TIME='de_DE.utf8'
 export LESS='-R -M --shift 5'
 export LESSOPEN='|lesspipe %s'
 export LIBBLURAY_CP='/usr/share/libbluray/lib/libbluray.jar'
-export MANPATH='/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.4/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/man:/etc/java-config/system-vm/man/:/usr/lib64/php5.4/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.2/man/:/usr/share/postgresql-9.1/man/'
+export MANPATH='/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.4/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/man:/etc/java-config/system-vm/man/:/usr/lib64/php5.4/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.2/man/'
 export MULTIOSDIRS='../lib64:../lib32'
 export OPENGL_PROFILE='xorg-x11'
 export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.4:/usr/lib64/subversion/bin:/usr/games/bin'
diff --git a/resolv.conf b/resolv.conf
index c0ab547..557ca48 100644
--- a/resolv.conf
+++ b/resolv.conf
@@ -1,5 +1,6 @@
 # Generated by net-scripts for interface eth0
 domain profitbricks.localdomain
-search profitbricks.localdomain brehm-online.com dc1.de.profitbricks.net dc2.us.profitbricks.net dc252.de.profitbricks.net uhu-banane.de
+#search profitbricks.localdomain brehm-online.com dc1.de.profitbricks.net dc2.us.profitbricks.net dc252.de.profitbricks.net uhu-banane.de
+search profitbricks.localdomain brehm-online.com dc1.de.profitbricks.net dc2.us.profitbricks.net pb.local uhu-banane.de
 nameserver 192.168.178.30
 nameserver 192.168.178.89