INTERFACE=dummy0
# The netmask for the address
NETMASK=24
-HOSTS_VSERVER=dns
-# The hosts file to which an entry for the new vserver should be added. Can be
-# left empty to not record the new vserver anywhere.
-HOSTS_FILE=$VSERVERS_CONF/$HOSTS_VSERVER/vdir/etc/hosts
+# The DNS vserver gets a new entry in its /etc/hosts
+DNS_VSERVER=dns
function usage()
{
return 1
}
+if [ "`id -u`" -eq 0 ]; then
+ echo "$0 should not be run as root, it will use sudo where appropriate"
+ exit 1
+fi
+
# Check arguments
if [ ! "$#" -eq 1 ]; then
usage
exit 1
fi
-HOST="$NAME/`hostname --fqdn`"
+HOST="$NAME.`hostname --fqdn`"
# Set the IP var
if ! find_ip; then
(cd /; git add $CONF_FOR_GIT)
(cd /; git commit $CONF_FOR_GIT --edit --message "vserver: Add $NAME vserver configuration.")
-if [ -n "$HOSTS_FILE" ]; then
- sudo sh -c "echo '$IP $NAME' >> '$HOSTS_FILE'"
-fi
+# Add this new vserver to the hosts file in the dns vserver and in the host
+for file in /etc/hosts "$VSERVERS_CONF/$DNS_VSERVER/vdir/etc/hosts"; do
+ sudo sh -c "echo '$IP $NAME' >> '$file'"
+done
+
+# Restart dnsmasq in the dns vserver
+sudo vserver $DNS_VSERVER exec /usr/bin/killall -HUP dnsmasq"