Make nginx cookbook default to using the nginx upstream repository

diff --git a/cookbooks/nginx/attributes/default.rb b/cookbooks/nginx/attributes/default.rb
index e37b429997350aa7afe3e7507afc5079ac842a66..21d22045bc60841f1e453369a6ffff924d97456e 100644 (file)
--- a/cookbooks/nginx/attributes/default.rb
+++ b/cookbooks/nginx/attributes/default.rb
@@ -14,3 +14,6 @@ default[:nginx][:cache][:proxy][:directory] = "/var/cache/nginx/proxy-cache"
 default[:nginx][:cache][:proxy][:keys_zone] = "proxy_cache_zone:128M"
 default[:nginx][:cache][:proxy][:inactive] = "45d"
 default[:nginx][:cache][:proxy][:max_size] = "16384M"
+
+# Enable nginx repository
+default[:apt][:sources] = node[:apt][:sources] | ["nginx"]

diff --git a/cookbooks/nginx/metadata.rb b/cookbooks/nginx/metadata.rb
index 9e544a8a2c69daf30bd5a814e63c53c805dab43f..dc7758e3a29c2e05107687e73e3c03ddf5739262 100644 (file)
--- a/cookbooks/nginx/metadata.rb
+++ b/cookbooks/nginx/metadata.rb
@@ -6,6 +6,7 @@ description       "Installs and configures nginx"
 
 version           "1.0.0"
 supports          "ubuntu"
+depends           "apt"
 depends           "munin"
 depends           "networking"
 depends           "ssl"

diff --git a/cookbooks/nginx/recipes/default.rb b/cookbooks/nginx/recipes/default.rb
index aec734c17f2ae9dc9744b1dcdd78724bfeb58b4a..94754546c257168b12a16a807d560a3066e21058 100644 (file)
--- a/cookbooks/nginx/recipes/default.rb
+++ b/cookbooks/nginx/recipes/default.rb
@@ -17,6 +17,7 @@
 # limitations under the License.
 #
 
+include_recipe "apt"
 include_recipe "munin"
 
 package "nginx"

diff --git a/roles/imagery.rb b/roles/imagery.rb
index fedd79afc43b7fbd21aa79780b229113f1cc0a40..b561689a731aa03a34b837fea476578ab3178685 100644 (file)
--- a/roles/imagery.rb
+++ b/roles/imagery.rb
@@ -12,7 +12,7 @@ default_attributes(
     }
   },
   :apt => {
-    :sources => %w[nginx ubuntugis-unstable]
+    :sources => %w[ubuntugis-unstable]
   },
   :sysctl => {
     :sockets => {

diff --git a/roles/tilecache.rb b/roles/tilecache.rb
index dc6fadf7b70c3dea917d1dd9fd8b2b245d4c99ad..d0d14f751bb71620c0666e9e7d3df5603860de2a 100644 (file)
--- a/roles/tilecache.rb
+++ b/roles/tilecache.rb
@@ -9,9 +9,6 @@ default_attributes(
       }
     }
   },
-  :apt => {
-    :sources => ["nginx"]
-  },
   :networking => {
     :tcp_fastopen_key => "tile"
   },