# don't destroy, just shuffle.
\mv -f "$domain_file" "/tmp/$(basename ${domain_file})-old-${RANDOM}"
test_or_die "removing domain file: $domain_file"
+ else
+ echo "Did not see a domain file to remove: $domain_file"
fi
}
fi
# see if subdomain already present in config.
- if [ ! $(grep -q "$old_domain" "$domain_file") ]; then
+ if ! grep -q "$old_domain" "$domain_file"; then
echo "The subdomain $subdomain is already missing from the domain"
echo "configuration file: $domain_file"
echo "Our work is apparently done for removing it."
return 0
fi
- create_chomped_copy_of_file "$domain_file" \
- "${subdomain}.*${containing_domain} *IN *A *${IP_ADDRESS}" 1
+ create_chomped_copy_of_file "$domain_file" "${old_domain}" 2
}
# adds a new subdomain under a containing domain.
fi
# see if subdomain already present in config.
- if [ $(grep -q "$new_domain" "$domain_file") ]; then
+ if grep -q "$new_domain" "$domain_file"; then
echo "The subdomain $subdomain already seems to exist in the domain"
echo "configuration file: $domain_file"
- echo "Please edit the config file to remove the subdomain before trying"
- echo "to re-add the subdomain."
- exit 1
+ echo "We are considering our work done; if you want to modify the subdomain,"
+ echo "then please call remove_domain on it first."
+ return 0
fi
# append the new subdomain into the config file.
- echo "
-${subdomain}.${containing_domain}. IN A ${IP_ADDRESS}
+ echo "${subdomain}.${containing_domain}. IN A ${IP_ADDRESS}
IN HINFO \"linux server\" \"${DISTRO}\"
" >> /etc/bind/${containing_domain}.conf