Set the number of nginx workers in wre.conf. Fix syntax errors in the nginx templates (missing semi-colons).

perlDreamer · perlDreamer · commit 982207824aa4 · 2012-01-07T16:03:25.000-08:00
diff --git a/wre/etc/wre.conf b/wre/etc/wre.conf
@@ -19,14 +19,15 @@
         "connectionTimeout" : 30,
         "defaultHostname" : "localhost",
         "port" : 8081,
-        "workers" : 10
+        "workers" : 5
     },
 
     # nginx
     "nginx" : {
         "connectionTimeout" : 30,
         "defaultHostname" : "localhost",
         "port" : 80,
+        "workers" : 10
     },
 
     # utilities
diff --git a/wre/var/setupfiles/nginx.conf b/wre/var/setupfiles/nginx.conf
@@ -1,5 +1,5 @@
 user  [% config.get('user') %];
-worker_processes  10;
+worker_processes  [% config.get('nginx/workers') %];
 
 error_log  [% config.getRoot %]/var/logs/nginx_error.log;
 
@@ -28,6 +28,6 @@ http {
     gzip_comp_level 9;
 
     ##Include per-server vhost configuration files.
-    include [% config.getRoot %]/etc/*.nginx
+    include [% config.getRoot %]/etc/*.nginx;
 
 }
diff --git a/wre/var/setupfiles/nginx.template b/wre/var/setupfiles/nginx.template
@@ -1,9 +1,9 @@
 server {
-    server_name  [% sitename %] [%domain %]
+    server_name  [% sitename %] [%domain %];
 
     listen   [% config.get('nginx/port') %]; ## listen for ipv4
 
-    access_log [% domainRoot %]/[% sitename %]/logs/access.log combined
+    access_log [% domainRoot %]/[% sitename %]/logs/access.log combined;
     root       [% domainRoot %]/www.example.com/public;
     client_max_body_size 20M;
 
@@ -36,7 +36,7 @@ server {
 
 #server {
 #    listen   443;
-#    server_name  [% sitename %] [%domain %]
+#    server_name  [% sitename %] [%domain %];
 #
 #    ssl  on;
 #    ssl_certificate [% domainRoot %]/[% sitename %]/certs/server.crt
