Default WEBPROXY setting is null

We always have an install server close by.

Signed-off-by: Martin Schwenke <martin@meltin.net>

diff --git a/README b/README
index 1a59fd25611e5c8b8d040c85256204ae358a47c4..548dbf1929e92be10f5461e3713964b704fb2d89 100644 (file)
--- a/README
+++ b/README
@@ -193,12 +193,18 @@ clusters generated by autocluster.
 
     in your environment so that virsh does KVM/QEMU things by default.
 
- 2) You need a caching web proxy on your local network. If you don't
-    have one, then install a squid proxy on your host. See
-    host_setup/etc/squid/squid.conf for a sample config suitable for a
-    virtual cluster. Make sure it caches large objects and has plenty
-    of space. This will be needed to make downloading all the RPMs to
-    each client sane
+ 2) If your install server is far away then you may need a caching web
+    proxy on your local network.
+
+    If you don't have one, then you can install a squid proxy on your
+    host amd set:
+
+      WEBPROXY="http://10.0.0.1:3128/"
+
+    See host_setup/etc/squid/squid.conf for a sample config suitable
+    for a virtual cluster. Make sure it caches large objects and has
+    plenty of space. This will be needed to make downloading all the
+    RPMs to each client sane
 
     To test your squid setup, run a command like this:
 

diff --git a/config.d/00base.defconf b/config.d/00base.defconf
index 87dd695931e36d7efccfcdbfe5949707679920d3..52232a866d40c7be921912b070296578871fecfd 100644 (file)
--- a/config.d/00base.defconf
+++ b/config.d/00base.defconf
@@ -268,7 +268,7 @@ defconf PUBLIC_ADDRESSES "|make_public_addresses" \
 # several G of cache You can choose to have no web proxy at all, in
 # which case set it to the empty string, and hope you have a fast
 # network connection to the install server
-defconf WEBPROXY "http://10.0.0.1:3128/" \
+defconf WEBPROXY "" \
        "<url>" "URL of a caching web proxy"
 
 defconf GATEWAY "10.0.0.1" \