<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[143534] trunk/dports/www/nginx</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/143534">143534</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2015-12-14 13:30:09 -0800 (Mon, 14 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportswwwnginxPortfile">trunk/dports/www/nginx/Portfile</a></li>
<li><a href="#trunkdportswwwnginxfilespatchconf__nginxconfdiff">trunk/dports/www/nginx/files/patch-conf__nginx.conf.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportswwwnginxPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/nginx/Portfile (143533 => 143534)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name nginx
</span><span class="cx"> version 1.9.9
</span><ins>+revision 1
</ins><span class="cx"> categories www mail
</span><span class="cx"> platforms darwin
</span><span class="cx"> license BSD
</span><span class="lines">@@ -50,7 +51,7 @@
</span><span class="cx"> set nginx_rundir ${prefix}/var/run/${name}
</span><span class="cx"> set nginx_pidfile ${nginx_rundir}/${name}.pid
</span><span class="cx"> set nginx_all_confs {fastcgi.conf fastcgi_params mime.types nginx.conf scgi_params uwsgi_params}
</span><del>-set auto_activate_confs {nginx.conf mime.types fastcgi_params}
</del><ins>+set auto_activate_confs {nginx.conf mime.types fastcgi.conf}
</ins><span class="cx">
</span><span class="cx"> # portfile-scoped vars for variant routines to re-def and use in port-stages (post-extract, pre-patch, etc)
</span><span class="cx"> set nginx_upload_mod_dirname ""
</span></span></pre></div>
<a id="trunkdportswwwnginxfilespatchconf__nginxconfdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/nginx/files/patch-conf__nginx.conf.diff (143533 => 143534)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- conf/nginx.conf 2009-04-06 13:43:46.000000000 +0000
-+++ conf/nginx.conf.new 2009-11-15 13:18:15.000000000 +0000
</del><ins>+--- conf/nginx.conf.orig 2015-12-09 15:47:21.000000000 +0100
++++ conf/nginx.conf 2015-12-14 22:26:07.000000000 +0100
</ins><span class="cx"> @@ -41,7 +41,7 @@
</span><span class="cx"> #access_log logs/host.access.log main;
</span><span class="cx">
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # proxy the PHP scripts to Apache listening on 127.0.0.1:80
</span><del>-@@ -63,7 +63,7 @@
</del><ins>+@@ -63,11 +63,10 @@
</ins><span class="cx"> # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
</span><span class="cx"> #
</span><span class="cx"> #location ~ \.php$ {
</span><span class="lines">@@ -26,8 +26,13 @@
</span><span class="cx"> + # root share/nginx/html;
</span><span class="cx"> # fastcgi_pass 127.0.0.1:9000;
</span><span class="cx"> # fastcgi_index index.php;
</span><del>- # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name;
-@@ -87,7 +87,7 @@
</del><ins>+- # 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 @@
</ins><span class="cx"> # server_name somename alias another.alias;
</span><span class="cx">
</span><span class="cx"> # location / {
</span><span class="lines">@@ -36,8 +41,8 @@
</span><span class="cx"> # index index.html index.htm;
</span><span class="cx"> # }
</span><span class="cx"> #}
</span><del>-@@ -110,7 +110,7 @@
- # ssl_prefer_server_ciphers on;
</del><ins>+@@ -109,7 +108,7 @@
+ # ssl_prefer_server_ciphers on;
</ins><span class="cx">
</span><span class="cx"> # location / {
</span><span class="cx"> - # root html;
</span></span></pre>
</div>
</div>
</body>
</html>