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 --- files/03clean | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'files/03clean') diff --git a/files/03clean b/files/03clean index d878375..29acece 100644 --- a/files/03clean +++ b/files/03clean @@ -1,4 +1,4 @@ -# This file is brought to you by Puppet +# This file is managed by Puppet # all local modifications will be overwritten DSelect::Clean auto; -- cgit v1.2.3 From 5de6431b89b696ce17874952dceb5968108449a9 Mon Sep 17 00:00:00 2001 From: mh Date: Thu, 28 Oct 2010 22:18:30 +0200 Subject: remove comments as lenny apt doesn't like them I got errors like: E: Syntax error /etc/apt/apt.conf.d/03clean:4: Extra junk after value Removing these comments fixed these problems. --- files/02show_upgraded | 3 --- files/03clean | 3 --- 2 files changed, 6 deletions(-) (limited to 'files/03clean') diff --git a/files/02show_upgraded b/files/02show_upgraded index 8ef5d8d..870a3a9 100644 --- a/files/02show_upgraded +++ b/files/02show_upgraded @@ -1,4 +1 @@ -# 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..335823d 100644 --- a/files/03clean +++ b/files/03clean @@ -1,4 +1 @@ -# This file is managed by Puppet -# all local modifications will be overwritten - DSelect::Clean auto; -- cgit v1.2.3 From 4cff5ef63e6df3f7ac22834ea902b1f410e3d6ed Mon Sep 17 00:00:00 2001 From: mh Date: Thu, 28 Oct 2010 22:24:57 +0200 Subject: Revert "remove comments as lenny apt doesn't like them" This reverts commit 5de6431b89b696ce17874952dceb5968108449a9. Actually the comments are just the wrong way... --- files/02show_upgraded | 3 +++ files/03clean | 3 +++ 2 files changed, 6 insertions(+) (limited to 'files/03clean') diff --git a/files/02show_upgraded b/files/02show_upgraded index 870a3a9..8ef5d8d 100644 --- a/files/02show_upgraded +++ b/files/02show_upgraded @@ -1 +1,4 @@ +# 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 335823d..29acece 100644 --- a/files/03clean +++ b/files/03clean @@ -1 +1,4 @@ +# This file is managed by Puppet +# all local modifications will be overwritten + DSelect::Clean auto; -- 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 'files/03clean') 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