From 0e4216e4650b624d5cf515d93006d916e7980ac2 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 12 Mar 2016 03:10:07 +0100 Subject: [PATCH] daily autocommit --- .etckeeper | 5 +++-- csh.env | 2 +- env.d/50postgresql | 4 ++-- eselect/postgresql/active.links94 | 34 ------------------------------- ld.so.conf | 1 - postgresql-9.5/postgresql.conf | 1 + profile.env | 2 +- 7 files changed, 8 insertions(+), 41 deletions(-) delete mode 100644 eselect/postgresql/active.links94 diff --git a/.etckeeper b/.etckeeper index d74eee6..a45f74e 100755 --- a/.etckeeper +++ b/.etckeeper @@ -927,7 +927,6 @@ 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.links94' maybe chmod 0644 'eselect/postgresql/active.links95' maybe chmod 0755 'eselect/postgresql/slots' maybe chmod 0755 'eselect/postgresql/slots/9.5' @@ -1746,7 +1745,9 @@ maybe chgrp 'postgrey' 'postfix/postgrey_whitelist_recipients' maybe chmod 0640 'postfix/postgrey_whitelist_recipients' maybe chmod 0600 'postfix/saslpass' maybe chmod 0644 'postfix/smtp_auth' -maybe chmod 0755 'postgresql-9.5' +maybe chown 'postgres' 'postgresql-9.5' +maybe chgrp 'postgres' 'postgresql-9.5' +maybe chmod 0700 'postgresql-9.5' maybe chown 'postgres' 'postgresql-9.5/pg_hba.conf' maybe chgrp 'postgres' 'postgresql-9.5/pg_hba.conf' maybe chmod 0600 'postgresql-9.5/pg_hba.conf' diff --git a/csh.env b/csh.env index d2e228d..a8024b7 100644 --- a/csh.env +++ b/csh.env @@ -13,7 +13,7 @@ setenv HG '/usr/bin/hg' setenv INFOPATH '/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/info' setenv LESS '-R -M --shift 5' setenv LESSOPEN '|lesspipe %s' -setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.5/man/:/usr/lib64/php5.6/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.5/man/:/usr/share/postgresql-9.4/man/' +setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.5/man/:/usr/lib64/php5.6/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.5/man/' setenv MULTIOSDIRS '../lib64:../lib32' setenv OPENGL_PROFILE 'xorg-x11' setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3:/usr/lib64/subversion/bin' diff --git a/env.d/50postgresql b/env.d/50postgresql index 9d97cf3..41ce189 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.5/lib64/:/usr/lib64/postgresql-9.4/lib64/" -MANPATH="/usr/share/postgresql/man/:/usr/share/postgresql-9.5/man/:/usr/share/postgresql-9.4/man/" +LDPATH="/usr/lib/postgresql:/usr/lib64/postgresql:/usr/lib64/postgresql-9.5/lib64/" +MANPATH="/usr/share/postgresql/man/:/usr/share/postgresql-9.5/man/" diff --git a/eselect/postgresql/active.links94 b/eselect/postgresql/active.links94 deleted file mode 100644 index f3ef784..0000000 --- a/eselect/postgresql/active.links94 +++ /dev/null @@ -1,34 +0,0 @@ -usr/bin/pg_ctl94 -usr/bin/psql94 -usr/bin/dropdb94 -usr/bin/vacuumlo94 -usr/bin/vacuumdb94 -usr/bin/reindexdb94 -usr/bin/pg_archivecleanup94 -usr/bin/clusterdb94 -usr/bin/pg_restore94 -usr/bin/pg_dumpall94 -usr/bin/createuser94 -usr/bin/pg_dump94 -usr/bin/pg_upgrade94 -usr/bin/pg_config94 -usr/bin/postgres94 -usr/bin/pg_recvlogical94 -usr/bin/pgbench94 -usr/bin/pg_resetxlog94 -usr/bin/ecpg94 -usr/bin/pg_basebackup94 -usr/bin/createdb94 -usr/bin/postmaster94 -usr/bin/pg_isready94 -usr/bin/initdb94 -usr/bin/pg_test_fsync94 -usr/bin/pg_xlogdump94 -usr/bin/dropuser94 -usr/bin/pg_controldata94 -usr/bin/oid2name94 -usr/bin/pg_test_timing94 -usr/bin/pg_standby94 -usr/bin/createlang94 -usr/bin/pg_receivexlog94 -usr/bin/droplang94 diff --git a/ld.so.conf b/ld.so.conf index 54749d5..0c9c98b 100644 --- a/ld.so.conf +++ b/ld.so.conf @@ -13,4 +13,3 @@ include ld.so.conf.d/*.conf /usr/lib/postgresql /usr/lib64/postgresql /usr/lib64/postgresql-9.5/lib64/ -/usr/lib64/postgresql-9.4/lib64/ diff --git a/postgresql-9.5/postgresql.conf b/postgresql-9.5/postgresql.conf index a4f0a40..021e97b 100644 --- a/postgresql-9.5/postgresql.conf +++ b/postgresql-9.5/postgresql.conf @@ -48,6 +48,7 @@ # If external_pid_file is not explicitly set, no extra PID file is written. #external_pid_file = '' # write an extra PID file # (change requires restart) +external_pid_file = '/run/postgresql/postgresql-9.5.pid' #------------------------------------------------------------------------------ diff --git a/profile.env b/profile.env index 0aeef30..d1dbf81 100644 --- a/profile.env +++ b/profile.env @@ -13,7 +13,7 @@ export HG='/usr/bin/hg' export INFOPATH='/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/info' export LESS='-R -M --shift 5' export LESSOPEN='|lesspipe %s' -export MANPATH='/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.5/man/:/usr/lib64/php5.6/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.5/man/:/usr/share/postgresql-9.4/man/' +export MANPATH='/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.5/man/:/usr/lib64/php5.6/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.5/man/' export MULTIOSDIRS='../lib64:../lib32' export OPENGL_PROFILE='xorg-x11' export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3:/usr/lib64/subversion/bin' -- 2.39.5