From: Tom Hughes <tom@compton.nu>
Date: Fri, 18 Oct 2013 15:23:49 +0000 (+0100)
Subject: Use separate apt source list template for nginx
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/13f8835f70746c764e25dfd76a285302233e5136?ds=sidebyside

Use separate apt source list template for nginx
---

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index f11894a76..65f625a0b 100644
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -111,7 +111,7 @@ apt_source "mapnik-v210" do
 end
 
 apt_source "nginx" do
+  template "nginx.list.erb"
   url "http://nginx.org/packages/ubuntu"
   key "7BD9BF62"
 end
-
diff --git a/cookbooks/apt/templates/default/nginx.list.erb b/cookbooks/apt/templates/default/nginx.list.erb
new file mode 100644
index 000000000..5596a5012
--- /dev/null
+++ b/cookbooks/apt/templates/default/nginx.list.erb
@@ -0,0 +1,4 @@
+# DO NOT EDIT - This file is being maintained by Chef
+
+deb <%= @url %> <%= node.lsb.codename %> nginx
+deb-src <%= @url %> <%= node.lsb.codename %> nginx