Changeset 143534


Ignore:
Timestamp:
Dec 14, 2015, 9:30:09 PM (4 years ago)
Author:
cal@…
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.

Location:
trunk/dports/www/nginx
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/www/nginx/Portfile

    r143442 r143534  
    66name                nginx
    77version             1.9.9
     8revision            1
    89categories          www mail
    910platforms           darwin
     
    5152set nginx_pidfile   ${nginx_rundir}/${name}.pid
    5253set nginx_all_confs {fastcgi.conf fastcgi_params mime.types nginx.conf scgi_params uwsgi_params}
    53 set auto_activate_confs {nginx.conf mime.types fastcgi_params}
     54set auto_activate_confs {nginx.conf mime.types fastcgi.conf}
    5455
    5556# portfile-scoped vars for variant routines to re-def and use in port-stages (post-extract, pre-patch, etc)
  • trunk/dports/www/nginx/files/patch-conf__nginx.conf.diff

    r60653 r143534  
    1 --- conf/nginx.conf     2009-04-06 13:43:46.000000000 +0000
    2 +++ conf/nginx.conf.new 2009-11-15 13:18:15.000000000 +0000
     1--- conf/nginx.conf.orig        2015-12-09 15:47:21.000000000 +0100
     2+++ conf/nginx.conf     2015-12-14 22:26:07.000000000 +0100
    33@@ -41,7 +41,7 @@
    44         #access_log  logs/host.access.log  main;
     
    1919 
    2020         # proxy the PHP scripts to Apache listening on 127.0.0.1:80
    21 @@ -63,7 +63,7 @@
     21@@ -63,11 +63,10 @@
    2222         # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
    2323         #
     
    2727         #    fastcgi_pass   127.0.0.1:9000;
    2828         #    fastcgi_index  index.php;
    29          #    fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
    30 @@ -87,7 +87,7 @@
     29-        #    fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
     30-        #    include        fastcgi_params;
     31+        #    include        fastcgi.conf;
     32         #}
     33 
     34         # deny access to .htaccess files, if Apache's document root
     35@@ -87,7 +86,7 @@
    3136     #    server_name  somename  alias  another.alias;
    3237 
     
    3742     #    }
    3843     #}
    39 @@ -110,7 +110,7 @@
    40      #    ssl_prefer_server_ciphers   on;
     44@@ -109,7 +108,7 @@
     45     #    ssl_prefer_server_ciphers  on;
    4146 
    4247     #    location / {
Note: See TracChangeset for help on using the changeset viewer.