diff options
| author | intrigeri <intrigeri@boum.org> | 2016-06-29 14:53:57 +0000 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2016-06-29 14:53:57 +0000 |
| commit | a8755365321bccf7a5c7a9a0fc9883b3176a1d37 (patch) | |
| tree | 3d538541127319862fee0e6a4feb5e576392e066 /templates | |
| parent | 53c49fe2ae7bc74ab01457ffba8a6efd24fd44f9 (diff) | |
| parent | 8859eba152a5a504db9816b64fec6720f7ba5f14 (diff) | |
Merge remote-tracking branch 'lelutin-gitlab/backports_follow_debian_url' into shared-master
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 -%> |