From 12cfdb4de49c6270784139b0cd571ce978f4a449 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Wed, 5 Dec 2012 09:34:03 +0100 Subject: [PATCH] Current state --- .etckeeper | 29 +- DIR_COLORS | 2 + auto.master | 23 - auto.misc => autofs/auto.misc | 0 auto.net => autofs/auto.net | 0 auto.smb => autofs/auto.smb | 0 .../autofs_ldap_auth.conf | 0 conf.d/autofs | 2 +- conf.d/netmount | 46 +- conf.d/{postgresql-9.1 => postgresql-9.2} | 6 +- csh.env | 2 +- env.d/50postgresql | 4 +- eselect/postgresql/active | 2 +- eselect/postgresql/active.links | 10 +- eselect/postgresql/active.links91 | 29 - eselect/postgresql/active.links92 | 13 + eselect/postgresql/slots/9.1/base | 1 - eselect/postgresql/slots/9.1/docs | 1 - eselect/postgresql/slots/9.1/server | 1 - eselect/postgresql/slots/9.2/server | 1 + init.d/localmount | 8 +- init.d/{postgresql-9.1 => postgresql-9.2} | 12 +- init.d/samba | 2 +- init.d/slapd | 3 +- ld.so.conf | 1 - openldap/schema/samba.schema | 55 ++ portage/package.mask | 2 +- .../.keep_dev-db_postgresql-base-9.1 | 0 postgresql-9.2/pg_hba.conf | 93 +++ postgresql-9.2/pg_ident.conf | 42 ++ postgresql-9.2/postgresql.conf | 573 ++++++++++++++++++ profile.env | 2 +- runlevels/default/postgresql-9.1 | 1 - runlevels/default/postgresql-9.2 | 1 + samba/lmhosts | 2 +- samba/smbusers | 2 +- sgml/catalog | 2 +- 37 files changed, 864 insertions(+), 109 deletions(-) delete mode 100644 auto.master rename auto.misc => autofs/auto.misc (100%) rename auto.net => autofs/auto.net (100%) rename auto.smb => autofs/auto.smb (100%) rename autofs_ldap_auth.conf => autofs/autofs_ldap_auth.conf (100%) rename conf.d/{postgresql-9.1 => postgresql-9.2} (93%) delete mode 100644 eselect/postgresql/active.links91 delete mode 100644 eselect/postgresql/slots/9.1/base delete mode 100644 eselect/postgresql/slots/9.1/docs delete mode 100644 eselect/postgresql/slots/9.1/server create mode 100644 eselect/postgresql/slots/9.2/server rename init.d/{postgresql-9.1 => postgresql-9.2} (91%) delete mode 100644 postgresql-9.1/.keep_dev-db_postgresql-base-9.1 create mode 100644 postgresql-9.2/pg_hba.conf create mode 100644 postgresql-9.2/pg_ident.conf create mode 100644 postgresql-9.2/postgresql.conf delete mode 120000 runlevels/default/postgresql-9.1 create mode 120000 runlevels/default/postgresql-9.2 diff --git a/.etckeeper b/.etckeeper index 276702a..8324eb7 100755 --- a/.etckeeper +++ b/.etckeeper @@ -109,13 +109,12 @@ maybe chmod 0640 './audit/audit.rules' maybe chmod 0640 './audit/audit.rules.stop.post' maybe chmod 0640 './audit/audit.rules.stop.pre' maybe chmod 0640 './audit/auditd.conf' -maybe chmod 0644 './auto.master' -maybe chmod 0644 './auto.misc' -maybe chmod 0755 './auto.net' -maybe chmod 0755 './auto.smb' maybe chmod 0755 './autofs' maybe chmod 0644 './autofs/auto.master' -maybe chmod 0600 './autofs_ldap_auth.conf' +maybe chmod 0644 './autofs/auto.misc' +maybe chmod 0755 './autofs/auto.net' +maybe chmod 0755 './autofs/auto.smb' +maybe chmod 0600 './autofs/autofs_ldap_auth.conf' maybe chmod 0755 './bash' maybe chmod 0644 './bash/bash_logout' maybe chmod 0644 './bash/bashrc' @@ -180,7 +179,7 @@ maybe chmod 0644 './conf.d/ntpd' maybe chmod 0644 './conf.d/openvpn' maybe chmod 0644 './conf.d/pciparm' maybe chmod 0644 './conf.d/portmap' -maybe chmod 0644 './conf.d/postgresql-9.1' +maybe chmod 0644 './conf.d/postgresql-9.2' maybe chmod 0640 './conf.d/postgrey' maybe chmod 0644 './conf.d/pydoc-2.7' maybe chmod 0644 './conf.d/pydoc-3.2' @@ -709,16 +708,12 @@ 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' +maybe chmod 0644 './eselect/postgresql/slots/9.2/server' maybe chmod 0644 './etc-update.conf' maybe chmod 0755 './etckeeper' maybe chmod 0755 './etckeeper/commit.d' @@ -914,7 +909,7 @@ maybe chmod 0755 './init.d/php-fpm' maybe chmod 0755 './init.d/policyd-weight' maybe chmod 0755 './init.d/portmap' 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/postgrey' maybe chmod 0755 './init.d/procfs' maybe chmod 0755 './init.d/proftpd' @@ -1340,7 +1335,6 @@ maybe chmod 0600 './postfix/saslpass' maybe chmod 0644 './postfix/smtp_auth' maybe chmod 0644 './postfix/smtp_auth.db' maybe chmod 0755 './postgresql-9.1' -maybe chmod 0644 './postgresql-9.1/.keep_dev-db_postgresql-base-9.1' maybe chown postgres './postgresql-9.1/pg_hba.conf' maybe chgrp postgres './postgresql-9.1/pg_hba.conf' maybe chmod 0600 './postgresql-9.1/pg_hba.conf' @@ -1352,6 +1346,15 @@ maybe chgrp postgres './postgresql-9.1/postgresql.conf' maybe chmod 0600 './postgresql-9.1/postgresql.conf' maybe chmod 0755 './postgresql-9.2' maybe chmod 0644 './postgresql-9.2/.keep_dev-db_postgresql-base-9.2' +maybe chown postgres './postgresql-9.2/pg_hba.conf' +maybe chgrp postgres './postgresql-9.2/pg_hba.conf' +maybe chmod 0600 './postgresql-9.2/pg_hba.conf' +maybe chown postgres './postgresql-9.2/pg_ident.conf' +maybe chgrp postgres './postgresql-9.2/pg_ident.conf' +maybe chmod 0600 './postgresql-9.2/pg_ident.conf' +maybe chown postgres './postgresql-9.2/postgresql.conf' +maybe chgrp postgres './postgresql-9.2/postgresql.conf' +maybe chmod 0600 './postgresql-9.2/postgresql.conf' maybe chmod 0644 './procmailrc' maybe chmod 0644 './profile' maybe chmod 0755 './profile.d' diff --git a/DIR_COLORS b/DIR_COLORS index bb01137..ca474ae 100644 --- a/DIR_COLORS +++ b/DIR_COLORS @@ -55,6 +55,8 @@ TERM screen-w TERM screen.Eterm TERM screen.rxvt TERM screen.linux +TERM st +TERM st-256color TERM terminator TERM vt100 TERM xterm diff --git a/auto.master b/auto.master deleted file mode 100644 index 9fe5609..0000000 --- a/auto.master +++ /dev/null @@ -1,23 +0,0 @@ -# -# Sample auto.master file -# This is an automounter map and it has the following format -# key [ -mount-options-separated-by-comma ] location -# For details of the format look at autofs(5). -# -/misc /etc/auto.misc -# -# NOTE: mounts done from a hosts map will be mounted with the -# "nosuid" and "nodev" options unless the "suid" and "dev" -# options are explicitly given. -# -/net -hosts -# -# Include central master map if it can be found using -# nsswitch sources. -# -# Note that if there are entries for /net or /misc (as -# above) in the included master map any keys that are the -# same will not be seen as the first read key seen takes -# precedence. -# -+auto.master diff --git a/auto.misc b/autofs/auto.misc similarity index 100% rename from auto.misc rename to autofs/auto.misc diff --git a/auto.net b/autofs/auto.net similarity index 100% rename from auto.net rename to autofs/auto.net diff --git a/auto.smb b/autofs/auto.smb similarity index 100% rename from auto.smb rename to autofs/auto.smb diff --git a/autofs_ldap_auth.conf b/autofs/autofs_ldap_auth.conf similarity index 100% rename from autofs_ldap_auth.conf rename to autofs/autofs_ldap_auth.conf diff --git a/conf.d/autofs b/conf.d/autofs index 491b3b0..6c8d9c7 100644 --- a/conf.d/autofs +++ b/conf.d/autofs @@ -117,7 +117,7 @@ BROWSE_MODE="no" # AUTH_CONF_FILE - set the default location for the SASL # authentication configuration file. # -#AUTH_CONF_FILE="/etc/autofs_ldap_auth.conf" +#AUTH_CONF_FILE="/etc/autofs/autofs_ldap_auth.conf" # # MAP_HASH_TABLE_SIZE - set the map cache hash table size. # Should be a power of 2 with a ratio roughly diff --git a/conf.d/netmount b/conf.d/netmount index 7df2c8d..fc19fd4 100644 --- a/conf.d/netmount +++ b/conf.d/netmount @@ -1,20 +1,40 @@ -# Depending on how mounting your network file systems behaves when your -# network interfaces are down, you may need to set the netmount script to -# require specific network interfaces to be active. This file gives -# examples of how to do this: +# You will need to set the dependencies in the netmount script to match +# the network configuration tools you are using. This should be done in +# this file by following the examples below, and not by changing the +# service script itself. # -# If you are using newnet and configuring the interface with a static -# address with the network script: -# rc_need="network" +# Each of these examples is meant to be used separately. So, for +# example, do not set rc_need to something like "net.eth0 dhcpcd". +# +# If you are using newnet and configuring your interfaces with static +# addresses with the network script, you should use this setting. +# +#rc_need="network" # # If you are using oldnet, you must list the specific net.* services you -# need: +# need. +# +# This example assumes all of your netmounts can be reached on +# eth0. +# +#rc_need="net.eth0" # -# rc_need="net.eth0" -# rc_need="net.eth1 net.eth2" +# This example assumes some of your netmounts are on eth1 and some +# are on eth2. +# +#rc_need="net.eth1 net.eth2" # # If you are using a dynamic network management tool like -# networkmanager, dhcpcd, etc, you should list that tool here. +# networkmanager, dhcpcd in standalone mode, wicd, badvpn-ncd, etc, to +# manage the network interfaces with the routes to your netmounts, you +# should list that tool. +# +#rc_need="networkmanager" +#rc_need="dhcpcd" +#rc_need="wicd" +# +# The default setting is designed to be backward compatible with our +# current setup, but you are highly discouraged from using this. In +# other words, please change it to be more suited to your system. # -# rc_need="networkmanager" -# rc_need="dhcpcd" +rc_need="net" diff --git a/conf.d/postgresql-9.1 b/conf.d/postgresql-9.2 similarity index 93% rename from conf.d/postgresql-9.1 rename to conf.d/postgresql-9.2 index 54cf5cc..2902e21 100644 --- a/conf.d/postgresql-9.1 +++ b/conf.d/postgresql-9.2 @@ -38,7 +38,7 @@ FORCE_TIMEOUT=2 # # The following values should not be arbitrarily changed. # -# `emerge --config dev-db/postgresql-server:9.1' uses these values to +# `emerge --config dev-db/postgresql-server:9.2' 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. # @@ -48,10 +48,10 @@ FORCE_TIMEOUT=2 ############################################################################## # Location of configuration files -PGDATA="/etc/postgresql-9.1/" +PGDATA="/etc/postgresql-9.2/" # Where the data directory is located/to be created -DATA_DIR="/var/lib/postgresql/9.1/data" +DATA_DIR="/var/lib/postgresql/9.2/data" # Additional options to pass to initdb. # See `man initdb' for available options. diff --git a/csh.env b/csh.env index 1ac6c6b..49a0db5 100644 --- a/csh.env +++ b/csh.env @@ -26,7 +26,7 @@ setenv LC_TELEPHONE 'de_DE.utf8' setenv LC_TIME '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.5.4/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/man:/etc/java-config/system-vm/man/:/usr/lib64/php5.3/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.3/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' 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 ba33cd5..0b92d4f 100644 --- a/eselect/postgresql/active.links +++ b/eselect/postgresql/active.links @@ -4,15 +4,16 @@ /usr/include/libpq /usr/include/postgres_ext.h /usr/lib64/postgresql -/usr/lib64/libecpg_compat.so.3.3 -/usr/lib64/libpq.so.5.4 +/usr/lib64/libecpg.so.6.4 +/usr/lib64/libecpg_compat.so.3.4 /usr/lib64/libecpg_compat.so /usr/lib64/libpgport.a /usr/lib64/libecpg.so.6 +/usr/lib64/libpgtypes.so.3.3 +/usr/lib64/libpq.so.5.5 /usr/lib64/libpqwalreceiver.so /usr/lib64/libpgtypes.so /usr/lib64/libecpg.a -/usr/lib64/libpgtypes.so.3.2 /usr/lib64/libpgtypes.a /usr/lib64/libpq.so /usr/lib64/libpq.a @@ -20,7 +21,6 @@ /usr/lib64/libecpg_compat.so.3 /usr/lib64/libpgtypes.so.3 /usr/lib64/libecpg_compat.a -/usr/lib64/libecpg.so.6.3 /usr/lib64/libpq.so.5 /usr/bin/pg_ctl /usr/bin/psql @@ -48,7 +48,9 @@ /usr/bin/dropuser /usr/bin/pg_controldata /usr/bin/oid2name +/usr/bin/pg_test_timing /usr/bin/pg_standby /usr/bin/createlang +/usr/bin/pg_receivexlog /usr/bin/droplang /usr/share/postgresql diff --git a/eselect/postgresql/active.links91 b/eselect/postgresql/active.links91 deleted file mode 100644 index 60004cb..0000000 --- a/eselect/postgresql/active.links91 +++ /dev/null @@ -1,29 +0,0 @@ -/usr/bin/pg_ctl91 -/usr/bin/psql91 -/usr/bin/dropdb91 -/usr/bin/vacuumlo91 -/usr/bin/vacuumdb91 -/usr/bin/reindexdb91 -/usr/bin/pg_archivecleanup91 -/usr/bin/clusterdb91 -/usr/bin/pg_restore91 -/usr/bin/pg_dumpall91 -/usr/bin/createuser91 -/usr/bin/pg_dump91 -/usr/bin/pg_upgrade91 -/usr/bin/pg_config91 -/usr/bin/postgres91 -/usr/bin/pgbench91 -/usr/bin/pg_resetxlog91 -/usr/bin/ecpg91 -/usr/bin/pg_basebackup91 -/usr/bin/createdb91 -/usr/bin/postmaster91 -/usr/bin/initdb91 -/usr/bin/pg_test_fsync91 -/usr/bin/dropuser91 -/usr/bin/pg_controldata91 -/usr/bin/oid2name91 -/usr/bin/pg_standby91 -/usr/bin/createlang91 -/usr/bin/droplang91 diff --git a/eselect/postgresql/active.links92 b/eselect/postgresql/active.links92 index 76ddff0..55a5e27 100644 --- a/eselect/postgresql/active.links92 +++ b/eselect/postgresql/active.links92 @@ -1,18 +1,31 @@ +/usr/bin/pg_ctl92 /usr/bin/psql92 /usr/bin/dropdb92 /usr/bin/vacuumlo92 /usr/bin/vacuumdb92 /usr/bin/reindexdb92 +/usr/bin/pg_archivecleanup92 /usr/bin/clusterdb92 /usr/bin/pg_restore92 /usr/bin/pg_dumpall92 /usr/bin/createuser92 /usr/bin/pg_dump92 +/usr/bin/pg_upgrade92 /usr/bin/pg_config92 +/usr/bin/postgres92 /usr/bin/pgbench92 +/usr/bin/pg_resetxlog92 /usr/bin/ecpg92 +/usr/bin/pg_basebackup92 /usr/bin/createdb92 +/usr/bin/postmaster92 +/usr/bin/initdb92 +/usr/bin/pg_test_fsync92 /usr/bin/dropuser92 +/usr/bin/pg_controldata92 /usr/bin/oid2name92 +/usr/bin/pg_test_timing92 +/usr/bin/pg_standby92 /usr/bin/createlang92 +/usr/bin/pg_receivexlog92 /usr/bin/droplang92 diff --git a/eselect/postgresql/slots/9.1/base b/eselect/postgresql/slots/9.1/base deleted file mode 100644 index 04d3ce1..0000000 --- a/eselect/postgresql/slots/9.1/base +++ /dev/null @@ -1 +0,0 @@ -postgres_ebuilds="${postgres_ebuilds} postgresql-base-9.1.6" diff --git a/eselect/postgresql/slots/9.1/docs b/eselect/postgresql/slots/9.1/docs deleted file mode 100644 index ca333d5..0000000 --- a/eselect/postgresql/slots/9.1/docs +++ /dev/null @@ -1 +0,0 @@ -postgres_ebuilds="${postgres_ebuilds} postgresql-docs-9.1.6" diff --git a/eselect/postgresql/slots/9.1/server b/eselect/postgresql/slots/9.1/server deleted file mode 100644 index 53640b6..0000000 --- a/eselect/postgresql/slots/9.1/server +++ /dev/null @@ -1 +0,0 @@ -postgres_ebuilds="${postgres_ebuilds} postgresql-server-9.1.6" diff --git a/eselect/postgresql/slots/9.2/server b/eselect/postgresql/slots/9.2/server new file mode 100644 index 0000000..bb30163 --- /dev/null +++ b/eselect/postgresql/slots/9.2/server @@ -0,0 +1 @@ +postgres_ebuilds="${postgres_ebuilds} postgresql-server-9.2.1" diff --git a/init.d/localmount b/init.d/localmount index 7a20bbf..b5d7df2 100755 --- a/init.d/localmount +++ b/init.d/localmount @@ -22,6 +22,9 @@ start() if [ "$RC_UNAME" = Linux ]; then no_netdev="-O no_netdev" + if mountinfo -q /usr; then + touch $RC_SVCDIR/usr_premounted + fi fi ebegin "Mounting local filesystems" mount -at "$types" $no_netdev @@ -48,7 +51,10 @@ stop() done if [ "$RC_UNAME" = Linux ]; then - no_umounts_r="$no_umounts_r|/proc|/proc/.*|/run|/sys|/sys/.*|/usr" + no_umounts_r="$no_umounts_r|/proc|/proc/.*|/run|/sys|/sys/.*" + if [ -e $rc_svcdir/usr_premounted ]; then + no_umounts_r="$no_umounts_r|/usr" + fi fi no_umounts_r="^($no_umounts_r)$" diff --git a/init.d/postgresql-9.1 b/init.d/postgresql-9.2 similarity index 91% rename from init.d/postgresql-9.1 rename to init.d/postgresql-9.2 index 5cac664..f8d3eb6 100755 --- a/init.d/postgresql-9.1 +++ b/init.d/postgresql-9.2 @@ -29,7 +29,7 @@ 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" + eerror "HINT: Perhaps you need to update /etc/conf.d/postgresql-9.2" return 1 fi @@ -38,7 +38,7 @@ checkconfig() { 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" + eerror " emerge --config dev-db/postgresql-server:9.2" return 1 fi @@ -85,12 +85,12 @@ start() { 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} + --exec /usr/lib/postgresql-9.2/bin/pg_ctl \ + -- start -s -w -t ${START_TIMEOUT} -l ${DATA_DIR%/}/postmaster.log \ + -D ${PGDATA} -o "--data-directory=${DATA_DIR} ${PGOPTS}" local retval=$? if [ $retval -ne 0 ] ; then @@ -122,7 +122,7 @@ stop() { # Loops through nice, rude, and force quit in one go. start-stop-daemon --stop \ - --exec /usr/lib/postgresql-9.1/bin/postgres \ + --exec /usr/lib/postgresql-9.2/bin/postgres \ --retry ${retries} \ --pidfile ${DATA_DIR%/}/postmaster.pid diff --git a/init.d/samba b/init.d/samba index 7e6d2a8..779ec09 100755 --- a/init.d/samba +++ b/init.d/samba @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.5/samba.initd,v 1.4 2011/09/14 22:52:33 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.6/samba.initd,v 1.3 2011/09/14 22:52:33 polynomial-c Exp $ extra_started_commands="reload" diff --git a/init.d/slapd b/init.d/slapd index 592e228..78a32b7 100755 --- a/init.d/slapd +++ b/init.d/slapd @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/files/slapd-initd-2.4.28-r1,v 1.2 2012/02/12 21:35:04 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/files/slapd-initd-2.4.28-r1,v 1.4 2012/05/27 07:22:43 robbat2 Exp $ extra_commands="checkconfig" @@ -14,6 +14,7 @@ depend() { } start() { + checkpath -q -d /var/run/openldap/ -o ldap:ldap if ! checkconfig -Q ; then eerror "There is a problem with your slapd.conf!" return 1 diff --git a/ld.so.conf b/ld.so.conf index 1663152..9b2e996 100644 --- a/ld.so.conf +++ b/ld.so.conf @@ -15,4 +15,3 @@ include ld.so.conf.d/*.conf /usr/lib/postgresql /usr/lib64/postgresql /usr/lib64/postgresql-9.2/lib64/ -/usr/lib64/postgresql-9.1/lib64/ diff --git a/openldap/schema/samba.schema b/openldap/schema/samba.schema index 8f82ddd..716c191 100644 --- a/openldap/schema/samba.schema +++ b/openldap/schema/samba.schema @@ -469,6 +469,50 @@ attributetype ( 1.3.6.1.4.1.7165.2.1.69 NAME 'sambaPreviousClearTextPassword' EQUALITY octetStringMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 ) +attributetype ( 1.3.6.1.4.1.7165.2.1.70 NAME 'sambaTrustType' + DESC 'Type of trust' + EQUALITY integerMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.7165.2.1.71 NAME 'sambaTrustAttributes' + DESC 'Trust attributes for a trusted domain' + EQUALITY integerMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.7165.2.1.72 NAME 'sambaTrustDirection' + DESC 'Direction of a trust' + EQUALITY integerMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.7165.2.1.73 NAME 'sambaTrustPartner' + DESC 'Fully qualified name of the domain with which a trust exists' + EQUALITY caseIgnoreMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} ) + +attributetype ( 1.3.6.1.4.1.7165.2.1.74 NAME 'sambaFlatName' + DESC 'NetBIOS name of a domain' + EQUALITY caseIgnoreMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} ) + +attributetype ( 1.3.6.1.4.1.7165.2.1.75 NAME 'sambaTrustAuthOutgoing' + DESC 'Authentication information for the outgoing portion of a trust' + EQUALITY caseExactMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050} ) + +attributetype ( 1.3.6.1.4.1.7165.2.1.76 NAME 'sambaTrustAuthIncoming' + DESC 'Authentication information for the incoming portion of a trust' + EQUALITY caseExactMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050} ) + +attributetype ( 1.3.6.1.4.1.7165.2.1.77 NAME 'sambaSecurityIdentifier' + DESC 'SID of a trusted domain' + EQUALITY caseIgnoreIA5Match SUBSTR caseExactIA5SubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{64} SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.7165.2.1.78 NAME 'sambaTrustForestTrustInfo' + DESC 'Forest trust information for a trusted domain object' + EQUALITY caseExactMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050} ) ####################################################################### @@ -573,3 +617,14 @@ objectclass ( 1.3.6.1.4.1.7165.2.2.12 NAME 'sambaConfigOption' SUP top STRUCTURA ## DESC 'Samba Privilege' ## MUST ( sambaSID ) ## MAY ( sambaPrivilegeList ) ) + +## +## used for IPA_ldapsam +## +objectclass ( 1.3.6.1.4.1.7165.2.2.16 NAME 'sambaTrustedDomain' SUP top STRUCTURAL + DESC 'Samba Trusted Domain Object' + MUST ( cn ) + MAY ( sambaTrustType $ sambaTrustAttributes $ sambaTrustDirection $ + sambaTrustPartner $ sambaFlatName $ sambaTrustAuthOutgoing $ + sambaTrustAuthIncoming $ sambaSecurityIdentifier $ + sambaTrustForestTrustInfo) ) diff --git a/portage/package.mask b/portage/package.mask index e89493f..6cb8ce5 100644 --- a/portage/package.mask +++ b/portage/package.mask @@ -1 +1 @@ -=dev-db/postgresql-server-9.2* +#=dev-db/postgresql-server-9.2* 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/postgresql-9.2/pg_hba.conf b/postgresql-9.2/pg_hba.conf new file mode 100644 index 0000000..9455a96 --- /dev/null +++ b/postgresql-9.2/pg_hba.conf @@ -0,0 +1,93 @@ +# PostgreSQL Client Authentication Configuration File +# =================================================== +# +# Refer to the "Client Authentication" section in the PostgreSQL +# documentation for a complete description of this file. A short +# synopsis follows. +# +# This file controls: which hosts are allowed to connect, how clients +# are authenticated, which PostgreSQL user names they can use, which +# databases they can access. Records take one of these forms: +# +# local DATABASE USER METHOD [OPTIONS] +# host DATABASE USER ADDRESS METHOD [OPTIONS] +# hostssl DATABASE USER ADDRESS METHOD [OPTIONS] +# hostnossl DATABASE USER ADDRESS METHOD [OPTIONS] +# +# (The uppercase items must be replaced by actual values.) +# +# The first field is the connection type: "local" is a Unix-domain +# socket, "host" is either a plain or SSL-encrypted TCP/IP socket, +# "hostssl" is an SSL-encrypted TCP/IP socket, and "hostnossl" is a +# plain TCP/IP socket. +# +# DATABASE can be "all", "sameuser", "samerole", "replication", a +# database name, or a comma-separated list thereof. The "all" +# keyword does not match "replication". Access to replication +# must be enabled in a separate record (see example below). +# +# USER can be "all", a user name, a group name prefixed with "+", or a +# comma-separated list thereof. In both the DATABASE and USER fields +# you can also write a file name prefixed with "@" to include names +# from a separate file. +# +# ADDRESS specifies the set of hosts the record matches. It can be a +# host name, or it is made up of an IP address and a CIDR mask that is +# an integer (between 0 and 32 (IPv4) or 128 (IPv6) inclusive) that +# specifies the number of significant bits in the mask. A host name +# that starts with a dot (.) matches a suffix of the actual host name. +# Alternatively, you can write an IP address and netmask in separate +# columns to specify the set of hosts. Instead of a CIDR-address, you +# can write "samehost" to match any of the server's own IP addresses, +# or "samenet" to match any address in any subnet that the server is +# directly connected to. +# +# METHOD can be "trust", "reject", "md5", "password", "gss", "sspi", +# "krb5", "ident", "peer", "pam", "ldap", "radius" or "cert". Note that +# "password" sends passwords in clear text; "md5" is preferred since +# it sends encrypted passwords. +# +# OPTIONS are a set of options for the authentication in the format +# NAME=VALUE. The available options depend on the different +# authentication methods -- refer to the "Client Authentication" +# section in the documentation for a list of which options are +# available for which authentication methods. +# +# Database and user names containing spaces, commas, quotes and other +# special characters must be quoted. Quoting one of the keywords +# "all", "sameuser", "samerole" or "replication" makes the name lose +# its special character, and just match a database or username with +# that name. +# +# This file is read on server startup and when the postmaster receives +# a SIGHUP signal. If you edit the file on a running system, you have +# to SIGHUP the postmaster for the changes to take effect. You can +# use "pg_ctl reload" to do that. + +# Put your actual configuration here +# ---------------------------------- +# +# If you want to allow non-local connections, you need to add more +# "host" records. In that case you will also need to make PostgreSQL +# listen on a non-local interface via the listen_addresses +# configuration parameter, or via the -i or -h command line switches. + +# CAUTION: Configuring the system for local "trust" authentication +# allows any local user to connect as any PostgreSQL user, including +# the database superuser. If you do not trust all your local users, +# use another authentication method. + + +# TYPE DATABASE USER ADDRESS METHOD + +# "local" is for Unix domain socket connections only +local all all trust +# IPv4 local connections: +host all all 127.0.0.1/32 trust +# IPv6 local connections: +host all all ::1/128 trust +# Allow replication connections from localhost, by a user with the +# replication privilege. +#local replication postgres trust +#host replication postgres 127.0.0.1/32 trust +#host replication postgres ::1/128 trust diff --git a/postgresql-9.2/pg_ident.conf b/postgresql-9.2/pg_ident.conf new file mode 100644 index 0000000..a5870e6 --- /dev/null +++ b/postgresql-9.2/pg_ident.conf @@ -0,0 +1,42 @@ +# PostgreSQL User Name Maps +# ========================= +# +# Refer to the PostgreSQL documentation, chapter "Client +# Authentication" for a complete description. A short synopsis +# follows. +# +# This file controls PostgreSQL user name mapping. It maps external +# user names to their corresponding PostgreSQL user names. Records +# are of the form: +# +# MAPNAME SYSTEM-USERNAME PG-USERNAME +# +# (The uppercase quantities must be replaced by actual values.) +# +# MAPNAME is the (otherwise freely chosen) map name that was used in +# pg_hba.conf. SYSTEM-USERNAME is the detected user name of the +# client. PG-USERNAME is the requested PostgreSQL user name. The +# existence of a record specifies that SYSTEM-USERNAME may connect as +# PG-USERNAME. +# +# If SYSTEM-USERNAME starts with a slash (/), it will be treated as a +# regular expression. Optionally this can contain a capture (a +# parenthesized subexpression). The substring matching the capture +# will be substituted for \1 (backslash-one) if present in +# PG-USERNAME. +# +# Multiple maps may be specified in this file and used by pg_hba.conf. +# +# No map names are defined in the default configuration. If all +# system user names and PostgreSQL user names are the same, you don't +# need anything in this file. +# +# This file is read on server startup and when the postmaster receives +# a SIGHUP signal. If you edit the file on a running system, you have +# to SIGHUP the postmaster for the changes to take effect. You can +# use "pg_ctl reload" to do that. + +# Put your actual configuration here +# ---------------------------------- + +# MAPNAME SYSTEM-USERNAME PG-USERNAME diff --git a/postgresql-9.2/postgresql.conf b/postgresql-9.2/postgresql.conf new file mode 100644 index 0000000..99f87ec --- /dev/null +++ b/postgresql-9.2/postgresql.conf @@ -0,0 +1,573 @@ +# ----------------------------- +# PostgreSQL configuration file +# ----------------------------- +# +# This file consists of lines of the form: +# +# name = value +# +# (The "=" is optional.) Whitespace may be used. Comments are introduced with +# "#" anywhere on a line. The complete list of parameter names and allowed +# values can be found in the PostgreSQL documentation. +# +# The commented-out settings shown in this file represent the default values. +# Re-commenting a setting is NOT sufficient to revert it to the default value; +# you need to reload the server. +# +# This file is read on server startup and when the server receives a SIGHUP +# signal. If you edit the file on a running system, you have to SIGHUP the +# server for the changes to take effect, or use "pg_ctl reload". Some +# parameters, which are marked below, require a server shutdown and restart to +# take effect. +# +# Any parameter can also be given as a command-line option to the server, e.g., +# "postgres -c log_connections=on". Some parameters can be changed at run time +# with the "SET" SQL command. +# +# Memory units: kB = kilobytes Time units: ms = milliseconds +# MB = megabytes s = seconds +# GB = gigabytes min = minutes +# h = hours +# d = days + + +#------------------------------------------------------------------------------ +# FILE LOCATIONS +#------------------------------------------------------------------------------ + +# The default values of these variables are driven from the -D command-line +# option or PGDATA environment variable, represented here as ConfigDir. + +#data_directory = 'ConfigDir' # use data in another directory + # (change requires restart) +#hba_file = 'ConfigDir/pg_hba.conf' # host-based authentication file + # (change requires restart) +#ident_file = 'ConfigDir/pg_ident.conf' # ident configuration file + # (change requires restart) + +# 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) + + +#------------------------------------------------------------------------------ +# CONNECTIONS AND AUTHENTICATION +#------------------------------------------------------------------------------ + +# - Connection Settings - + +#listen_addresses = 'localhost' # what IP address(es) to listen on; + # comma-separated list of addresses; + # defaults to 'localhost'; use '*' for all + # (change requires restart) +#port = 5432 # (change requires restart) +max_connections = 100 # (change requires restart) +# Note: Increasing max_connections costs ~400 bytes of shared memory per +# connection slot, plus lock space (see max_locks_per_transaction). +#superuser_reserved_connections = 3 # (change requires restart) +#unix_socket_directory = '' # (change requires restart) +#unix_socket_group = '' # (change requires restart) +#unix_socket_permissions = 0777 # begin with 0 to use octal notation + # (change requires restart) +#bonjour = off # advertise server via Bonjour + # (change requires restart) +#bonjour_name = '' # defaults to the computer name + # (change requires restart) + +# - Security and Authentication - + +#authentication_timeout = 1min # 1s-600s +#ssl = off # (change requires restart) +#ssl_ciphers = 'ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH' # allowed SSL ciphers + # (change requires restart) +#ssl_renegotiation_limit = 512MB # amount of data between renegotiations +#ssl_cert_file = 'server.crt' # (change requires restart) +#ssl_key_file = 'server.key' # (change requires restart) +#ssl_ca_file = '' # (change requires restart) +#ssl_crl_file = '' # (change requires restart) +#password_encryption = on +#db_user_namespace = off + +# Kerberos and GSSAPI +#krb_server_keyfile = '' +#krb_srvname = 'postgres' # (Kerberos only) +#krb_caseins_users = off + +# - TCP Keepalives - +# see "man 7 tcp" for details + +#tcp_keepalives_idle = 0 # TCP_KEEPIDLE, in seconds; + # 0 selects the system default +#tcp_keepalives_interval = 0 # TCP_KEEPINTVL, in seconds; + # 0 selects the system default +#tcp_keepalives_count = 0 # TCP_KEEPCNT; + # 0 selects the system default + + +#------------------------------------------------------------------------------ +# RESOURCE USAGE (except WAL) +#------------------------------------------------------------------------------ + +# - Memory - + +shared_buffers = 24MB # min 128kB + # (change requires restart) +#temp_buffers = 8MB # min 800kB +#max_prepared_transactions = 0 # zero disables the feature + # (change requires restart) +# Note: Increasing max_prepared_transactions costs ~600 bytes of shared memory +# per transaction slot, plus lock space (see max_locks_per_transaction). +# It is not advisable to set max_prepared_transactions nonzero unless you +# actively intend to use prepared transactions. +#work_mem = 1MB # min 64kB +#maintenance_work_mem = 16MB # min 1MB +#max_stack_depth = 2MB # min 100kB + +# - Disk - + +#temp_file_limit = -1 # limits per-session temp file space + # in kB, or -1 for no limit + +# - Kernel Resource Usage - + +#max_files_per_process = 1000 # min 25 + # (change requires restart) +#shared_preload_libraries = '' # (change requires restart) + +# - Cost-Based Vacuum Delay - + +#vacuum_cost_delay = 0ms # 0-100 milliseconds +#vacuum_cost_page_hit = 1 # 0-10000 credits +#vacuum_cost_page_miss = 10 # 0-10000 credits +#vacuum_cost_page_dirty = 20 # 0-10000 credits +#vacuum_cost_limit = 200 # 1-10000 credits + +# - Background Writer - + +#bgwriter_delay = 200ms # 10-10000ms between rounds +#bgwriter_lru_maxpages = 100 # 0-1000 max buffers written/round +#bgwriter_lru_multiplier = 2.0 # 0-10.0 multipler on buffers scanned/round + +# - Asynchronous Behavior - + +#effective_io_concurrency = 1 # 1-1000; 0 disables prefetching + + +#------------------------------------------------------------------------------ +# WRITE AHEAD LOG +#------------------------------------------------------------------------------ + +# - Settings - + +#wal_level = minimal # minimal, archive, or hot_standby + # (change requires restart) +#fsync = on # turns forced synchronization on or off +#synchronous_commit = on # synchronization level; + # off, local, remote_write, or on +#wal_sync_method = fsync # the default is the first option + # supported by the operating system: + # open_datasync + # fdatasync (default on Linux) + # fsync + # fsync_writethrough + # open_sync +#full_page_writes = on # recover from partial page writes +#wal_buffers = -1 # min 32kB, -1 sets based on shared_buffers + # (change requires restart) +#wal_writer_delay = 200ms # 1-10000 milliseconds + +#commit_delay = 0 # range 0-100000, in microseconds +#commit_siblings = 5 # range 1-1000 + +# - Checkpoints - + +#checkpoint_segments = 3 # in logfile segments, min 1, 16MB each +#checkpoint_timeout = 5min # range 30s-1h +#checkpoint_completion_target = 0.5 # checkpoint target duration, 0.0 - 1.0 +#checkpoint_warning = 30s # 0 disables + +# - Archiving - + +#archive_mode = off # allows archiving to be done + # (change requires restart) +#archive_command = '' # command to use to archive a logfile segment + # placeholders: %p = path of file to archive + # %f = file name only + # e.g. 'test ! -f /mnt/server/archivedir/%f && cp %p /mnt/server/archivedir/%f' +#archive_timeout = 0 # force a logfile segment switch after this + # number of seconds; 0 disables + + +#------------------------------------------------------------------------------ +# REPLICATION +#------------------------------------------------------------------------------ + +# - Sending Server(s) - + +# Set these on the master and on any standby that will send replication data. + +#max_wal_senders = 0 # max number of walsender processes + # (change requires restart) +#wal_keep_segments = 0 # in logfile segments, 16MB each; 0 disables +#replication_timeout = 60s # in milliseconds; 0 disables + +# - Master Server - + +# These settings are ignored on a standby server. + +#synchronous_standby_names = '' # standby servers that provide sync rep + # comma-separated list of application_name + # from standby(s); '*' = all +#vacuum_defer_cleanup_age = 0 # number of xacts by which cleanup is delayed + +# - Standby Servers - + +# These settings are ignored on a master server. + +#hot_standby = off # "on" allows queries during recovery + # (change requires restart) +#max_standby_archive_delay = 30s # max delay before canceling queries + # when reading WAL from archive; + # -1 allows indefinite delay +#max_standby_streaming_delay = 30s # max delay before canceling queries + # when reading streaming WAL; + # -1 allows indefinite delay +#wal_receiver_status_interval = 10s # send replies at least this often + # 0 disables +#hot_standby_feedback = off # send info from standby to prevent + # query conflicts + + +#------------------------------------------------------------------------------ +# QUERY TUNING +#------------------------------------------------------------------------------ + +# - Planner Method Configuration - + +#enable_bitmapscan = on +#enable_hashagg = on +#enable_hashjoin = on +#enable_indexscan = on +#enable_indexonlyscan = on +#enable_material = on +#enable_mergejoin = on +#enable_nestloop = on +#enable_seqscan = on +#enable_sort = on +#enable_tidscan = on + +# - Planner Cost Constants - + +#seq_page_cost = 1.0 # measured on an arbitrary scale +#random_page_cost = 4.0 # same scale as above +#cpu_tuple_cost = 0.01 # same scale as above +#cpu_index_tuple_cost = 0.005 # same scale as above +#cpu_operator_cost = 0.0025 # same scale as above +#effective_cache_size = 128MB + +# - Genetic Query Optimizer - + +#geqo = on +#geqo_threshold = 12 +#geqo_effort = 5 # range 1-10 +#geqo_pool_size = 0 # selects default based on effort +#geqo_generations = 0 # selects default based on effort +#geqo_selection_bias = 2.0 # range 1.5-2.0 +#geqo_seed = 0.0 # range 0.0-1.0 + +# - Other Planner Options - + +#default_statistics_target = 100 # range 1-10000 +#constraint_exclusion = partition # on, off, or partition +#cursor_tuple_fraction = 0.1 # range 0.0-1.0 +#from_collapse_limit = 8 +#join_collapse_limit = 8 # 1 disables collapsing of explicit + # JOIN clauses + + +#------------------------------------------------------------------------------ +# ERROR REPORTING AND LOGGING +#------------------------------------------------------------------------------ + +# - Where to Log - + +#log_destination = 'stderr' # Valid values are combinations of + # stderr, csvlog, syslog, and eventlog, + # depending on platform. csvlog + # requires logging_collector to be on. + +# This is used when logging to stderr: +#logging_collector = off # Enable capturing of stderr and csvlog + # into log files. Required to be on for + # csvlogs. + # (change requires restart) + +# These are only used if logging_collector is on: +#log_directory = 'pg_log' # directory where log files are written, + # can be absolute or relative to PGDATA +#log_filename = 'postgresql-%Y-%m-%d_%H%M%S.log' # log file name pattern, + # can include strftime() escapes +#log_file_mode = 0600 # creation mode for log files, + # begin with 0 to use octal notation +#log_truncate_on_rotation = off # If on, an existing log file with the + # same name as the new log file will be + # truncated rather than appended to. + # But such truncation only occurs on + # time-driven rotation, not on restarts + # or size-driven rotation. Default is + # off, meaning append to existing files + # in all cases. +#log_rotation_age = 1d # Automatic rotation of logfiles will + # happen after that time. 0 disables. +#log_rotation_size = 10MB # Automatic rotation of logfiles will + # happen after that much log output. + # 0 disables. + +# These are relevant when logging to syslog: +#syslog_facility = 'LOCAL0' +#syslog_ident = 'postgres' + +# This is only relevant when logging to eventlog (win32): +#event_source = 'PostgreSQL' + +# - When to Log - + +#client_min_messages = notice # values in order of decreasing detail: + # debug5 + # debug4 + # debug3 + # debug2 + # debug1 + # log + # notice + # warning + # error + +#log_min_messages = warning # values in order of decreasing detail: + # debug5 + # debug4 + # debug3 + # debug2 + # debug1 + # info + # notice + # warning + # error + # log + # fatal + # panic + +#log_min_error_statement = error # values in order of decreasing detail: + # debug5 + # debug4 + # debug3 + # debug2 + # debug1 + # info + # notice + # warning + # error + # log + # fatal + # panic (effectively off) + +#log_min_duration_statement = -1 # -1 is disabled, 0 logs all statements + # and their durations, > 0 logs only + # statements running at least this number + # of milliseconds + + +# - What to Log - + +#debug_print_parse = off +#debug_print_rewritten = off +#debug_print_plan = off +#debug_pretty_print = on +#log_checkpoints = off +#log_connections = off +#log_disconnections = off +#log_duration = off +#log_error_verbosity = default # terse, default, or verbose messages +#log_hostname = off +#log_line_prefix = '' # special values: + # %a = application name + # %u = user name + # %d = database name + # %r = remote host and port + # %h = remote host + # %p = process ID + # %t = timestamp without milliseconds + # %m = timestamp with milliseconds + # %i = command tag + # %e = SQL state + # %c = session ID + # %l = session line number + # %s = session start timestamp + # %v = virtual transaction ID + # %x = transaction ID (0 if none) + # %q = stop here in non-session + # processes + # %% = '%' + # e.g. '<%u%%%d> ' +#log_lock_waits = off # log lock waits >= deadlock_timeout +#log_statement = 'none' # none, ddl, mod, all +#log_temp_files = -1 # log temporary files equal or larger + # than the specified size in kilobytes; + # -1 disables, 0 logs all temp files +log_timezone = 'Europe/Berlin' + + +#------------------------------------------------------------------------------ +# RUNTIME STATISTICS +#------------------------------------------------------------------------------ + +# - Query/Index Statistics Collector - + +#track_activities = on +#track_counts = on +#track_io_timing = off +#track_functions = none # none, pl, all +#track_activity_query_size = 1024 # (change requires restart) +#update_process_title = on +#stats_temp_directory = 'pg_stat_tmp' + + +# - Statistics Monitoring - + +#log_parser_stats = off +#log_planner_stats = off +#log_executor_stats = off +#log_statement_stats = off + + +#------------------------------------------------------------------------------ +# AUTOVACUUM PARAMETERS +#------------------------------------------------------------------------------ + +#autovacuum = on # Enable autovacuum subprocess? 'on' + # requires track_counts to also be on. +#log_autovacuum_min_duration = -1 # -1 disables, 0 logs all actions and + # their durations, > 0 logs only + # actions running at least this number + # of milliseconds. +#autovacuum_max_workers = 3 # max number of autovacuum subprocesses + # (change requires restart) +#autovacuum_naptime = 1min # time between autovacuum runs +#autovacuum_vacuum_threshold = 50 # min number of row updates before + # vacuum +#autovacuum_analyze_threshold = 50 # min number of row updates before + # analyze +#autovacuum_vacuum_scale_factor = 0.2 # fraction of table size before vacuum +#autovacuum_analyze_scale_factor = 0.1 # fraction of table size before analyze +#autovacuum_freeze_max_age = 200000000 # maximum XID age before forced vacuum + # (change requires restart) +#autovacuum_vacuum_cost_delay = 20ms # default vacuum cost delay for + # autovacuum, in milliseconds; + # -1 means use vacuum_cost_delay +#autovacuum_vacuum_cost_limit = -1 # default vacuum cost limit for + # autovacuum, -1 means use + # vacuum_cost_limit + + +#------------------------------------------------------------------------------ +# CLIENT CONNECTION DEFAULTS +#------------------------------------------------------------------------------ + +# - Statement Behavior - + +#search_path = '"$user",public' # schema names +#default_tablespace = '' # a tablespace name, '' uses the default +#temp_tablespaces = '' # a list of tablespace names, '' uses + # only default tablespace +#check_function_bodies = on +#default_transaction_isolation = 'read committed' +#default_transaction_read_only = off +#default_transaction_deferrable = off +#session_replication_role = 'origin' +#statement_timeout = 0 # in milliseconds, 0 is disabled +#vacuum_freeze_min_age = 50000000 +#vacuum_freeze_table_age = 150000000 +#bytea_output = 'hex' # hex, escape +#xmlbinary = 'base64' +#xmloption = 'content' + +# - Locale and Formatting - + +datestyle = 'iso, mdy' +#intervalstyle = 'postgres' +timezone = 'Europe/Berlin' +#timezone_abbreviations = 'Default' # Select the set of available time zone + # abbreviations. Currently, there are + # Default + # Australia + # India + # You can create your own file in + # share/timezonesets/. +#extra_float_digits = 0 # min -15, max 3 +#client_encoding = sql_ascii # actually, defaults to database + # encoding + +# These settings are initialized by initdb, but they can be changed. +lc_messages = 'en_US.UTF-8' # locale for system error message + # strings +lc_monetary = 'en_US.UTF-8' # locale for monetary formatting +lc_numeric = 'en_US.UTF-8' # locale for number formatting +lc_time = 'en_US.UTF-8' # locale for time formatting + +# default configuration for text search +default_text_search_config = 'pg_catalog.english' + +# - Other Defaults - + +#dynamic_library_path = '$libdir' +#local_preload_libraries = '' + + +#------------------------------------------------------------------------------ +# LOCK MANAGEMENT +#------------------------------------------------------------------------------ + +#deadlock_timeout = 1s +#max_locks_per_transaction = 64 # min 10 + # (change requires restart) +# Note: Each lock table slot uses ~270 bytes of shared memory, and there are +# max_locks_per_transaction * (max_connections + max_prepared_transactions) +# lock table slots. +#max_pred_locks_per_transaction = 64 # min 10 + # (change requires restart) + + +#------------------------------------------------------------------------------ +# VERSION/PLATFORM COMPATIBILITY +#------------------------------------------------------------------------------ + +# - Previous PostgreSQL Versions - + +#array_nulls = on +#backslash_quote = safe_encoding # on, off, or safe_encoding +#default_with_oids = off +#escape_string_warning = on +#lo_compat_privileges = off +#quote_all_identifiers = off +#sql_inheritance = on +#standard_conforming_strings = on +#synchronize_seqscans = on + +# - Other Platforms and Clients - + +#transform_null_equals = off + + +#------------------------------------------------------------------------------ +# ERROR HANDLING +#------------------------------------------------------------------------------ + +#exit_on_error = off # terminate session on any error? +#restart_after_crash = on # reinitialize after backend crash? + + +#------------------------------------------------------------------------------ +# CUSTOMIZED OPTIONS +#------------------------------------------------------------------------------ + +# Add settings for extensions here diff --git a/profile.env b/profile.env index 6bf47fe..72c9897 100644 --- a/profile.env +++ b/profile.env @@ -26,7 +26,7 @@ export LC_TELEPHONE='de_DE.utf8' export LC_TIME='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.5.4/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.22/man:/etc/java-config/system-vm/man/:/usr/lib64/php5.3/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.3/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' diff --git a/runlevels/default/postgresql-9.1 b/runlevels/default/postgresql-9.1 deleted file mode 120000 index 7c2d7c7..0000000 --- a/runlevels/default/postgresql-9.1 +++ /dev/null @@ -1 +0,0 @@ -/etc/init.d/postgresql-9.1 \ No newline at end of file diff --git a/runlevels/default/postgresql-9.2 b/runlevels/default/postgresql-9.2 new file mode 120000 index 0000000..ddbd02b --- /dev/null +++ b/runlevels/default/postgresql-9.2 @@ -0,0 +1 @@ +/etc/init.d/postgresql-9.2 \ No newline at end of file diff --git a/samba/lmhosts b/samba/lmhosts index 80e7175..3e3428e 100644 --- a/samba/lmhosts +++ b/samba/lmhosts @@ -1,2 +1,2 @@ -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.5/lmhosts,v 1.1 2010/03/01 16:19:54 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.6/lmhosts,v 1.1 2011/06/30 15:50:28 dagger Exp $ 127.0.0.1 localhost diff --git a/samba/smbusers b/samba/smbusers index 51b8dda..b3c59f2 100644 --- a/samba/smbusers +++ b/samba/smbusers @@ -1,4 +1,4 @@ -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.5/smbusers,v 1.1 2010/03/01 16:19:54 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.6/smbusers,v 1.1 2011/06/30 15:50:28 dagger Exp $ # Syntax: # Unix_name = SMB_name1 SMB_name2 ... diff --git a/sgml/catalog b/sgml/catalog index 8254d9a..a86f414 100644 --- a/sgml/catalog +++ b/sgml/catalog @@ -7,5 +7,5 @@ CATALOG "/etc/sgml/xml-docbook-4.2.cat" CATALOG "/etc/sgml/xml-docbook-4.3.cat" CATALOG "/etc/sgml/xml-docbook-4.4.cat" CATALOG "/etc/sgml/xml-docbook-4.5.cat" -CATALOG "/etc/sgml/openjade-1.3.2.cat" CATALOG "/etc/sgml/linuxdoc.cat" +CATALOG "/etc/sgml/openjade-1.3.2.cat" -- 2.39.5