From 3b798b5d5c3caa5d0e8e534855e29010ca932aaa Mon Sep 17 00:00:00 2001 From: Barry Warsaw Date: Thu, 22 Jan 2015 21:21:04 -0500 Subject: Low hanging Python 3 fruit. --- templates/resolv.conf.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates') diff --git a/templates/resolv.conf.tmpl b/templates/resolv.conf.tmpl index 1300156c..bfae80db 100644 --- a/templates/resolv.conf.tmpl +++ b/templates/resolv.conf.tmpl @@ -24,7 +24,7 @@ sortlist {% for sort in sortlist %}{{sort}} {% endfor %} {% if options or flags %} options {% for flag in flags %}{{flag}} {% endfor %} -{% for key, value in options.iteritems() -%} +{% for key, value in options.items() -%} {{key}}:{{value}} {% endfor %} {% endif %} -- cgit v1.2.3 From e567bc7bf9437e2b85148b1f36be6e89f3e17ca2 Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Mon, 2 Nov 2015 08:16:23 -0700 Subject: Enable backports source pockets for Ubuntu archives (LP: #1177432). --- templates/sources.list.ubuntu.tmpl | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'templates') diff --git a/templates/sources.list.ubuntu.tmpl b/templates/sources.list.ubuntu.tmpl index 4b1b019a..28d5a4d0 100644 --- a/templates/sources.list.ubuntu.tmpl +++ b/templates/sources.list.ubuntu.tmpl @@ -35,15 +35,22 @@ deb-src {{mirror}} {{codename}}-updates universe # deb {{mirror}} {{codename}}-updates multiverse # deb-src {{mirror}} {{codename}}-updates multiverse -## Uncomment the following two lines to add software from the 'backports' -## repository. ## N.B. software from this repository may not have been tested as ## extensively as that contained in the main release, although it includes ## newer versions of some applications which may provide useful features. ## Also, please note that software in backports WILL NOT receive any review ## or updates from the Ubuntu security team. -# deb {{mirror}} {{codename}}-backports main restricted universe multiverse -# deb-src {{mirror}} {{codename}}-backports main restricted universe multiverse +deb {{mirror}} {{codename}}-backports main +deb-src {{mirror}} {{codename}}-backports universe +deb {{mirror}} {{codename}}-backports universe +deb-src {{mirror}} {{codename}}-backports main universe + +## Uncomment the following two to add software from the 'backports' +## multiverse and restricted repositories. +# deb {{mirror}} {{codename}}-backports multiverse +# deb-src {{mirror}} {{codename}}-backports multiverse +# deb {{mirror}} {{codename}}-backports restricted +# deb-src {{mirror}} {{codename}}-backports restricted ## Uncomment the following two lines to add software from Canonical's ## 'partner' repository. -- cgit v1.2.3 From 7abe33a70e9fc369e1f90b5593e8cef891ca2122 Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Mon, 2 Nov 2015 08:41:03 -0700 Subject: Fixed per MP review --- templates/sources.list.ubuntu.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/sources.list.ubuntu.tmpl b/templates/sources.list.ubuntu.tmpl index 28d5a4d0..3fec51d3 100644 --- a/templates/sources.list.ubuntu.tmpl +++ b/templates/sources.list.ubuntu.tmpl @@ -41,9 +41,9 @@ deb-src {{mirror}} {{codename}}-updates universe ## Also, please note that software in backports WILL NOT receive any review ## or updates from the Ubuntu security team. deb {{mirror}} {{codename}}-backports main -deb-src {{mirror}} {{codename}}-backports universe +deb-src {{mirror}} {{codename}}-backports main deb {{mirror}} {{codename}}-backports universe -deb-src {{mirror}} {{codename}}-backports main universe +deb-src {{mirror}} {{codename}}-backports universe ## Uncomment the following two to add software from the 'backports' ## multiverse and restricted repositories. -- cgit v1.2.3 From ee2e4800d6519f7022f5f1d9f38820395b005be2 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Tue, 3 Nov 2015 20:48:19 -0500 Subject: Ubuntu templates: make sources.list consistent with ISO installs. This modifies a designed decision to have trimmer sources.list than one would find on a server iso install. Specifically, here we now enable: restricted and multiverse and backports. LP: #1177432 --- ChangeLog | 2 ++ templates/sources.list.ubuntu.tmpl | 43 +++++++++++++++----------------------- 2 files changed, 19 insertions(+), 26 deletions(-) (limited to 'templates') diff --git a/ChangeLog b/ChangeLog index 5fbfaccc..ea25cb69 100644 --- a/ChangeLog +++ b/ChangeLog @@ -65,6 +65,8 @@ - ubuntu fan: support for config and installing of ubuntu fan (LP: #1504604) - Azure: support extracting SSH key values from ovf-env.xml (LP: #1506244) - AltCloud: fix call to udevadm settle (LP: #1507526) + - Ubuntu templates: modify sources.list template to provide same sources + as install from server or desktop ISO. (LP: #1177432) 0.7.6: - open 0.7.6 - Enable vendordata on CloudSigma datasource (LP: #1303986) diff --git a/templates/sources.list.ubuntu.tmpl b/templates/sources.list.ubuntu.tmpl index 3fec51d3..59ae089b 100644 --- a/templates/sources.list.ubuntu.tmpl +++ b/templates/sources.list.ubuntu.tmpl @@ -9,13 +9,13 @@ # See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to # newer versions of the distribution. -deb {{mirror}} {{codename}} main -deb-src {{mirror}} {{codename}} main +deb {{mirror}} {{codename}} main restricted +deb-src {{mirror}} {{codename}} main restricted ## Major bug fix updates produced after the final release of the ## distribution. -deb {{mirror}} {{codename}}-updates main -deb-src {{mirror}} {{codename}}-updates main +deb {{mirror}} {{codename}}-updates main restricted +deb-src {{mirror}} {{codename}}-updates main restricted ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu ## team. Also, please note that software in universe WILL NOT receive any @@ -26,31 +26,29 @@ deb {{mirror}} {{codename}}-updates universe deb-src {{mirror}} {{codename}}-updates universe ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu -## team, and may not be under a free licence. Please satisfy yourself as to +## team, and may not be under a free licence. Please satisfy yourself as to ## your rights to use the software. Also, please note that software in ## multiverse WILL NOT receive any review or updates from the Ubuntu ## security team. -# deb {{mirror}} {{codename}} multiverse -# deb-src {{mirror}} {{codename}} multiverse -# deb {{mirror}} {{codename}}-updates multiverse -# deb-src {{mirror}} {{codename}}-updates multiverse +deb {{mirror}} {{codename}} multiverse +deb-src {{mirror}} {{codename}} multiverse +deb {{mirror}} {{codename}}-updates multiverse +deb-src {{mirror}} {{codename}}-updates multiverse ## N.B. software from this repository may not have been tested as ## extensively as that contained in the main release, although it includes ## newer versions of some applications which may provide useful features. ## Also, please note that software in backports WILL NOT receive any review ## or updates from the Ubuntu security team. -deb {{mirror}} {{codename}}-backports main -deb-src {{mirror}} {{codename}}-backports main -deb {{mirror}} {{codename}}-backports universe -deb-src {{mirror}} {{codename}}-backports universe +#deb {{mirror}} {{codename}}-backports main restricted universe multiverse +#deb-src {{mirror}} {{codename}}-backports main restricted universe multiverse -## Uncomment the following two to add software from the 'backports' -## multiverse and restricted repositories. -# deb {{mirror}} {{codename}}-backports multiverse -# deb-src {{mirror}} {{codename}}-backports multiverse -# deb {{mirror}} {{codename}}-backports restricted -# deb-src {{mirror}} {{codename}}-backports restricted +deb {{security}} {{codename}}-security main restricted +deb-src {{security}} {{codename}}-security main restricted +deb {{security}} {{codename}}-security universe +deb-src {{security}} {{codename}}-security universe +deb {{security}} {{codename}}-security multiverse +deb-src {{security}} {{codename}}-security multiverse ## Uncomment the following two lines to add software from Canonical's ## 'partner' repository. @@ -58,10 +56,3 @@ deb-src {{mirror}} {{codename}}-backports universe ## respective vendors as a service to Ubuntu users. # deb http://archive.canonical.com/ubuntu {{codename}} partner # deb-src http://archive.canonical.com/ubuntu {{codename}} partner - -deb {{security}} {{codename}}-security main -deb-src {{security}} {{codename}}-security main -deb {{security}} {{codename}}-security universe -deb-src {{security}} {{codename}}-security universe -# deb {{security}} {{codename}}-security multiverse -# deb-src {{security}} {{codename}}-security multiverse -- cgit v1.2.3 From 74fe2d2c661d70e5ec93ebde036d927c0f9ed15c Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Thu, 5 Nov 2015 11:34:40 -0500 Subject: ubuntu templates: enable backports Previous commit intended to enable backports, but failed to do so. --- templates/sources.list.ubuntu.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/sources.list.ubuntu.tmpl b/templates/sources.list.ubuntu.tmpl index 59ae089b..d8799726 100644 --- a/templates/sources.list.ubuntu.tmpl +++ b/templates/sources.list.ubuntu.tmpl @@ -40,8 +40,8 @@ deb-src {{mirror}} {{codename}}-updates multiverse ## newer versions of some applications which may provide useful features. ## Also, please note that software in backports WILL NOT receive any review ## or updates from the Ubuntu security team. -#deb {{mirror}} {{codename}}-backports main restricted universe multiverse -#deb-src {{mirror}} {{codename}}-backports main restricted universe multiverse +deb {{mirror}} {{codename}}-backports main restricted universe multiverse +deb-src {{mirror}} {{codename}}-backports main restricted universe multiverse deb {{security}} {{codename}}-security main restricted deb-src {{security}} {{codename}}-security main restricted -- cgit v1.2.3