From: frank Date: Mon, 16 Jan 2012 15:59:20 +0000 (+0100) Subject: committing changes in /etc after emerge run X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=5ca6387de6c043bcbdd2305ab3abbd2432e25dca;p=config%2Fbruni%2Fetc.git committing changes in /etc after emerge run Package changes: +net-dns/avahi-0.6.30-r1 --- diff --git a/.etckeeper b/.etckeeper index 107a3df6..04061ade 100755 --- a/.etckeeper +++ b/.etckeeper @@ -113,6 +113,14 @@ maybe chmod 0640 './audit/audit.rules-2.1.3' maybe chmod 0640 './audit/audit.rules.stop.post' maybe chmod 0640 './audit/audit.rules.stop.pre' maybe chmod 0640 './audit/auditd.conf' +maybe chmod 0755 './avahi' +maybe chmod 0755 './avahi/avahi-autoipd.action' +maybe chmod 0644 './avahi/avahi-daemon.conf' +maybe chmod 0755 './avahi/avahi-dnsconfd.action' +maybe chmod 0644 './avahi/hosts' +maybe chmod 0755 './avahi/services' +maybe chmod 0644 './avahi/services/sftp-ssh.service' +maybe chmod 0644 './avahi/services/ssh.service' maybe chmod 0755 './bash' maybe chmod 0644 './bash/bash_logout' maybe chmod 0644 './bash/bashrc' @@ -292,6 +300,7 @@ maybe chmod 0755 './dbus-1/system.d' maybe chmod 0644 './dbus-1/system.d/.keep_sys-apps_dbus-0' maybe chmod 0644 './dbus-1/system.d/ConsoleKit.conf' maybe chmod 0644 './dbus-1/system.d/NetworkManager.conf' +maybe chmod 0644 './dbus-1/system.d/avahi-dbus.conf' maybe chmod 0644 './dbus-1/system.d/bluetooth.conf' maybe chmod 0444 './dbus-1/system.d/cups.conf' maybe chmod 0644 './dbus-1/system.d/nm-avahi-autoipd.conf' @@ -523,6 +532,8 @@ maybe chmod 0755 './init.d/NetworkManager' maybe chmod 0755 './init.d/aiccu' maybe chmod 0755 './init.d/apache2' maybe chmod 0755 './init.d/auditd' +maybe chmod 0755 './init.d/avahi-daemon' +maybe chmod 0755 './init.d/avahi-dnsconfd' maybe chmod 0755 './init.d/bluetooth' maybe chmod 0755 './init.d/bootmisc' maybe chmod 0755 './init.d/consolefont' diff --git a/avahi/avahi-autoipd.action b/avahi/avahi-autoipd.action new file mode 100755 index 00000000..c2db9942 --- /dev/null +++ b/avahi/avahi-autoipd.action @@ -0,0 +1,87 @@ +#!/bin/sh + +# This file is part of avahi. +# +# avahi is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# avahi is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public +# License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with avahi; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +set -e + +# Command line arguments: +# $1 event that happened: +# BIND: Successfully claimed address +# CONFLICT: An IP address conflict happened +# UNBIND: The IP address is no longer needed +# STOP: The daemon is terminating +# $2 interface name +# $3 IP adddress + +PATH="$PATH:/usr/bin:/usr/sbin:/bin:/sbin" + +# Use a different metric for each interface, so that we can set +# identical routes to multiple interfaces. + +METRIC=$((1000 + `cat "/sys/class/net/$2/ifindex" 2>/dev/null || echo 0`)) + +if [ -x /bin/ip -o -x /sbin/ip ] ; then + + # We have the Linux ip tool from the iproute package + + case "$1" in + BIND) + ip addr add "$3"/16 brd 169.254.255.255 label "$2:avahi" scope link dev "$2" + ip route add default dev "$2" metric "$METRIC" scope link ||: + ;; + + CONFLICT|UNBIND|STOP) + ip route del default dev "$2" metric "$METRIC" scope link ||: + ip addr del "$3"/16 brd 169.254.255.255 label "$2:avahi" scope link dev "$2" + ;; + + *) + echo "Unknown event $1" >&2 + exit 1 + ;; + esac + +elif [ -x /bin/ifconfig -o -x /sbin/ifconfig ] ; then + + # We have the old ifconfig tool + + case "$1" in + BIND) + ifconfig "$2:avahi" inet "$3" netmask 255.255.0.0 broadcast 169.254.255.255 up + route add default dev "$2:avahi" metric "$METRIC" ||: + ;; + + CONFLICT|STOP|UNBIND) + route del default dev "$2:avahi" metric "$METRIC" ||: + ifconfig "$2:avahi" down + ;; + + *) + echo "Unknown event $1" >&2 + exit 1 + ;; + esac + +else + + echo "No network configuration tool found." >&2 + exit 1 + +fi + +exit 0 diff --git a/avahi/avahi-daemon.conf b/avahi/avahi-daemon.conf new file mode 100644 index 00000000..a6286ad7 --- /dev/null +++ b/avahi/avahi-daemon.conf @@ -0,0 +1,68 @@ +# This file is part of avahi. +# +# avahi is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# avahi is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public +# License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with avahi; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +# See avahi-daemon.conf(5) for more information on this configuration +# file! + +[server] +#host-name=foo +#domain-name=local +browse-domains=0pointer.de, zeroconf.org +use-ipv4=yes +use-ipv6=yes +#allow-interfaces=eth0 +#deny-interfaces=eth1 +#check-response-ttl=no +#use-iff-running=no +#enable-dbus=yes +#disallow-other-stacks=no +#allow-point-to-point=no +#cache-entries-max=4096 +#clients-max=4096 +#objects-per-client-max=1024 +#entries-per-entry-group-max=32 +ratelimit-interval-usec=1000000 +ratelimit-burst=1000 + +[wide-area] +enable-wide-area=yes + +[publish] +#disable-publishing=no +#disable-user-service-publishing=no +#add-service-cookie=no +#publish-addresses=yes +#publish-hinfo=yes +#publish-workstation=yes +#publish-domain=yes +#publish-dns-servers=192.168.50.1, 192.168.50.2 +#publish-resolv-conf-dns-servers=yes +#publish-aaaa-on-ipv4=yes +#publish-a-on-ipv6=no + +[reflector] +#enable-reflector=no +#reflect-ipv=no + +[rlimits] +#rlimit-as= +rlimit-core=0 +rlimit-data=4194304 +rlimit-fsize=0 +rlimit-nofile=768 +rlimit-stack=4194304 +rlimit-nproc=3 diff --git a/avahi/avahi-dnsconfd.action b/avahi/avahi-dnsconfd.action new file mode 100755 index 00000000..f0ace51a --- /dev/null +++ b/avahi/avahi-dnsconfd.action @@ -0,0 +1,80 @@ +#!/bin/sh + +# This file is part of avahi. +# +# avahi is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# avahi is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public +# License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with avahi; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +set -e + +test "x$AVAHI_INTERFACE" != "x" + +# Command line arguments: +# $1 "+" if a new DNS server was found, "-" if one was removed +# $2 DNS Server address +# $3 interface index where this server was found on +# $4 protocol number where this server was found on + +# Available environment variables: +# +# $AVAHI_INTERFACE The interface name where this DNS server was found on +# $AVAHI_INTERFACE_DNS_SERVERS A whitespace seperated list of DNS servers on $AVAHI_INTERFACE +# $AVAHI_DNS_SERVERS The complete list of all DNS servers found on all interfaces + +if [ -x /sbin/netconfig ]; then + # SUSE method on 11.1+ + if [ -n "$AVAHI_INTERFACE_DNS_SERVERS" ]; then + /sbin/netconfig modify -s avahi -i "$AVAHI_INTERFACE" <<-EOF + INTERFACE='$AVAHI_INTERFACE' + DNSSERVERS='$AVAHI_INTERFACE_DNS_SERVERS' + EOF + else + /sbin/netconfig remove -s avahi -i "$AVAHI_INTERFACE" + fi +elif [ -x /sbin/modify_resolvconf ] ; then + # method for SUSE <= 11.0 + if [ -n "$AVAHI_DNS_SERVERS" ]; then + /sbin/modify_resolvconf modify -s avahi -t - -p avahi-dnsconfd -n "$AVAHI_DNS_SERVERS" <<-EOF + if you don't like avahi to update your Nameservers + disable the avahi-dnsconfd init script + EOF + else + /sbin/modify_resolvconf restore -s avahi + fi +elif [ -x /sbin/resolvconf ] ; then + + # We have Debian's resolvconf tool + + if [ "x$AVAHI_INTERFACE_DNS_SERVERS" = "x" ] ; then + /sbin/resolvconf -d "$AVAHI_INTERFACE.avahi" + else + for n in $AVAHI_INTERFACE_DNS_SERVERS ; do + echo "nameserver $n" + done | /sbin/resolvconf -a "$AVAHI_INTERFACE.avahi" + fi +else + + # No resolvconf tool available + + if [ "x$AVAHI_DNS_SERVERS" = "x" ] ; then + test -f /etc/resolv.conf.avahi && mv /etc/resolv.conf.avahi /etc/resolv.conf + else + test -f /etc/resolv.conf.avahi || mv /etc/resolv.conf /etc/resolv.conf.avahi + + for n in $AVAHI_DNS_SERVERS ; do + echo "nameserver $n" + done > /etc/resolv.conf + fi +fi diff --git a/avahi/hosts b/avahi/hosts new file mode 100644 index 00000000..4483340f --- /dev/null +++ b/avahi/hosts @@ -0,0 +1,27 @@ +# This file is part of avahi. +# +# avahi is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# avahi is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public +# License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with avahi; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +# This file contains static ip address <-> host name mappings. These +# can be useful to publish services on behalf of a non-avahi enabled +# device. Please bear in mind that host names are expected to be +# fully qualified domain names, i.e. ending in .local! + +# See avahi.hosts(5) for more information on this configuration file! + +# Examples: +# 192.168.0.1 router.local +# 2001::81:1 test.local diff --git a/avahi/services/sftp-ssh.service b/avahi/services/sftp-ssh.service new file mode 100644 index 00000000..dfae4f13 --- /dev/null +++ b/avahi/services/sftp-ssh.service @@ -0,0 +1,34 @@ + + + + + + + + + + %h + + + _sftp-ssh._tcp + 22 + + + diff --git a/avahi/services/ssh.service b/avahi/services/ssh.service new file mode 100644 index 00000000..c66e0c1e --- /dev/null +++ b/avahi/services/ssh.service @@ -0,0 +1,34 @@ + + + + + + + + + + %h + + + _ssh._tcp + 22 + + + diff --git a/dbus-1/system.d/avahi-dbus.conf b/dbus-1/system.d/avahi-dbus.conf new file mode 100644 index 00000000..44b1a670 --- /dev/null +++ b/dbus-1/system.d/avahi-dbus.conf @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/group b/group index cfbf86e7..9cd8e98c 100644 --- a/group +++ b/group @@ -41,3 +41,6 @@ plugdev:x:105: pulse-access:x:104: pulse:x:103: apache:x:81: +netdev:x:102: +avahi:x:101: +avahi-autoipd:x:999: diff --git a/group- b/group- index 78f68962..92ff67f8 100644 --- a/group- +++ b/group- @@ -40,3 +40,6 @@ mysql:x:60: plugdev:x:105: pulse-access:x:104: pulse:x:103: +apache:x:81: +netdev:x:102: +avahi:x:101: diff --git a/gshadow b/gshadow index 6cd18ade..482496de 100644 --- a/gshadow +++ b/gshadow @@ -41,3 +41,6 @@ plugdev:!:: pulse-access:!:: pulse:!:: apache:!:: +netdev:!:: +avahi:!:: +avahi-autoipd:!:: diff --git a/gshadow- b/gshadow- index cb48fc61..f58eab60 100644 --- a/gshadow- +++ b/gshadow- @@ -40,3 +40,6 @@ mysql:!:: plugdev:!:: pulse-access:!:: pulse:!:: +apache:!:: +netdev:!:: +avahi:!:: diff --git a/init.d/avahi-daemon b/init.d/avahi-daemon new file mode 100755 index 00000000..257116e9 --- /dev/null +++ b/init.d/avahi-daemon @@ -0,0 +1,29 @@ +#!/sbin/runscript +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +extra_started_commands="reload" + +depend() { + before netmount nfsmount + use net + need dbus +} + +start() { + ebegin "Starting avahi-daemon" + /usr/sbin/avahi-daemon -D + eend $? +} + +stop() { + ebegin "Stopping avahi-daemon" + /usr/sbin/avahi-daemon -k + eend $? +} + +reload() { + ebegin "Reloading avahi-daemon" + /usr/sbin/avahi-daemon -r + eend $? +} diff --git a/init.d/avahi-dnsconfd b/init.d/avahi-dnsconfd new file mode 100755 index 00000000..daf36c8b --- /dev/null +++ b/init.d/avahi-dnsconfd @@ -0,0 +1,28 @@ +#!/sbin/runscript +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +extra_started_commands="reload" + +depend() { + need avahi-daemon + use net +} + +start() { + ebegin "Starting avahi-dnsconfd" + /usr/sbin/avahi-dnsconfd -D + eend $? +} + +stop() { + ebegin "Stopping avahi-dnsconfd" + /usr/sbin/avahi-dnsconfd -k + eend $? +} + +reload() { + ebegin "Reloading avahi-dnsconfd" + /usr/sbin/avahi-dnsconfd -r + eend $? +} diff --git a/passwd b/passwd index 2af42719..63e2df0b 100644 --- a/passwd +++ b/passwd @@ -23,3 +23,5 @@ ldap:x:439:439:added by portage for openldap:/usr/lib64/openldap:/sbin/nologin mysql:x:60:60:added by portage for mysql:/dev/null:/sbin/nologin pulse:x:102:103:added by portage for pulseaudio:/var/run/pulse:/sbin/nologin apache:x:81:81:added by portage for apache:/var/www:/sbin/nologin +avahi:x:103:101:added by portage for avahi:/dev/null:/sbin/nologin +avahi-autoipd:x:104:999:added by portage for avahi:/dev/null:/sbin/nologin diff --git a/passwd- b/passwd- index 291577b1..b4af3c66 100644 --- a/passwd- +++ b/passwd- @@ -22,3 +22,5 @@ messagebus:x:101:122:added by portage for dbus:/dev/null:/sbin/nologin ldap:x:439:439:added by portage for openldap:/usr/lib64/openldap:/sbin/nologin mysql:x:60:60:added by portage for mysql:/dev/null:/sbin/nologin pulse:x:102:103:added by portage for pulseaudio:/var/run/pulse:/sbin/nologin +apache:x:81:81:added by portage for apache:/var/www:/sbin/nologin +avahi:x:103:101:added by portage for avahi:/dev/null:/sbin/nologin diff --git a/shadow b/shadow index 3a6bc889..caa170fa 100644 --- a/shadow +++ b/shadow @@ -22,3 +22,5 @@ ldap:!:15354:::::: mysql:!:15355:::::: pulse:!:15355:::::: apache:!:15355:::::: +avahi:!:15355:::::: +avahi-autoipd:!:15355:::::: diff --git a/shadow- b/shadow- index 76240bcc..a21ad202 100644 --- a/shadow- +++ b/shadow- @@ -21,3 +21,5 @@ messagebus:!:15354:::::: ldap:!:15354:::::: mysql:!:15355:::::: pulse:!:15355:::::: +apache:!:15355:::::: +avahi:!:15355::::::