diff --git a/config.yaml.sample b/config.yaml.sample index 2804cf9..3760ddf 100644 --- a/config.yaml.sample +++ b/config.yaml.sample @@ -9,8 +9,8 @@ network_type: gre netmask_internal: 255.255.0.0 proxy: address: 'http://proxy.company.site:3128' - install: true - use: true + install: false + use: false storage_backend: nfs address: controller: 10.100.50.10 diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst index d8198ed..ef201cd 100644 --- a/doc/source/configuration.rst +++ b/doc/source/configuration.rst @@ -125,21 +125,28 @@ configures a HTTP proxy to be used by ``yum``. $ vagrant plugin install vagrant-proxyconf -When the plugin is installed caching/proxying is enabled by default and the -HTTP proxy `Squid `__ will be installed on the -controller node. +When the plugin is installed caching/proxying is not enabled by default. To +enable caching/proxying set ``use`` to ``true``. + +``address`` has to point to an existing HTTP proxy server (e.g. +``http://proxy.company.site:3128``). :: proxy: use: true + install: false address: 'http://proxy.company.site:3128' + +To install the HTTP proxy `Squid `__ on the +controller node set ``install`` to ``true``. + +To use the local proxy set ``use`` to ``true``. ``address`` has not to +be set when installing Squid on the controller node. ``address`` will be +overwritten when installing Squid as local HTTP proxy. + +:: + + proxy: install: true - -To explicitly disable caching/proxying when ``vagrant-proxyconf`` is installed -set ``use`` to ``false``. - -To skip the installation of Squid on the controller node set ``install`` -to ``false``. ``address`` has to point to an existing HTTP proxy server (e.g. -``http://proxy.company.site:3128``) when Squid is not installed. ``address`` -has not to be set when installing Squid on the controller node. + use: true