Changes between Version 123 and Version 124 of PuffinServer

Timestamp:

04/14/14 12:16:22 (3 years ago)

Author:

chris

Comment:

Fix for php-fpm stats updated, see ticket:707#comment:33

PuffinServer

@@ -237 +237 @@
 ==== nginx config changes ====
 
-To get the nginx and php-fpm munin stats working the following code starting with the comment needs adding to {{{/var/aegir/config/server_master/nginx.conf}}} in the nginx default server section:
+To get the php-fpm munin stats working the following code starting with the comment needs adding to {{{/var/aegir/config/server_master/nginx.conf}}} in the nginx default server section:
 
 {{{
@@ -249 +249 @@
   server_name  _;
   location / {
+     expires 60s;
+     add_header Cache-Control "public, must-revalidate, proxy-revalidate";
+     add_header Access-Control-Allow-Origin *;
      root   /var/www/nginx-default;
      index  index.html index.htm;
   }
-## chris
+}
+
+server {
+  listen       *:80;
+  server_name 127.0.0.1;
   location /nginx_status {
     stub_status on;
-    access_log   off;
+    access_log off;
     allow 127.0.0.1;
-    allow 81.95.52.103;
     deny all;
   }
-  location ~ ^/(status|ping)$ {
+  # chris 2014-04-14
+  location ~ ^/fpm-(status|ping)$ {
     fastcgi_pass 127.0.0.1:9090;
     fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
@@ -267 +274 @@
     access_log off;
     allow 127.0.0.1;
+    allow 81.95.52.103;
     deny all;
   }