diff options
| author | mh <mh@immerda.ch> | 2010-10-21 01:59:41 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2010-10-21 01:59:41 +0200 |
| commit | e2ac1b3d8d1713c81c83a695b776dec1c00d2d47 (patch) | |
| tree | 5ff6553207f4b118562a3be76fc4f7d08638db04 /templates | |
| parent | e19c94dcd20c966143c933e22d5a63f350649b6e (diff) | |
| parent | 4dbcd092817708292de6463777b331c8dbc7e727 (diff) | |
| download | puppet-apt-e2ac1b3d8d1713c81c83a695b776dec1c00d2d47.tar.gz puppet-apt-e2ac1b3d8d1713c81c83a695b776dec1c00d2d47.tar.bz2 | |
Merge remote branch 'lelutin/master'
Integrate no custom preference into our new
way to manage the preferences.
Conflicts:
README
manifests/default_preferences.pp
manifests/init.pp
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/sources.list.backports.erb | 8 | ||||
| -rw-r--r-- | templates/sources.list.erb | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/templates/sources.list.backports.erb b/templates/sources.list.backports.erb new file mode 100644 index 0000000..b271ca7 --- /dev/null +++ b/templates/sources.list.backports.erb @@ -0,0 +1,8 @@ +# This file is brought to you by puppet + +# backports +<% if (lsbdistcodename == "sid" || lsbdistcodename == "unstable") -%> +# There are no backports for for <%= lsbdistcodename %> +<% else -%> +deb http://backports.debian.org/debian-backports/ <%= lsbdistcodename %>-backports main +<% end -%> diff --git a/templates/sources.list.erb b/templates/sources.list.erb index 169d7b5..feb5603 100644 --- a/templates/sources.list.erb +++ b/templates/sources.list.erb @@ -9,9 +9,3 @@ deb http://ftp.debian.org/debian/ <%= lsbdistcodename %> main contrib non-free deb http://security.debian.org/ <%= lsbdistcodename %>/updates main contrib non-free <% end -%> -# backports -<% if (lsbdistcodename == "sid" || lsbdistcodename == "unstable") -%> -# There are no backports for for <%= lsbdistcodename %> -<% else -%> -deb http://www.backports.org/debian/ <%= lsbdistcodename %>-backports main -<% end -%> |