From: Frank Brehm Date: Fri, 6 Oct 2017 08:18:31 +0000 (+0200) Subject: Current state X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=0d2c320c69e911ee5a383638fa666cc3fd599440;p=config%2Fberta%2Fetc.git Current state --- diff --git a/.etckeeper b/.etckeeper index e9166d3..163acfa 100755 --- a/.etckeeper +++ b/.etckeeper @@ -177,6 +177,8 @@ maybe chmod 0644 'config-archive/etc/apache2/vhosts.d/default_vhost.include.dist maybe chmod 0755 'config-archive/etc/conf.d' maybe chmod 0644 'config-archive/etc/conf.d/apache2' maybe chmod 0644 'config-archive/etc/conf.d/apache2.dist.new' +maybe chmod 0644 'config-archive/etc/conf.d/postgresql-9.6' +maybe chmod 0644 'config-archive/etc/conf.d/postgresql-9.6.dist.new' maybe chmod 0644 'config-archive/etc/conf.d/puppetmaster' maybe chmod 0644 'config-archive/etc/conf.d/puppetmaster.dist.new' maybe chmod 0755 'config-archive/etc/default' diff --git a/config-archive/etc/conf.d/postgresql-9.6 b/config-archive/etc/conf.d/postgresql-9.6 new file mode 100644 index 0000000..d26fa45 --- /dev/null +++ b/config-archive/etc/conf.d/postgresql-9.6 @@ -0,0 +1,66 @@ +# Comma-separated list of directories that contain a unix +# socket. Created and controlled by the related initscript. The +# directories created will be owned root:postgres with mode 1775. +# +# /run/postgresql is the default directory. +PG_SOCKET_DIRECTORIES="/run/postgresql" + +# 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.6' 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.6/" + +# Where the data directory is located/to be created +DATA_DIR="/var/lib/postgresql/9.6/data" + +# Additional options to pass to initdb. +# See `man initdb' for available options. +PG_INITDB_OPTS="--encoding=UTF8 --locale=de_DE.UTF-8" + diff --git a/config-archive/etc/conf.d/postgresql-9.6.dist.new b/config-archive/etc/conf.d/postgresql-9.6.dist.new new file mode 100644 index 0000000..fd3c7e1 --- /dev/null +++ b/config-archive/etc/conf.d/postgresql-9.6.dist.new @@ -0,0 +1,65 @@ +# Comma-separated list of directories that contain a unix +# socket. Created and controlled by the related initscript. The +# directories created will be owned root:postgres with mode 1775. +# +# /run/postgresql is the default directory. +PG_SOCKET_DIRECTORIES="/run/postgresql" + +# 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.6' 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.6/" + +# Where the data directory is located/to be created +DATA_DIR="/var/lib/postgresql/9.6/data" + +# Additional options to pass to initdb. +# See `man initdb' for available options. +PG_INITDB_OPTS="--encoding=UTF8" diff --git a/logrotate.d/elog-save-summary b/logrotate.d/elog-save-summary index f2cfc66..5f4f36a 100644 --- a/logrotate.d/elog-save-summary +++ b/logrotate.d/elog-save-summary @@ -4,6 +4,7 @@ /var/log/portage/elog/summary.log { su portage portage + rotate 30 missingok nocreate delaycompress