diff options
| author | Ben Howard <ben.howard@canonical.com> | 2013-08-20 09:58:30 -0600 |
|---|---|---|
| committer | Ben Howard <ben.howard@canonical.com> | 2013-08-20 09:58:30 -0600 |
| commit | 89d58c94d59c62dddea3f77b7a805c1afa2ca955 (patch) | |
| tree | 6b7cd86a373706730f0ec11f06517fc2a003f7c9 /doc | |
| parent | e683ab2baa3e67614edcd409122bd1aec99737e0 (diff) | |
| parent | b2ee0966793f3a9c7d8e92ce1c13b9583a9a76e7 (diff) | |
| download | vyos-cloud-init-89d58c94d59c62dddea3f77b7a805c1afa2ca955.tar.gz vyos-cloud-init-89d58c94d59c62dddea3f77b7a805c1afa2ca955.zip | |
Updated merge proposal with current tree
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/examples/cloud-config-TODO.txt | 20 | ||||
| -rw-r--r-- | doc/examples/cloud-config.txt | 3 |
2 files changed, 3 insertions, 20 deletions
diff --git a/doc/examples/cloud-config-TODO.txt b/doc/examples/cloud-config-TODO.txt deleted file mode 100644 index c7ed54ab..00000000 --- a/doc/examples/cloud-config-TODO.txt +++ /dev/null @@ -1,20 +0,0 @@ -# Add apt configuration files -# Add an apt.conf.d/ file with the relevant content -# -# See apt.conf man page for more information. -# -# Defaults: -# + filename: 00-boot-conf -# -apt_conf: - - # Creates an apt proxy configuration in /etc/apt/apt.conf.d/01-proxy - - filename: "01-proxy" - content: | - Acquire::http::Proxy "http://proxy.example.org:3142/ubuntu"; - - # Add the following line to /etc/apt/apt.conf.d/00-boot-conf - # (run debconf at a critical priority) - - content: | - DPkg::Pre-Install-Pkgs:: "/usr/sbin/dpkg-preconfigure --apt -p critical|| true"; - diff --git a/doc/examples/cloud-config.txt b/doc/examples/cloud-config.txt index 24b4b36c..bcfd7917 100644 --- a/doc/examples/cloud-config.txt +++ b/doc/examples/cloud-config.txt @@ -53,6 +53,9 @@ apt_mirror_search: apt_mirror_search_dns: False # apt_proxy (configure Acquire::HTTP::Proxy) +# 'apt_http_proxy' is an alias for 'apt_proxy'. +# Also, available are 'apt_ftp_proxy' and 'apt_https_proxy'. +# These affect Acquire::FTP::Proxy and Acquire::HTTPS::Proxy respectively apt_proxy: http://my.apt.proxy:3128 # apt_pipelining (configure Acquire::http::Pipeline-Depth) |