From: root Date: Mon, 4 Apr 2016 12:28:36 +0000 (+0200) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=d31dd7c33dde0ceeb917c3e5eb96f77425c87bcb;p=config%2Fweimar%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/.etckeeper b/.etckeeper index 2f35fc1..2c3aa9a 100755 --- a/.etckeeper +++ b/.etckeeper @@ -421,7 +421,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' @@ -869,11 +868,13 @@ maybe chmod 0644 'salt/pki/master/master.pub' maybe chmod 0770 'salt/pki/master/minions' maybe chmod 0644 'salt/pki/master/minions/fra-ftp-test.dc3.de.profitbricks.net' maybe chmod 0644 'salt/pki/master/minions/pserver1502.dc2.us.profitbricks.net' +maybe chmod 0644 'salt/pki/master/minions/storage1.stage.pb.local' maybe chmod 0644 'salt/pki/master/minions/storage11-qa.stage.pb.local' maybe chmod 0644 'salt/pki/master/minions/storage11.stage.pb.local' maybe chmod 0644 'salt/pki/master/minions/storage1501.dc2.us.profitbricks.net' maybe chmod 0644 'salt/pki/master/minions/storage1601.dc2.us.profitbricks.net' maybe chmod 0644 'salt/pki/master/minions/storage1604.dc2.us.profitbricks.net' +maybe chmod 0644 'salt/pki/master/minions/storage2.stage.pb.local' maybe chmod 0644 'salt/pki/master/minions/storage7.stage.pb.local.pub' maybe chmod 0755 'salt/pki/master/minions_autosign' maybe chmod 0755 'salt/pki/master/minions_denied' diff --git a/csh.env b/csh.env index be9216b..f4b2494 100644 --- a/csh.env +++ b/csh.env @@ -13,7 +13,7 @@ setenv INFOPATH '/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/i setenv LANG 'de_DE.utf8' 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:/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:/usr/share/postgresql/man/:/usr/share/postgresql-9.5/man/' setenv MULTIOSDIRS '../lib64:../lib32' setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3' setenv PRELINK_PATH_MASK '/usr/lib64/klibc' 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 b/eselect/postgresql/active index 0359f24..592f36e 100644 --- a/eselect/postgresql/active +++ b/eselect/postgresql/active @@ -1 +1 @@ -9.4 +9.5 diff --git a/eselect/postgresql/active.links b/eselect/postgresql/active.links index 3d33450..76a3ba4 100644 --- a/eselect/postgresql/active.links +++ b/eselect/postgresql/active.links @@ -8,21 +8,21 @@ usr/lib64/postgresql usr/lib64/libpgtypes.so.3 usr/lib64/libecpg_compat.so usr/lib64/libecpg_compat.so.3 -usr/lib64/libpq.so.5.7 +usr/lib64/libecpg.so.6.7 +usr/lib64/libecpg_compat.so.3.7 usr/lib64/libpq.so +usr/lib64/libpgtypes.so.3.6 +usr/lib64/libpq.so.5.8 usr/lib64/libpq.so.5 usr/lib64/libpgcommon.a usr/lib64/libecpg.so.6 usr/lib64/libpq.a -usr/lib64/libecpg.so.6.6 usr/lib64/libpgport.a usr/lib64/libecpg_compat.a usr/lib64/libecpg.so -usr/lib64/libecpg_compat.so.3.6 usr/lib64/libpgtypes.a usr/lib64/libecpg.a usr/lib64/libpgtypes.so -usr/lib64/libpgtypes.so.3.5 usr/bin/createlang usr/bin/clusterdb usr/bin/pg_dumpall @@ -32,7 +32,6 @@ usr/bin/droplang usr/bin/createdb usr/bin/oid2name usr/bin/pg_dump -usr/bin/pgbench usr/bin/dropuser usr/bin/vacuumlo usr/bin/pg_restore diff --git a/eselect/postgresql/active.links94 b/eselect/postgresql/active.links94 deleted file mode 100644 index 4dba4ea..0000000 --- a/eselect/postgresql/active.links94 +++ /dev/null @@ -1,19 +0,0 @@ -usr/bin/createlang94 -usr/bin/clusterdb94 -usr/bin/pg_dumpall94 -usr/bin/createuser94 -usr/bin/dropdb94 -usr/bin/droplang94 -usr/bin/createdb94 -usr/bin/oid2name94 -usr/bin/pg_dump94 -usr/bin/pgbench94 -usr/bin/dropuser94 -usr/bin/vacuumlo94 -usr/bin/pg_restore94 -usr/bin/vacuumdb94 -usr/bin/pg_config94 -usr/bin/pg_isready94 -usr/bin/reindexdb94 -usr/bin/psql94 -usr/bin/ecpg94 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/profile.env b/profile.env index 2aa438a..84d9328 100644 --- a/profile.env +++ b/profile.env @@ -13,7 +13,7 @@ export INFOPATH='/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/i export LANG='de_DE.utf8' 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:/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:/usr/share/postgresql/man/:/usr/share/postgresql-9.5/man/' export MULTIOSDIRS='../lib64:../lib32' export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3' export PRELINK_PATH_MASK='/usr/lib64/klibc' diff --git a/salt/pki/master/minions/storage1.stage.pb.local b/salt/pki/master/minions/storage1.stage.pb.local new file mode 100644 index 0000000..7ff5572 --- /dev/null +++ b/salt/pki/master/minions/storage1.stage.pb.local @@ -0,0 +1,9 @@ +-----BEGIN PUBLIC KEY----- +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkoR5HL0QJZXsQd10VnNB +U1EQjVupF/oo96socJhK4ROvohBJSM/DtysGZ61DARuSFqAPa0C52DOqhyKC1CZp +GJVPORtf5nligKtIGY/ca0tLIRTvnxwwMtIm8mk+JuI4Y7coSmF9qFNv7E7ME7V0 +u5W9t0z/qfnQiOQR0K9YJVu6JfRPJVtNkD1hi/MFHYritOuiEiYA05kMy6o0ifp1 +w4S3z9tyzB7tAomb/kEN0QsB/RQ14rVgh9zjB1EpeJj/m752GkAHi7OJZfndy6VX +YFs+MfYT1l0CsMgepQk6QX1WcUqAU7qyUf68m0tyKdtrM25hj7K1pRNb470j95WA +mwIDAQAB +-----END PUBLIC KEY----- \ No newline at end of file diff --git a/salt/pki/master/minions/storage2.stage.pb.local b/salt/pki/master/minions/storage2.stage.pb.local new file mode 100644 index 0000000..4a194ef --- /dev/null +++ b/salt/pki/master/minions/storage2.stage.pb.local @@ -0,0 +1,9 @@ +-----BEGIN PUBLIC KEY----- +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlyI95sDGmVO9cl5XtOMV +6CAP3Sxm781Ckwy8ICX5knLBbG9VDfrF+Use5DytdwAlksUXyavhyyEfNwgCUUbU +doU2Ih/RJJQX7koqfPdjfCTmW7iCarUJJnp3P7Io/LUb7n4lGZY7T1MuJrLPlYRP +FryKYxGb6TkhOUGQu+dl+UCcY5hH2fowMCYAZXegCxsycxAfSFSXWlYik8kX1gwW +xgLVohNBLscJx2jnmtyFZHGNQwF8hMnoj11OkIVwozWek8Px62H7xqhz19TPMKIr +B8kMg7jtbSgmJduw3KfIR3Q95F484hh7wHkATLSju6QKpjq7AMdms0vGmGG907w7 +6wIDAQAB +-----END PUBLIC KEY----- \ No newline at end of file