diff options
| author | Gabriel Filion <lelutin@gmail.com> | 2010-10-17 20:35:35 -0400 |
|---|---|---|
| committer | Gabriel Filion <lelutin@gmail.com> | 2010-10-17 20:35:35 -0400 |
| commit | 296593bcbd7d5cc329737830bb938f93abf3fa3d (patch) | |
| tree | 70b00c8221b111767723952fd382c63257de4920 /templates | |
| parent | 521ccfec19d40fa5d78162727afa26c15778c173 (diff) | |
| parent | 356ff9334078198fde39fe5c8e8212109d6537a0 (diff) | |
Merge remote branch 'riseup/master'
Conflicts:
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 -%> |