From 4c7b9e94a3290e5bf408d5a1a4842f5b34fff2d2 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Wed, 2 Jul 2014 21:38:44 +0200 Subject: [PATCH] Current state --- UPower/UPower.conf | 60 --------------------- bind/named.conf | 50 ++++++++--------- conf.d/pydoc-3.2 | 7 --- dbus-1/system.d/org.freedesktop.UPower.conf | 40 -------------- fstab | 3 +- init.d/pydoc-3.2 | 29 ---------- resolv.conf | 11 ++-- 7 files changed, 35 insertions(+), 165 deletions(-) delete mode 100644 UPower/UPower.conf delete mode 100644 conf.d/pydoc-3.2 delete mode 100644 dbus-1/system.d/org.freedesktop.UPower.conf delete mode 100755 init.d/pydoc-3.2 diff --git a/UPower/UPower.conf b/UPower/UPower.conf deleted file mode 100644 index 31753cfd..00000000 --- a/UPower/UPower.conf +++ /dev/null @@ -1,60 +0,0 @@ -# Only the system vendor should modify this file, ordinary users -# should not have to change anything. - -[UPower] - -# This is the smallest amount of time that UPower gives to session and system -# processes after the suspend or hibernate request is given. -# If the session power management component uses AboutToSuspend() then the -# session process can only make this time larger than the value below, never -# smaller. -# -# Reducing this time means the suspend happens quicker, but might also not give -# some processes enough time to save state. -# -# default=1000 -SleepTimeout=1000 - -# This controls whether hibernate is allowed when using encrypted swap. -# -# default=true -AllowHibernateEncryptedSwap=true - -# This controls whether we want the powersave commands to be run when running -# on battery or plugging AC. -# -# default=true -RunPowersaveCommand=true - -# Enable the Watts Up Pro device. -# -# The Watts Up Pro contains a generic FTDI USB device without a specific -# vendor and product ID. When we probe for WUP devices, we can cause -# the user to get a perplexing "Device or resource busy" error when -# attempting to use their non-WUP device. -# -# The generic FTDI device is known to also be used on: -# -# - Sparkfun FT232 breakout board -# - Parallax Propeller -# -# default=false -EnableWattsUpPro=false - -# Poll the kernel for dock state changes. -# -# Some drivers are still broken, and do not send out uvents when the -# connected state changes. -# -# default=false -PollDockDevices=false - -# Do we ignore the lid state -# -# Some laptops are broken. The lid state is either inverted, or stuck -# on or off. We can't do much to fix these problems, but this is a way -# for users to make the laptop panel vanish and for programs like -# gnome-power-manager to not suspend on system startup. -# -# default=false -IgnoreLid=false diff --git a/bind/named.conf b/bind/named.conf index 6bc1bf96..d507a5db 100644 --- a/bind/named.conf +++ b/bind/named.conf @@ -36,8 +36,10 @@ acl "local_ips" { }; acl "private_ips" { + 10.12.11.0/24; 2001:6f8:1db7::1/64; 2001:6f8:1c00:365::2/64; + 2a02:8109:9300:488::/64; 2a01:238:4225:6e00:8f8c:808a:7fb8:88df; }; @@ -158,18 +160,18 @@ zone "127.in-addr.arpa" IN { # }; #}; -zone "home.brehm-online.com" IN { - type slave; - file "sec/home.brehm-online.com.zone"; - masters { - 2a01:238:4225:6e00:8f8c:808a:7fb8:88df; - 2a01:238:4239:8a00:d4da:215d:3d01:f9b9; - //85.214.134.152; - }; - //allow-transfer { - // transfer_hosts; - //}; -}; +#zone "home.brehm-online.com" IN { +# type slave; +# file "sec/home.brehm-online.com.zone"; +# masters { +# 2a01:238:4225:6e00:8f8c:808a:7fb8:88df; +# 2a01:238:4239:8a00:d4da:215d:3d01:f9b9; +# //85.214.134.152; +# }; +# //allow-transfer { +# // transfer_hosts; +# //}; +#}; #zone "11.12.10.in-addr.arpa" IN { # type forward; @@ -181,18 +183,18 @@ zone "home.brehm-online.com" IN { # }; #}; -zone "11.12.10.in-addr.arpa" IN { - type slave; - file "sec/rev.10.12.11.zone"; - masters { - 2a01:238:4225:6e00:8f8c:808a:7fb8:88df; - 2a01:238:4239:8a00:d4da:215d:3d01:f9b9; - //85.214.134.152; - }; - //allow-transfer { - // transfer_hosts; - //}; -}; +#zone "11.12.10.in-addr.arpa" IN { +# type slave; +# file "sec/rev.10.12.11.zone"; +# masters { +# 2a01:238:4225:6e00:8f8c:808a:7fb8:88df; +# 2a01:238:4239:8a00:d4da:215d:3d01:f9b9; +# //85.214.134.152; +# }; +# //allow-transfer { +# // transfer_hosts; +# //}; +#}; /* * Briefly, a zone which has been declared delegation-only will be effectively diff --git a/conf.d/pydoc-3.2 b/conf.d/pydoc-3.2 deleted file mode 100644 index 75872335..00000000 --- a/conf.d/pydoc-3.2 +++ /dev/null @@ -1,7 +0,0 @@ -# /etc/init.d/pydoc.conf -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/files/pydoc.conf,v 1.3 2011/10/27 13:56:55 neurogeek Exp $ - -# This file contains the configuration for pydoc's internal webserver. - -# Default port for Python's pydoc server. -PYDOC3_2_PORT="7464" diff --git a/dbus-1/system.d/org.freedesktop.UPower.conf b/dbus-1/system.d/org.freedesktop.UPower.conf deleted file mode 100644 index fc2b604a..00000000 --- a/dbus-1/system.d/org.freedesktop.UPower.conf +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/fstab b/fstab index 98f3509d..0fad1c1a 100644 --- a/fstab +++ b/fstab @@ -42,7 +42,8 @@ shm /dev/shm tmpfs nodev,nosuid,noexec 0 0 /data/all/Dokumente/Doris /home/doris/Dokumente none bind 0 0 /data/all/Dokumente/Patrick /home/patrick/Dokumente none bind 0 0 -/dev/sde1 /mnt/usb_stick auto noauto,user 0 0 +/dev/sde1 /mnt/usb_stick1 auto noauto,user,uid=frank,gid=users 0 0 +/dev/sde2 /mnt/usb_stick2 auto noauto,user 0 0 https://webdav.hidrive.strato.com /mnt/hidrive davfs noauto,user,uid=frank,gid=users 0 0 diff --git a/init.d/pydoc-3.2 b/init.d/pydoc-3.2 deleted file mode 100755 index ad60fc09..00000000 --- a/init.d/pydoc-3.2 +++ /dev/null @@ -1,29 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2011 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public Licence v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/files/pydoc.init,v 1.4 2011/10/27 13:56:55 neurogeek Exp $ - -depend() { - need net -} - -start() { - local pydoc_port="${PYDOC3_2_PORT-${PYDOC_PORT}}" - - if [ -z "${pydoc_port}" ]; then - eerror "Port not set" - return 1 - fi - - ebegin "Starting pydoc server on port ${pydoc_port}" - start-stop-daemon --start --background --make-pidfile \ - --pidfile /var/run/pydoc3.2.pid \ - --exec /usr/bin/pydoc3.2 -- -p "${pydoc_port}" - eend $? -} - -stop() { - ebegin "Stopping pydoc server" - start-stop-daemon --stop --quiet --pidfile /var/run/pydoc3.2.pid - eend $? -} diff --git a/resolv.conf b/resolv.conf index c3bac086..7a104c01 100644 --- a/resolv.conf +++ b/resolv.conf @@ -1,4 +1,7 @@ -# Generated by net-scripts for interface eth0 -domain brehm-online.com -search home.brehm-online.com home.hennig-berlin.org brehm-online.com hennig-berlin.org uhu-banane.de -nameserver 10.12.11.254 +# Hand made by Frank Brehm +domain home.brehm-online.com +#search home.brehm-online.com brehm-online.com hennig-berlin.org uhu-banane.de pb.local dc1.pb.local dc2.pb.local +search home.brehm-online.com brehm-online.com uhu-banane.de pb.local dc1.de.profitbricks.net dc2.us.profitbricks.net dc3.de.profitbricks.net +#nameserver 10.12.11.1 +nameserver 192.168.178.30 +nameserver 192.168.178.89 -- 2.39.5