diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | etc/debian-edu/itzks.config | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index a287731..058880d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +itzks-systems (2012.08.09.4) UNRELEASED; urgency=low + + * etc/debian-edu/itzks.conf: + + use ,,hostname -s'' instead of ,,uname -n''. + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 09 Aug 2012 21:59:29 +0200 + itzks-systems (2012.08.09.3) squeeze-backports; urgency=low * /debian/control: diff --git a/etc/debian-edu/itzks.config b/etc/debian-edu/itzks.config index cb22807..5d2c6ce 100644 --- a/etc/debian-edu/itzks.config +++ b/etc/debian-edu/itzks.config @@ -24,7 +24,7 @@ NETLOGONSERVER="tjener" ### internet settings ### -HOSTNAME=`hostname` +HOSTNAME=`hostname -s` DOMAIN=`hostname -d` ### @@ -117,7 +117,7 @@ function cron_header () { function check_host () { - HOST=`uname -n` + HOST=`hostname -s` ALLOWED_HOSTS="$1" if ! echo $ALLOWED_HOSTS | grep $HOST >/dev/null; then echo -e "\nITZkS script "`basename $0`" is not for: $HOST.$DOMAIN\nPossible hosts are: $ALLOWED_HOSTS\n" @@ -128,7 +128,7 @@ function check_host () { function abort_on_host () { - HOST=`uname -n` + HOST=`hostname -s` FORBIDDEN_HOSTS="$1" if echo $FORBIDDEN_HOSTS | grep $HOST >/dev/null; then echo -e "\nITZkS script "`basename $0`" is forbidden on: $HOST.$DOMAIN\n" |