diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-05-26 14:29:46 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-05-26 14:29:46 -0300 |
| commit | 869db00cde98be60850f1c61297756635b90fee1 (patch) | |
| tree | 77b5eb78813dbf5f66c42fb114e2b513e7b9e950 /templates | |
| parent | 61fac2f15df901b5a213352024dd63e67f18ab18 (diff) | |
| parent | 358d963f259d3f409bd0dd6433718a673083533c (diff) | |
| download | puppet-apt-869db00cde98be60850f1c61297756635b90fee1.tar.gz puppet-apt-869db00cde98be60850f1c61297756635b90fee1.tar.bz2 | |
Merge branch 'nadir'
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/Debian/sources.list.erb | 2 | ||||
| l--------- | templates/Ubuntu/preferences_quantal.erb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/templates/Debian/sources.list.erb b/templates/Debian/sources.list.erb index 49cf38c..2aac837 100644 --- a/templates/Debian/sources.list.erb +++ b/templates/Debian/sources.list.erb @@ -10,7 +10,7 @@ deb-src <%= debian_url %> <%= codename %> <%= lrepos %> <% end -%> # security -<% if ((release=scope.lookupvar('apt::release')) == "unstable" || release == "experimental") -%> +<% if ((release=scope.lookupvar('apt::release')) == "unstable" || release == "experimental" || codename == "lenny" ) -%> # There is no security support for <%= release %> <% else -%> deb <%= security_url=scope.lookupvar('apt::security_url') %> <%= codename %>/updates <%= lrepos %> diff --git a/templates/Ubuntu/preferences_quantal.erb b/templates/Ubuntu/preferences_quantal.erb new file mode 120000 index 0000000..3debe4f --- /dev/null +++ b/templates/Ubuntu/preferences_quantal.erb @@ -0,0 +1 @@ +preferences_maverick.erb
\ No newline at end of file |