diff options
| author | intrigeri <intrigeri@boum.org> | 2010-11-21 17:03:57 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-11-21 17:03:57 +0100 |
| commit | 10c7939f65ae8e2f771d83d54c4ba56108bc509e (patch) | |
| tree | 4c66514e6adfece27e5111d1e296009e94405c6f /templates | |
| parent | 3de76e7b05224b9696a75908b0a4259349e20823 (diff) | |
| parent | 5d54dfdd88d1e87681b317db16b20ad20b8c88f7 (diff) | |
Merge remote branch 'immerda/master'.
Conflicts:
README
files/preferences
templates/Debian/sources.list.deb-src.erb
templates/Debian/sources.list.volatile.erb
templates/Ubuntu/sources.list.backports.erb
templates/Ubuntu/sources.list.deb-src.erb
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/20proxy.erb | 4 | ||||
| -rw-r--r-- | templates/Debian/sources.list.erb | 2 | ||||
| -rw-r--r-- | templates/Ubuntu/sources.list.erb | 2 | ||||
| -rw-r--r-- | templates/preferences_snippet.erb | 4 |
4 files changed, 8 insertions, 4 deletions
diff --git a/templates/20proxy.erb b/templates/20proxy.erb index 8f57e73..3e1ae5d 100644 --- a/templates/20proxy.erb +++ b/templates/20proxy.erb @@ -1,4 +1,4 @@ -# This file is brought to you by Puppet -# all local modifications will be overwritten +// This file is managed by Puppet +// all local modifications will be overwritten Acquire::http { Proxy "<%= real_apt_proxy %>:<%= real_apt_proxy_port %>"; }; diff --git a/templates/Debian/sources.list.erb b/templates/Debian/sources.list.erb index 7fb9bdf..f2e8fd8 100644 --- a/templates/Debian/sources.list.erb +++ b/templates/Debian/sources.list.erb @@ -1,4 +1,4 @@ -# This file is brought to you by puppet +# This file is managed by puppet # all local modifications will be overwritten ### Debian current: <%= codename %> diff --git a/templates/Ubuntu/sources.list.erb b/templates/Ubuntu/sources.list.erb index 2a25d6f..81650a2 100644 --- a/templates/Ubuntu/sources.list.erb +++ b/templates/Ubuntu/sources.list.erb @@ -1,4 +1,4 @@ -# This file is brought to you by puppet +# This file is managed by puppet # all local modifications will be overwritten # basic <%= lsbdistcodename %> diff --git a/templates/preferences_snippet.erb b/templates/preferences_snippet.erb new file mode 100644 index 0000000..4dfb701 --- /dev/null +++ b/templates/preferences_snippet.erb @@ -0,0 +1,4 @@ +Package: <%= name %> +Pin: release a=<%= release %> +Pin-Priority: <%= priority %> + |