remove docs from ssh-dynds script, move them to readme

diff --git a/README.rst b/README.rst
index 9956dd3ac9238de820ecff86a765d8b03a53f2b9..55947a979c25a439599335afc0d257fbfb273dce 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -37,6 +37,7 @@ Setup
     $ su - dyndns -s /bin/bash
     $ touch ~/.hushlogin
 
+   Alternatively, you may commend out the "motd" lines in ``/etc/pam.d/sshd``
 5. Configure ssh-dyndns as root::
 
     $ cp /usr/local/src/ssh-dyndns/ssh-dyndns.sh.config-dist /etc/ssh-dyndns.sh

diff --git a/ssh-dyndns b/ssh-dyndns
index 2df534f446fe9e71956b94edf191e3142cd31d6a..903e859ad8be693e568bbf04fcc837e01164971d 100755 (executable)
--- a/ssh-dyndns
+++ b/ssh-dyndns
@@ -1,17 +1,10 @@
 #!/bin/sh
-#dyndns via ssh login + djbdns/dbndns
+# dyndns via ssh login + tinydns (djbdns/dbndns)
 #
-#usage:
+# usage:
 # $ ssh [email protected] home.example.org
 #
-#user setup:
-# $ useradd -g nogroup -m -N -s /usr/local/bin/ssh-dyndns dyndns
-# .. add ssh key to user
-#do not show login messages:
-# $ su - dyndns -s /bin/bash
-# $ touch ~/.hushlogin
-# alternatively, comment out the motd lines in /etc/pam.d/sshd
-#
+# @author Christian Weiske <[email protected]>
 
 if [ -z "$SSH_CONNECTION" ]; then
    echo "no ssh connection"
@@ -31,10 +24,10 @@ fi
 domain="$2"
 
 #load config files
-if [ -x ~/.config/ssh-dyndns.sh ]; then
+if [ -f ~/.config/ssh-dyndns.sh ]; then
     . ~/.config/ssh-dyndns.sh
 fi
-if [ -x /etc/ssh-dyndns.sh ]; then
+if [ -f /etc/ssh-dyndns.sh ]; then
     . /etc/ssh-dyndns.sh
 fi
 

diff --git a/ssh-dyndns.sh.config-dist b/ssh-dyndns.sh.config-dist
index e60ef378cc85fd7695904fb0435d08378f8d96e3..7dd3fa818d4ac4309a04658fcfc57d26b6aa3194 100644 (file)
--- a/ssh-dyndns.sh.config-dist
+++ b/ssh-dyndns.sh.config-dist
@@ -1,8 +1,8 @@
 #!/bin/sh
-#ssh-dyndns configuration file.
-#possible locations:
-# /etc/ssh-dyndns.sh
-# ~/.config/ssh-dyndns.sh
+# ssh-dyndns configuration file.
+# possible locations:
+# - /etc/ssh-dyndns.sh
+# - ~/.config/ssh-dyndns.sh
 
 data_dir=/tmp/
 file_pattern=data-dyndns-%DOMAIN%