[nginx] Use new style properties

cloudfoundry-attic · Feb 19, 2013 · 956407a · 956407a
1 parent 6353a64
commit 956407a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/jobs/nginx/spec b/jobs/nginx/spec
@@ -8,3 +8,15 @@ templates:
 
 packages:
   - nginx
+
+properties:
+  nginx.workers:
+    description: Number of nginx worker processes
+    default: 1
+  wordpress.servername:
+    description: Name of the virtual server
+  wordpress.port:
+    description: TCP port upstream (backends) servers listen on
+    default: 8008
+  wordpress.servers:
+    description: Array of upstream (backends) servers
diff --git a/jobs/nginx/templates/nginx.conf.erb b/jobs/nginx/templates/nginx.conf.erb
@@ -1,5 +1,5 @@
 user  root root;
-worker_processes  <%= properties.nginx.workers || 1 %>;
+worker_processes  <%= p("nginx.workers") %>;
 
 error_log /var/vcap/sys/log/nginx/nginx.error.log;
 pid       /var/vcap/sys/run/nginx/nginx.pid;
@@ -39,14 +39,14 @@ http {
   client_max_body_size 256M;
 
   upstream wordpress {
-  <% properties.wordpress.servers.each do |server| %>
-    server <%= server %>:<%= properties.wordpress.port %>;
+  <% p("wordpress.servers").each do |server| %>
+    server <%= server %>:<%= p("wordpress.port") %>;
   <% end %>
   }
 
   server {
     listen       80;
-    server_name  "<%= properties.wordpress.servername %>";
+    server_name  "<%= p("wordpress.servername") %>";
     server_name_in_redirect off;
 
     location / {