saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index a1d45c79b226d7f2a3730f37bbb1292840f146b1..0f4b9027db9c29ca795e2daf6b9aab746d3f90b3 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -606,6 +606,8 @@ maybe chmod 0644 'config-archive/etc/conf.d/named,v'
 maybe chmod 0644 'config-archive/etc/conf.d/net.example,v'
 maybe chmod 0644 'config-archive/etc/conf.d/ntpd,v'
 maybe chmod 0644 'config-archive/etc/conf.d/ntpd.dist.new'
+maybe chmod 0644 'config-archive/etc/conf.d/postgresql-9.5'
+maybe chmod 0644 'config-archive/etc/conf.d/postgresql-9.5.dist.new'
 maybe chmod 0640 'config-archive/etc/conf.d/postgrey'
 maybe chmod 0644 'config-archive/etc/conf.d/postgrey,v'
 maybe chmod 0640 'config-archive/etc/conf.d/postgrey.dist'

diff --git a/config-archive/etc/conf.d/postgresql-9.5 b/config-archive/etc/conf.d/postgresql-9.5
new file mode 100644 (file)
index 0000000..7750f50
--- /dev/null
+++ b/config-archive/etc/conf.d/postgresql-9.5
@@ -0,0 +1,59 @@
+# 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:9.5' 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.5/"
+
+# Where the data directory is located/to be created
+DATA_DIR="/var/lib/postgresql/9.5/data"
+
+# Additional options to pass to initdb.
+# See `man initdb' for available options.
+PG_INITDB_OPTS="--encoding=UTF8 --locale=de_DE.utf8 --pwfile=/var/lib/postgresql/.admin-pwd.txt"
+

diff --git a/config-archive/etc/conf.d/postgresql-9.5.dist.new b/config-archive/etc/conf.d/postgresql-9.5.dist.new
new file mode 100644 (file)
index 0000000..f50cf5f
--- /dev/null
+++ b/config-archive/etc/conf.d/postgresql-9.5.dist.new
@@ -0,0 +1,58 @@
+# 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:9.5' 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.5/"
+
+# Where the data directory is located/to be created
+DATA_DIR="/var/lib/postgresql/9.5/data"
+
+# Additional options to pass to initdb.
+# See `man initdb' for available options.
+PG_INITDB_OPTS="--encoding=UTF8"