From 30589bb58030a32e9197b7b167254a1b89af4c56 Mon Sep 17 00:00:00 2001 From: David Wragg Date: Thu, 24 Sep 2015 14:40:20 +0100 Subject: [PATCH 1/2] Mention the mailing list --- README.md | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 1cbb7e50..fc5094ed 100644 --- a/README.md +++ b/README.md @@ -151,12 +151,16 @@ to each other. ## Contact Us -Found a bug, want to suggest a feature, or have a question? -[File an issue](https://github.com/weaveworks/weave/issues), or email -help@weave.works. When reporting a bug, please include which version of -weave you are running, as shown by `weave version`. +Found a bug, want to suggest a feature, or have a question? You can +[File an issue](https://github.com/weaveworks/weave/issues). And +there is a [Weave Users Google +Group](https://groups.google.com/a/weave.works/forum/#!forum/weave-users), +which you can post to by email at weave-users@weave.works. Or you can +contact Weaveworks directly at help@weave.works. When reporting a +bug, please include which version of weave you are running, as shown +by `weave version`. -Follow weave on Twitter: +Follow on Twitter: [@weaveworks](https://twitter.com/weaveworks). Read the Weave blog: From 3a79be74263bee4dd18d0d948e844b4aa5f48b6d Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Fri, 18 Sep 2015 13:03:11 +0100 Subject: [PATCH 2/2] Add smoke-test for subdomains --- test/225_dns_subdomain_test.sh | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100755 test/225_dns_subdomain_test.sh diff --git a/test/225_dns_subdomain_test.sh b/test/225_dns_subdomain_test.sh new file mode 100755 index 00000000..58d2716f --- /dev/null +++ b/test/225_dns_subdomain_test.sh @@ -0,0 +1,25 @@ +#! /bin/bash + +. ./config.sh + +C1=10.2.54.34 +C2=10.2.54.91 +C3=10.2.54.92 +DOMAIN=foo.bar +SUBDOMAIN1=sub1.$DOMAIN +SUBDOMAIN2=sub2.$DOMAIN + +start_suite "Resolve names in custom domain with subdomains" + +weave_on $HOST1 launch --log-level=debug --dns-domain $DOMAIN. + +start_container_with_dns $HOST1 $C1/24 --name=c1 -h foo.$SUBDOMAIN1 +start_container_with_dns $HOST1 $C2/24 --name=c2 -h foo.$SUBDOMAIN2 +start_container_with_dns $HOST1 $C3/24 --name=c3 -h tre.$SUBDOMAIN1 --dns-search=$SUBDOMAIN2 + +assert_dns_record $HOST1 c1 foo.$SUBDOMAIN2 $C2 +assert_dns_a_record $HOST1 c3 foo $C2 foo.$SUBDOMAIN2 +assert_dns_record $HOST1 c2 foo.$SUBDOMAIN1 $C1 +assert_dns_a_record $HOST1 c1 tre $C3 tre.$SUBDOMAIN1 + +end_suite