diff options
| author | Gabriel Filion <gabster@lelutin.ca> | 2015-10-03 01:18:07 -0400 |
|---|---|---|
| committer | Gabriel Filion <gabster@lelutin.ca> | 2016-06-27 15:41:19 +0200 |
| commit | 0752201ce40e7bf4a9acdf642b455e1d97e8789f (patch) | |
| tree | 2e0f8a3c87ee60707d0363cbdcf66eb823c4082d /templates | |
| parent | 770f8fb5dafa442bc018fa95fcab2fb60d817020 (diff) | |
push logic behind apt::repos back in apt::params
The logic in specifying the default value for apt::repos is in the wrong
place: it should be in apt::params since this is exactly what this
latter class is for.
There's no special case that can involve making default the value follow
the value of another parameter so there's no point in having that logic
in the main class.
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/Debian/sources.list.erb | 2 | ||||
| -rw-r--r-- | templates/Ubuntu/sources.list.erb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/templates/Debian/sources.list.erb b/templates/Debian/sources.list.erb index 44eea53..c7318a2 100644 --- a/templates/Debian/sources.list.erb +++ b/templates/Debian/sources.list.erb @@ -4,7 +4,7 @@ ### Debian current: <%= codename=scope.lookupvar('::debian_codename') %> # basic -deb <%= debian_url=scope.lookupvar('apt::debian_url') %> <%= codename %> <%= lrepos=scope.lookupvar('apt::real_repos') %> +deb <%= debian_url=scope.lookupvar('apt::debian_url') %> <%= codename %> <%= lrepos=scope.lookupvar('apt::repos') %> <% if include_src=scope.lookupvar('apt::include_src') -%> deb-src <%= debian_url %> <%= codename %> <%= lrepos %> <% end -%> diff --git a/templates/Ubuntu/sources.list.erb b/templates/Ubuntu/sources.list.erb index e6d2f64..b90b8c8 100644 --- a/templates/Ubuntu/sources.list.erb +++ b/templates/Ubuntu/sources.list.erb @@ -1,8 +1,8 @@ # This file is managed by puppet # all local modifications will be overwritten -# basic <%= codename=scope.lookupvar('::ubuntu_codename') %> -deb <%= ubuntu_url=scope.lookupvar('apt::ubuntu_url') %> <%= codename %> <%= lrepos=scope.lookupvar('apt::real_repos') %> +# basic <%= codename=scope.lookupvar('apt::codename') %> +deb <%= ubuntu_url=scope.lookupvar('apt::ubuntu_url') %> <%= codename %> <%= lrepos=scope.lookupvar('apt::repos') %> <% if include_src=scope.lookupvar('apt::include_src') -%> deb-src <%= ubuntu_url %> <%= codename %> <%= lrepos %> <% end -%> |