[143534] trunk/dports/www/nginx

[cal at macports.org]

Revision: 143534
          https://trac.macports.org/changeset/143534
Author:   cal at macports.org
Date:     2015-12-14 13:30:09 -0800 (Mon, 14 Dec 2015)
Log Message:
-----------
nginx: Use fastcgi.conf instead of fastcgi_params

Upstream now recommends the use of fastcgi.conf for new installations, so
switch the file that gets activated by default and patch the default config to
reference it instead.

Closes #50019.

Modified Paths:
--------------
    trunk/dports/www/nginx/Portfile
    trunk/dports/www/nginx/files/patch-conf__nginx.conf.diff

Modified: trunk/dports/www/nginx/Portfile
===================================================================
--- trunk/dports/www/nginx/Portfile	2015-12-14 18:20:49 UTC (rev 143533)
+++ trunk/dports/www/nginx/Portfile	2015-12-14 21:30:09 UTC (rev 143534)
@@ -5,6 +5,7 @@
 
 name                nginx
 version             1.9.9
+revision            1
 categories          www mail
 platforms           darwin
 license             BSD
@@ -50,7 +51,7 @@
 set nginx_rundir    ${prefix}/var/run/${name}
 set nginx_pidfile   ${nginx_rundir}/${name}.pid
 set nginx_all_confs {fastcgi.conf fastcgi_params mime.types nginx.conf scgi_params uwsgi_params}
-set auto_activate_confs {nginx.conf mime.types fastcgi_params}
+set auto_activate_confs {nginx.conf mime.types fastcgi.conf}
 
 # portfile-scoped vars for variant routines to re-def and use in port-stages (post-extract, pre-patch, etc)
 set nginx_upload_mod_dirname   ""

Modified: trunk/dports/www/nginx/files/patch-conf__nginx.conf.diff
===================================================================
--- trunk/dports/www/nginx/files/patch-conf__nginx.conf.diff	2015-12-14 18:20:49 UTC (rev 143533)
+++ trunk/dports/www/nginx/files/patch-conf__nginx.conf.diff	2015-12-14 21:30:09 UTC (rev 143534)
@@ -1,5 +1,5 @@
---- conf/nginx.conf	2009-04-06 13:43:46.000000000 +0000
-+++ conf/nginx.conf.new	2009-11-15 13:18:15.000000000 +0000
+--- conf/nginx.conf.orig	2015-12-09 15:47:21.000000000 +0100
++++ conf/nginx.conf	2015-12-14 22:26:07.000000000 +0100
 @@ -41,7 +41,7 @@
          #access_log  logs/host.access.log  main;
  
@@ -18,7 +18,7 @@
          }
  
          # proxy the PHP scripts to Apache listening on 127.0.0.1:80
-@@ -63,7 +63,7 @@
+@@ -63,11 +63,10 @@
          # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
          #
          #location ~ \.php$ {
@@ -26,8 +26,13 @@
 +        #    root           share/nginx/html;
          #    fastcgi_pass   127.0.0.1:9000;
          #    fastcgi_index  index.php;
-         #    fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
-@@ -87,7 +87,7 @@
+-        #    fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
+-        #    include        fastcgi_params;
++        #    include        fastcgi.conf;
+         #}
+ 
+         # deny access to .htaccess files, if Apache's document root
+@@ -87,7 +86,7 @@
      #    server_name  somename  alias  another.alias;
  
      #    location / {
@@ -36,8 +41,8 @@
      #        index  index.html index.htm;
      #    }
      #}
-@@ -110,7 +110,7 @@
-     #    ssl_prefer_server_ciphers   on;
+@@ -109,7 +108,7 @@
+     #    ssl_prefer_server_ciphers  on;
  
      #    location / {
 -    #        root   html;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151214/ab83dd6d/attachment.html>