From: Frank Brehm Date: Tue, 3 Mar 2015 20:12:04 +0000 (+0100) Subject: Current state X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=10f807b6878f8186b4ac0e4706b58666a2196a9f;p=config%2Fbruni%2Fetc.git Current state --- diff --git a/X11/xinit/xinitrc b/X11/xinit/xinitrc index a367319f..e6dd7fe5 100644 --- a/X11/xinit/xinitrc +++ b/X11/xinit/xinitrc @@ -1,3 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #!/bin/sh userresources=$HOME/.Xresources diff --git a/X11/xinit/xserverrc b/X11/xinit/xserverrc index b4de2528..6b57eeba 100755 --- a/X11/xinit/xserverrc +++ b/X11/xinit/xserverrc @@ -1,2 +1,6 @@ #!/bin/sh -exec /usr/bin/X -nolisten tcp "$@" +if [ -z "$XDG_VTNR" ]; then + exec /usr/bin/X -nolisten tcp "$@" +else + exec /usr/bin/X -nolisten tcp "$@" vt$XDG_VTNR +fi diff --git a/apache2/modules.d/00_apache_manual.conf b/apache2/modules.d/00_apache_manual.conf index 71ae990f..f7d9fd6c 100644 --- a/apache2/modules.d/00_apache_manual.conf +++ b/apache2/modules.d/00_apache_manual.conf @@ -5,9 +5,9 @@ -AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.27-r4/manual$1" +AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-2.2.29/manual$1" - + Options Indexes AllowOverride None Order allow,deny diff --git a/conf.d/nfsclient b/conf.d/nfsclient index d885b637..8a995571 100644 --- a/conf.d/nfsclient +++ b/conf.d/nfsclient @@ -1,3 +1,14 @@ +# You need to decide which nfs protocol version you want to use. +# If you are unsure, leave these alone. +# +# If you are using only nfsv4, uncomment this line: +# +#rc_need="!rpc.statd" +# +# If you are using only nfsv3, uncomment this line: +# +#rc_need="!rpc.idmapd" +# # You will need to set the dependencies in the nfsclient 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 diff --git a/conf.d/unbound b/conf.d/unbound new file mode 100644 index 00000000..b4de7cf1 --- /dev/null +++ b/conf.d/unbound @@ -0,0 +1,4 @@ +# Settings should normally not need any changes. + +# Location of the unbound configuration file. Leave empty for the default. +#UNBOUND_CONFFILE="/etc/unbound/unbound.conf" diff --git a/csh.env b/csh.env index 0203b798..5e908452 100644 --- a/csh.env +++ b/csh.env @@ -3,7 +3,7 @@ # GO INTO /etc/csh.cshrc NOT /etc/csh.env setenv ANT_HOME '/usr/share/ant' -setenv CONFIG_PROTECT '/var/bind /usr/share/gnupg/qualified.txt /var/lib/hsqldb /usr/share/config' +setenv CONFIG_PROTECT '/var/bind /usr/share/gnupg/qualified.txt /var/lib/hsqldb /usr/share/config /usr/lib64/libreoffice/program/sofficerc' setenv CONFIG_PROTECT_MASK '/etc/gentoo-release /etc/sandbox.d /etc/php/cli-php5.5/ext-active/ /etc/php/cgi-php5.5/ext-active/ /etc/php/apache2-php5.5/ext-active/ /etc/fonts/fonts.conf /etc/gconf /etc/terminfo /etc/dconf /etc/ca-certificates.conf /etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/revdep-rebuild' setenv CVS_RSH 'ssh' setenv EDITOR '/usr/bin/vim' @@ -31,13 +31,13 @@ setenv LC_TIME 'de_DE.utf8' setenv LESS '-R -M --shift 5' setenv LESSOPEN '|lesspipe %s' setenv LIBBLURAY_CP '/usr/share/libbluray/lib/libbluray.jar' -setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.3/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.5/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.3/man/' +setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.3/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.5/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.4/man/' setenv MULTIOSDIRS '../lib64:../lib32' setenv OPENGL_PROFILE 'xorg-x11' setenv PAGER '/usr/bin/less' setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.3:/usr/lib64/subversion/bin:/usr/games/bin' setenv PRELINK_PATH_MASK '/usr/lib64/libfreebl3.so:/usr/lib64/libnssdbm3.so:/usr/lib64/libsoftokn3.so:/usr/bin/evolution:/opt/bin/skype' -setenv PYTHONDOCS_2_7 '/usr/share/doc/python-docs-2.7.3/html/library' +setenv PYTHONDOCS_2_7 '/usr/share/doc/python-docs-2.7.8/html/library' setenv PYTHONDOCS_3_3 '/usr/share/doc/python-docs-3.3.2/html/library' setenv QT_GRAPHICSSYSTEM 'raster' setenv QT_PLUGIN_PATH '/usr/lib64/kde4/plugins' diff --git a/cups/printers.conf b/cups/printers.conf index 55af7e52..e065df5f 100644 --- a/cups/printers.conf +++ b/cups/printers.conf @@ -1,5 +1,5 @@ # Printer configuration file for CUPS v2.0.1 -# Written by cupsd on 2015-02-21 19:31 +# Written by cupsd on 2015-02-26 08:26 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING UUID urn:uuid:37ccb9f9-f39f-3442-414c-7de19e42748d diff --git a/dbus-1/system.conf b/dbus-1/system.conf index cb5d15f2..0d22e67b 100644 --- a/dbus-1/system.conf +++ b/dbus-1/system.conf @@ -68,6 +68,14 @@ + + + + + + @@ -45,6 +49,7 @@ TODO: document the other workarounds.