From bd3b46ac07e36bb995c99ade2e6d045c9f06f4fc Mon Sep 17 00:00:00 2001 From: Gabriel Filion Date: Mon, 25 Oct 2010 13:58:14 -0400 Subject: Change "brought to you" into "managed" in headers File headers are there to indicate that the files should not be touched directly on the server. By changing the first sentence to "This file is managed by Puppet", we reinforce the idea that it is already taken care of by something else. Signed-off-by: Gabriel Filion --- templates/20proxy.erb | 2 +- templates/Debian/sources.list.deb-src.erb | 2 +- templates/Debian/sources.list.erb | 2 +- templates/Debian/sources.list.volatile.erb | 2 +- templates/Ubuntu/sources.list.backports.erb | 2 +- templates/Ubuntu/sources.list.deb-src.erb | 2 +- templates/Ubuntu/sources.list.erb | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'templates') diff --git a/templates/20proxy.erb b/templates/20proxy.erb index 8f57e73..602e08f 100644 --- a/templates/20proxy.erb +++ b/templates/20proxy.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 Acquire::http { Proxy "<%= real_apt_proxy %>:<%= real_apt_proxy_port %>"; }; diff --git a/templates/Debian/sources.list.deb-src.erb b/templates/Debian/sources.list.deb-src.erb index e167ab6..954e25f 100644 --- a/templates/Debian/sources.list.deb-src.erb +++ b/templates/Debian/sources.list.deb-src.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/Debian/sources.list.erb b/templates/Debian/sources.list.erb index 12d1027..aa26415 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 # basic <%= lsbdistcodename %> diff --git a/templates/Debian/sources.list.volatile.erb b/templates/Debian/sources.list.volatile.erb index d8527b6..4a0d9ab 100644 --- a/templates/Debian/sources.list.volatile.erb +++ b/templates/Debian/sources.list.volatile.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 <% if (lsbdistcodename == "sid" || lsbdistcodename == "unstable" || lsbdistcodename == "squeeze") -%> diff --git a/templates/Ubuntu/sources.list.backports.erb b/templates/Ubuntu/sources.list.backports.erb index 2bb0ad2..8347268 100644 --- a/templates/Ubuntu/sources.list.backports.erb +++ b/templates/Ubuntu/sources.list.backports.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 # backports diff --git a/templates/Ubuntu/sources.list.deb-src.erb b/templates/Ubuntu/sources.list.deb-src.erb index 22f103b..5d85983 100644 --- a/templates/Ubuntu/sources.list.deb-src.erb +++ b/templates/Ubuntu/sources.list.deb-src.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/Ubuntu/sources.list.erb b/templates/Ubuntu/sources.list.erb index 2719934..a90c08a 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 %> -- cgit v1.2.3 From 90c45cfe446588345eb5d9061ea359d121db2dc3 Mon Sep 17 00:00:00 2001 From: mh Date: Thu, 28 Oct 2010 22:05:37 +0200 Subject: put the file at the right place & fix typos --- files/preferences_snippet.erb | 4 ---- manifests/preferences_snippet.pp | 12 +++++++----- templates/preferences_snippet.erb | 4 ++++ 3 files changed, 11 insertions(+), 9 deletions(-) delete mode 100644 files/preferences_snippet.erb create mode 100644 templates/preferences_snippet.erb (limited to 'templates') diff --git a/files/preferences_snippet.erb b/files/preferences_snippet.erb deleted file mode 100644 index 4dfb701..0000000 --- a/files/preferences_snippet.erb +++ /dev/null @@ -1,4 +0,0 @@ -Package: <%= name %> -Pin: release a=<%= release %> -Pin-Priority: <%= priority %> - diff --git a/manifests/preferences_snippet.pp b/manifests/preferences_snippet.pp index 9da7a8e..fd2956d 100644 --- a/manifests/preferences_snippet.pp +++ b/manifests/preferences_snippet.pp @@ -21,13 +21,15 @@ define apt::preferences_snippet( # snippets, but since the preferences.d directory cannot be used in Debian # lenny, we can't generalize without going into ugly special-casing. case $source { - '' => - File["${apt::preferences::apt_preferences_dir/${name}"] { + '': { + File["${apt::preferences::apt_preferences_dir}/${name}"] { content => template("apt/preferences_snippet.erb") - }, - default => - File["${apt::preferences::apt_preferences_dir/${name}"] { + } + } + default: { + File["${apt::preferences::apt_preferences_dir}/${name}"] { source => $source } + } } } 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 %> + -- cgit v1.2.3 From ebb46ca2002d0ef9aeb15160065fa3511ced30c1 Mon Sep 17 00:00:00 2001 From: mh Date: Thu, 28 Oct 2010 22:27:28 +0200 Subject: fixing comments apt preferences actually want // to comment, while sources are fine to be commented with # ... --- files/02show_upgraded | 4 ++-- files/03clean | 4 ++-- files/preferences | 4 ++-- templates/20proxy.erb | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'templates') diff --git a/files/02show_upgraded b/files/02show_upgraded index 8ef5d8d..bb127d4 100644 --- a/files/02show_upgraded +++ b/files/02show_upgraded @@ -1,4 +1,4 @@ -# This file is managed by Puppet -# all local modifications will be overwritten +// This file is managed by Puppet +// all local modifications will be overwritten APT::Get::Show-Upgraded true; diff --git a/files/03clean b/files/03clean index 29acece..3d20924 100644 --- a/files/03clean +++ b/files/03clean @@ -1,4 +1,4 @@ -# This file is managed by Puppet -# all local modifications will be overwritten +// This file is managed by Puppet +// all local modifications will be overwritten DSelect::Clean auto; diff --git a/files/preferences b/files/preferences index ddf82fe..eea7f86 100644 --- a/files/preferences +++ b/files/preferences @@ -1,5 +1,5 @@ -# This file is managed by Puppet -# all local modifications will be overwritten +// This file is managed by Puppet +// all local modifications will be overwritten Package: * Pin: release a=unstable diff --git a/templates/20proxy.erb b/templates/20proxy.erb index 602e08f..3e1ae5d 100644 --- a/templates/20proxy.erb +++ b/templates/20proxy.erb @@ -1,4 +1,4 @@ -# This file is managed 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 %>"; }; -- cgit v1.2.3