diff options
| author | intrigeri <intrigeri@boum.org> | 2013-01-02 16:14:06 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2013-01-02 16:14:06 +0100 |
| commit | 517040bb2e088325c2baa5bc4e9860d218357669 (patch) | |
| tree | eeca8062bf072c780aafe6f3b6ae22782a8e1914 /templates/Ubuntu/sources.list.erb | |
| parent | cda713fcf6bd189c3e870c9e466aa5f41d1847b6 (diff) | |
| parent | 07a031f2050deecfefa205e1e0c63586692a06ff (diff) | |
| download | puppet-apt-517040bb2e088325c2baa5bc4e9860d218357669.tar.gz puppet-apt-517040bb2e088325c2baa5bc4e9860d218357669.tar.bz2 | |
Merge remote-tracking branch 'riseup/immerda_27_readme' into shared
Conflicts:
README
manifests/cron/dist_upgrade.pp
manifests/cron/download.pp
manifests/init.pp
manifests/preferences.pp
Diffstat (limited to 'templates/Ubuntu/sources.list.erb')
| -rw-r--r-- | templates/Ubuntu/sources.list.erb | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/templates/Ubuntu/sources.list.erb b/templates/Ubuntu/sources.list.erb index b5725f5..c1a6115 100644 --- a/templates/Ubuntu/sources.list.erb +++ b/templates/Ubuntu/sources.list.erb @@ -1,26 +1,26 @@ # This file is managed by puppet # all local modifications will be overwritten -# basic <%= lsbdistcodename %> -deb <%= ubuntu_url %> <%= lsbdistcodename %> <%= repos %> -<% if include_src then -%> -deb-src <%= ubuntu_url %> <%= lsbdistcodename %> <%= repos %> +# basic <%= codename=scope.lookupvar('apt::codename') %> +deb <%= ubuntu_url=scope.lookupvar('apt::ubuntu_url') %> <%= codename %> <%= lrepos=scope.lookupvar('apt::real_repos') %> +<% if include_src=scope.lookupvar('apt::include_src') -%> +deb-src <%= ubuntu_url %> <%= codename %> <%= lrepos %> <% end -%> # updates -deb <%= ubuntu_url %> <%= lsbdistcodename %>-updates <%= repos %> -<% if include_src then -%> -deb-src <%= ubuntu_url %> <%= lsbdistcodename %>-updates <%= repos %> +deb <%= ubuntu_url %> <%= codename %>-updates <%= lrepos %> +<% if include_src -%> +deb-src <%= ubuntu_url %> <%= codename %>-updates <%= lrepos %> <% end -%> # security suppport -deb <%= ubuntu_url %> <%= lsbdistcodename %>-security <%= repos %> -<% if include_src then -%> -deb-src <%= ubuntu_url %> <%= lsbdistcodename %>-security <%= repos %> +deb <%= ubuntu_url %> <%= codename %>-security <%= lrepos %> +<% if include_src -%> +deb-src <%= ubuntu_url %> <%= codename %>-security <%= lrepos %> <% end -%> # backports -deb <%= ubuntu_url %> <%= lsbdistcodename %>-backports main <%= repos %> -<% if include_src then -%> -deb-src <%= ubuntu_url %> <%= lsbdistcodename %>-backports <%= repos %> +deb <%= ubuntu_url %> <%= codename %>-backports main <%= lrepos %> +<% if include_src -%> +deb-src <%= ubuntu_url %> <%= codename %>-backports <%= lrepos %> <% end -%> |