rpms/nginx/F-8 404.html, NONE, 1.1 50x.html, NONE, 1.1 index.html, NONE, 1.1 nginx-logo.png, NONE, 1.1 nginx-upstream-fair.tgz, NONE, 1.1 nginx.sysconfig, NONE, 1.1 poweredby.png, NONE, 1.1 ssl.conf, NONE, 1.1 upstream-fair.conf, NONE, 1.1 virtual.conf, NONE, 1.1 .cvsignore, 1.15, 1.16 nginx-auto-install.patch, 1.1, 1.2 nginx-conf.patch, 1.1, 1.2 nginx.init, 1.1, 1.2 nginx.spec, 1.16, 1.17 sources, 1.15, 1.16
Jeremy Hinegardner (jjh)
fedora-extras-commits at redhat.com
Mon May 12 05:24:49 UTC 2008
- Previous message (by thread): rpms/opencv/F-9 opencv-1.0.0-pkgconfig.diff, NONE, 1.1 opencv.spec, 1.20, 1.21
- Next message (by thread): rpms/nginx/F-9 404.html, NONE, 1.1 50x.html, NONE, 1.1 index.html, NONE, 1.1 nginx-logo.png, NONE, 1.1 nginx-upstream-fair.tgz, NONE, 1.1 nginx.sysconfig, NONE, 1.1 poweredby.png, NONE, 1.1 ssl.conf, NONE, 1.1 upstream-fair.conf, NONE, 1.1 virtual.conf, NONE, 1.1 .cvsignore, 1.15, 1.16 nginx-auto-install.patch, 1.1, 1.2 nginx-conf.patch, 1.1, 1.2 nginx.init, 1.1, 1.2 nginx.spec, 1.19, 1.20 sources, 1.15, 1.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jjh
Update of /cvs/pkgs/rpms/nginx/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30356
Modified Files:
.cvsignore nginx-auto-install.patch nginx-conf.patch
nginx.init nginx.spec sources
Added Files:
404.html 50x.html index.html nginx-logo.png
nginx-upstream-fair.tgz nginx.sysconfig poweredby.png ssl.conf
upstream-fair.conf virtual.conf
Log Message:
- upate to new upstream stable branch 0.6
- added 3rd party module nginx-upstream-fair
- added default webpages
- update init script to match recommended guidelines
- add /etc/nginx/conf.d support [#443280]
- use /etc/sysconfig/nginx to determine nginx.conf [#442708]
--- NEW FILE 404.html ---
<!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" xml:lang="en">
<head>
<title>The page is not found</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<style type="text/css">
/*<![CDATA[*/
body {
background-color: #fff;
color: #000;
font-size: 0.9em;
font-family: sans-serif,helvetica;
margin: 0;
padding: 0;
}
:link {
color: #c00;
}
:visited {
color: #c00;
}
a:hover {
color: #f50;
}
h1 {
text-align: center;
margin: 0;
padding: 0.6em 2em 0.4em;
background-color: #294172;
color: #fff;
font-weight: normal;
font-size: 1.75em;
border-bottom: 2px solid #000;
}
h1 strong {
font-weight: bold;
font-size: 1.5em;
}
h2 {
text-align: center;
background-color: #3C6EB4;
font-size: 1.1em;
font-weight: bold;
color: #fff;
margin: 0;
padding: 0.5em;
border-bottom: 2px solid #294172;
}
h3 {
text-align: center;
background-color: #ff0000;
padding: 0.5em;
color: #fff;
}
hr {
display: none;
}
.content {
padding: 1em 5em;
}
.alert {
border: 2px solid #000;
}
img {
border: 2px solid #fff;
padding: 2px;
margin: 2px;
}
a:hover img {
border: 2px solid #294172;
}
.logos {
margin: 1em;
text-align: center;
}
/*]]>*/
</style>
</head>
<body>
<h1><strong>nginx error!</strong></h1>
<div class="content">
<h3>The page you are looking for is not found.</h3>
<div class="alert">
<h2>Website Administrator</h2>
<div class="content">
<p>Something has triggered missing webpage on your
website. This is the default 404 error page for
<strong>nginx</strong> that is distributed with
Fedora. It is located
<tt>/usr/share/nginx/html/404.html</tt></p>
<p>You should customize this error page for your own
site or edit the <tt>error_page</tt> directive in
the <strong>nginx</strong> configuration file
<tt>/etc/nginx/nginx.conf</tt>.</p>
</div>
</div>
<div class="logos">
<a href="http://nginx.net/"><img
src="nginx-logo.png"
alt="[ Powered by nginx ]"
width="121" height="32" /></a>
<a href="http://fedoraproject.org/"><img
src="poweredby.png"
alt="[ Powered by Fedora ]"
width="88" height="31" /></a>
</div>
</div>
</body>
</html>
--- NEW FILE 50x.html ---
<!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" xml:lang="en">
<head>
<title>The page is temporarily unavailable</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<style type="text/css">
/*<![CDATA[*/
body {
background-color: #fff;
color: #000;
font-size: 0.9em;
font-family: sans-serif,helvetica;
margin: 0;
padding: 0;
}
:link {
color: #c00;
}
:visited {
color: #c00;
}
a:hover {
color: #f50;
}
h1 {
text-align: center;
margin: 0;
padding: 0.6em 2em 0.4em;
background-color: #294172;
color: #fff;
font-weight: normal;
font-size: 1.75em;
border-bottom: 2px solid #000;
}
h1 strong {
font-weight: bold;
font-size: 1.5em;
}
h2 {
text-align: center;
background-color: #3C6EB4;
font-size: 1.1em;
font-weight: bold;
color: #fff;
margin: 0;
padding: 0.5em;
border-bottom: 2px solid #294172;
}
h3 {
text-align: center;
background-color: #ff0000;
padding: 0.5em;
color: #fff;
}
hr {
display: none;
}
.content {
padding: 1em 5em;
}
.alert {
border: 2px solid #000;
}
img {
border: 2px solid #fff;
padding: 2px;
margin: 2px;
}
a:hover img {
border: 2px solid #294172;
}
.logos {
margin: 1em;
text-align: center;
}
/*]]>*/
</style>
</head>
<body>
<h1><strong>nginx error!</strong></h1>
<div class="content">
<h3>The page you are looking for is temporarily unavailable. Please try again later.</h3>
<div class="alert">
<h2>Website Administrator</h2>
<div class="content">
<p>Something has triggered an error on your
website. This is the default error page for
<strong>nginx</strong> that is distributed with
Fedora. It is located
<tt>/usr/share/nginx/html/50x.html</tt></p>
<p>You should customize this error page for your own
site or edit the <tt>error_page</tt> directive in
the <strong>nginx</strong> configuration file
<tt>/etc/nginx/nginx.conf</tt>.</p>
</div>
</div>
<div class="logos">
<a href="http://nginx.net/"><img
src="nginx-logo.png"
alt="[ Powered by nginx ]"
width="121" height="32" /></a>
<a href="http://fedoraproject.org/"><img
src="poweredby.png"
alt="[ Powered by Fedora ]"
width="88" height="31" /></a>
</div>
</div>
</body>
</html>
--- NEW FILE index.html ---
<!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" xml:lang="en">
<head>
<title>Test Page for the Nginx HTTP Server on Fedora</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<style type="text/css">
/*<![CDATA[*/
body {
background-color: #fff;
color: #000;
font-size: 0.9em;
font-family: sans-serif,helvetica;
margin: 0;
padding: 0;
}
:link {
color: #c00;
}
:visited {
color: #c00;
}
a:hover {
color: #f50;
}
h1 {
text-align: center;
margin: 0;
padding: 0.6em 2em 0.4em;
background-color: #294172;
color: #fff;
font-weight: normal;
font-size: 1.75em;
border-bottom: 2px solid #000;
}
h1 strong {
font-weight: bold;
font-size: 1.5em;
}
h2 {
text-align: center;
background-color: #3C6EB4;
font-size: 1.1em;
font-weight: bold;
color: #fff;
margin: 0;
padding: 0.5em;
border-bottom: 2px solid #294172;
}
hr {
display: none;
}
.content {
padding: 1em 5em;
}
.alert {
border: 2px solid #000;
}
img {
border: 2px solid #fff;
padding: 2px;
margin: 2px;
}
a:hover img {
border: 2px solid #294172;
}
.logos {
margin: 1em;
text-align: center;
}
/*]]>*/
</style>
</head>
<body>
<h1>Welcome to <strong>nginx</strong> on Fedora!</h1>
<div class="content">
<p>This page is used to test the proper operation of the
<strong>nginx</strong> HTTP server after it has been
installed. If you can read this page, it means that the
web server installed at this site is working
properly.</p>
<div class="alert">
<h2>Website Administrator</h2>
<div class="content">
<p>This is the default <tt>index.html</tt> page that
is distributed with <strong>nginx</strong> on
Fedora. It is located in
<tt>/usr/share/nginx/html</tt>.</p>
<p>You should now put your content in a location of
your choice and edit the <tt>root</tt> configuration
directive in the <strong>nginx</strong>
configuration file
<tt>/etc/nginx/nginx.conf</tt>.</p>
</div>
</div>
<div class="logos">
<a href="http://nginx.net/"><img
src="nginx-logo.png"
alt="[ Powered by nginx ]"
width="121" height="32" /></a>
<a href="http://fedoraproject.org/"><img
src="poweredby.png"
alt="[ Powered by Fedora ]"
width="88" height="31" /></a>
</div>
</div>
</body>
</html>
--- NEW FILE nginx-upstream-fair.tgz ---
‹
¹g5`h5 !CãÆó¿C°Ä
6ž¬‚;Ç
ù8v¯x£9Çþ®@ J€iaØ1ÜDÜzÚhluÇ?q§IÈY§ƒ"ÐA.
£È
\à1 Ö7]{^ó.ÂêÆA·D•5æöNÿqÄ àÓÛÈžrÁ cÐ)( Šld>ˆ˜ÆF^
S´5;,<yñ)
->mÄ7 îð D aŽ…pÂHÃÄÁÜ cVqùàiôk·öÀ9Úäûõ_ªT`4³_øßX‚X8Bwkè/ _dˆo T¨Æ«EïEó«ÀuªÚ©æ ñS_Üt[è˜Í1ÔI|Ü.p‰ƒ.zlSÞZÈ(<£pÂJ® W#WÈ'àìûq_Œa)ÒB¡ðn`$
ÃEÖ8YÁÐq† ØY»Cä~âC †O{K8%1B.} ,‚•ÌÐP¿ ·§g? ½<=aÍn¿}i-ããŠ)û:ÆTc- a¾ ±ñ"—µoA¬¥p¯Ñœ9vl¯`øÛ¦£0»cmAUts}7–¹©K®Q«_Á@hM¥i À¤]Áê(¼J[%Q½1 at edtÒ8D0€ñ1fo€-ÆíLUµpzVÂT–·
X«|‚óS"ÔS
-É%
_MQÌÄ–HŠ ’+hs¥· %P‰ùÇx…¬P[Ñ#:§Éè(eIºÊ ©*fg лµb¶ø¶Åð·ë,·nnÙ;žcõ;ó_ÛùÖxSï ¿uɾ9:99={QЯÉr-õ¹ááÃOO沎ØÆè(£Ú%ÝD‹~Š! ר–øÄ
z¨Ü„µÅ%tëjèñI,–ß’F”ô°+B-¦#¨àìa¿¾PaøV³Nw‹ ÄDü R.ktÕ‡E' AuE,þL€“·–ÔF4 “Ðg ¹™ô…q7#sýWõ7»ÿ†B¨÷?80
s–ëj‘Š¹ñxšA8´=0Q"âÂløkfZ0BÔADsè¥Û]å•p/ŽÐ"bö°
ÙëY¬[ñV³4 ÛÜTp°_&
NSþÒ Ð›¾>KòÑ94K: v«Áü|~$ǘGqScÏèÊ` 4,áUéå·Ù\2À ç>a«9´ê±gÏXÛÞ¯¦BgÂèêÿžmâPq©õËèŠøY‚žÏ’ *«Õf©Í/]éÝþÛìªÆ«}€ H¦Û úÕó´…—ËqU~Z…Í| ¡~·õDœ& ‘g”2É]Ð_ôód—ÉMK„åÜÍAMhª;)MY(¤;‡øÄKdöÕk¹2PÎ^ÿh(±róuÚÀ§Ï ¯-Ûqd¢ŠVIõ
G€j3¡«V?EYt: (²ÄGÜçç¯ÏMô$é«GKÅ.1ë¼æ¨Ú„($4ÍÜ Øì\Íœx¥¡_öZ,IÛª*‹íòmŠQ%´e#G=ʃ¶xDz¾jå,ËϯÊÍË%ÑV_õ¦”ϯµ8_ÑUodµ®l/Q„Ño u<é Úá4ê ¢ýSÊY-™š$â‚œMêû®÷^“ ³ÇA&.º(¥|ð‚)îa!í?¼|ýb8x58a
pg»Í6N}2çó ¼a Ål’_ö÷û?=Øh³<
¹©¢Üw‰´É‚Q¦¾}[’;åxgiªÄèþŒ=ãÒ”“d™êÑüóÑùYF2Va—'qä\͈øF ë+± Ìaâüè>n4ŸÈÌL†Àá!ëmkÌÉ‘žï`°‰h]žWgl•õI›Þ“*S8–Ê8ulû>(’±¨ú-ˆ6I ò@á}›Á ¸•"{lXf¤6!%KîKcê'ƒço5Á~!"bæ°rZì¡+"0\7ßh›3§¦5¯›Hà×QP·ÔIK·Eq_t<‘ÈáO]_SÜG–ÙrÕ¯©7ÁŠV–L¤‡¶È%Ië³Ë BºÉktžxöC}ïò|pôjx ÿ_JbÆÏŶ?N_üpY¯í«£¿¿?:}yQ¯96 ^ž¾¼~[s€“×?ŸÕ…eŽ^eýÀê=ðå ׯ)çðk4‚Œk‹^%'º-æTî¸a|î±Ü-¡U†¹Í‰rEG ¡ó-C:ßB
Ô¢"~@m÷G
%rÍÄ@µƒöšÎb¹Žýúæ ø¸·EËMÁR ºbsEù袘Jè~¬šn¦ã£È)‚Ë¢M{ÅΤî¦Bl=yZývw‰×n„—r¶¤ŒÉÍrOµz=ùVZM¬ñFÖᘘ^2{ÉÒ9‘)2¾Q³dheT°,, at r!r
ù¯U¡Õ‘±ÖB~ÜpÀ3—%Oè_à @0]¹Û¥ÕV¶&ʱŸ žÙœ, ßáOɳ÷ýLxeÉì„ÇãIææ8…˜·:V
oV?+Y(!ç kP{‡’éŽé ‘]k3x-œ¤w-ï©œ—|#d8O.óƒkvßïHÿ͎––þ¹8þapBvGÌAH% •l_7I×3w<ÃóVà>PjpˆÈØó!ÑϸsÔÄ ¶ðD"6`ÄÌŽë3$Þ“Œœ\QÒŒƒf½À˜˜#0¡Né, Æ»IÏ1:éÁ©-Yˆ0EP
’ çŠfÀMÀ>†QXoo ÌÞ˜Žá¬y¸3Nïvv÷²^`
á3kþ³)Z(Z”¦9gÌnš;`Í‘e±ïÞ<¥›’‰Ê
ö¼ªÎp•ŽýZÕPVA4øk$Î}]‡£¶XæçjJVh U¶^¢‚aŠrz:óšil`•ÀzVt‹ª¢óÅF¨ÒàÇt úÀ¯I㦠—´$h \í zg)B–¶“ˆÇp Æ1Fÿ°¬BBh¡¼´=Ô2Ù£¨Y[sáÐu·}Tå 'ÙQ† ˔Ź3F¥‘-Z9<ªNª-+
Ó¼ïZ˜0l]ÎSÓ— ±‚Îvy)„ÖÌdÉHø<q72d˱iT op³¨ 2 ¦n³Ú+:phçT¥;hgÆBáêŸ@ƒLqÇÆ.ÒÊ •<ý:µî5ýÃ|@Mï]YTNÞJŒ¾Rµ³˜é'yµ47WE ¹ Nô¹èøD[Š7'„´Q÷öâÍ«Wž'…øàìý^î >ƒ/¸öó%+âÍÜþˆ¬ð(öÝfŸ?3ñ\<{Ær*ª‰ôý m1¤DƒÓÔ‘ Ò#N‡ÚHä Iœ¯ãbìG/ ;· Í×nküZŒ3Öã:Å–Q§Óχ)b.ª¶°M™
Ë8/mFzA}%kø\ÊÏÿ-¦{¥ûÜoDcé*Mà*`÷RõYVifÌçúÓ‰œTk‚èÄçèîæ¦47yBgë/¿Ü)ÕqßA9s¸í”Èžcpý„—Ër»î¿ÏM”0‹*$‘8DÔù¬«‚˜o*SÏCqÛ¯fÂ- X±Ò ˜•…‹IE1Fs6 +"Ïä·
ÖáX©S…•µ3íBPez@
|Äti!Q†x®øÁ$"O² U€G¶ñ
Tˆw*š@-i–ݱ#ª¬Ô¸~A_ß“]° ‘ï²W… )£" ãX+˜Ú7õÀl"6G³pŸ5¼Þ¯µð›Pâ(}/•SËI!àÖVÕžVÝÃûúÁý¼†‡÷W(-Bja}M¢i“ K/aÆŒ|«±è ßŪ'ˆTY;“i¥Æé~÷ýE•& Z߬›®Œ‘‹ ¯¸ç[gK»(N CžÒÑ%•"èÒÉÌù€%C+ä5MUˆmu¾mz‹Á73š±Øf`\¾àK¶GUc™æyø°Ÿ{œ&ŒJbç¼På<[ÖÍç¯rþŠQHWê©=3à×ô®uU^v¸®´[ç ·>R’ýi
õÚöð‘aLÅN£¨´EË5®0¢ <pÀ}1¸ÙåáÇŠà¹Üi´Ù ?I-}ÚŒ“µíôýª&ƒÁÛ¿*6á|pwc¬§¯R ˜ 7gÃñÛ¨6–Ó£MŒ¯ñ³ªvøÑSìÇ:„&•ÓkGœýš¸#ã’6&@®íÙtÄ©¸^ЇÆèt‡Tx„[ŠXƒ˜,è‘ù Ò6ugr_1pp3×€u‹´…‰Ì‚˜¾±ªŸN\Rs‘ 2Ê>ãD`Ëfº¤:vY)ž¾,;ÈPõÒ<•@;PÆÇl”“Tÿ¨.^d24¿œU§Ó„J¸°ŸQ(R·{<_ÈA³¼Á*?’¦¼tœÌÓ¸r#7ç‹ ‚ž©ËŽ†Ý+‡«Ð¨ŽÓIU…þж±ŠÓ)bÆ‚1=.5^Á
Ô¹™ñ&¿æMšÅÁ¶r¢Å»»¦š þÑd++«.E¸þ1ñl ÄOvW…QÀ¶ÂùnlÖé¤
Õ—ÚJ³,ÚåÍc^…”ÒÔòðP ©rqî³aø”ßMÑLSÕ…l ÁzC˜ásÖ®îGÊîìÌã’úÕV©Ý‹òò«%çœÔU8ïTÇût5Õƒ8¨REuÞç•VÖíe§˜2*ÓÏú57lpS’˜ÌŠ´3ë¯[#/T)€âìPíÆÅ#r9©
ª·-úT€ðÂñ£!ÕÝ5›ÉP@ob.«®µgû?cš–QýIh¬²E®ÛE ù^Uñj(”5S;žøTÕ•æ2UÉ-ÍU™`Å'E]±=XÜŽ¯h¼ªšU›"ÍŠjgƒ—XÑÍâ¤Z»lÕ¬—1¾ÃÏ ®¡Y™Ž4ó×Òg “;mª Æ!- ð¯öΦ§aÃ¥B1T‰;!.ÜwáŽPa»ð¥íÄ¿§q¾ Ç^»BïsÚÚ%MbÇÉœÄÕöªSZ¿+ŸFö]y
yÚ× gþÆŠcktön,ÖoœmyÛâÜ ÉOX8‹ŠÁðBë¤KæGYÂgÍ1Œ\1PŒN-±DP¬Å¬ŒÄ›|øûçÔJ ÝYµéÓBwêy°@ÍM5² ,Ñå<¬¢ò óŸÃ2Éá<…R«7!véÁ“Ù£ñEE´1ÛÇ]Ó)‘=ÕßõÙLº7ä„r ¿5»3Áá-7ð¹}*]Ÿì LÃýúnÝ…0z{ œ†®h®¯Âln˜–ÒË"×}éRTIVñ¼
--- NEW FILE nginx.sysconfig ---
# Configuration file for the nginx service
# set this to the location of the nginx configuration file
NGINX_CONF_FILE=/etc/nginx/nginx.conf
--- NEW FILE ssl.conf ---
#
# HTTPS server configuration
#
#server {
# listen 443;
# server_name _;
# ssl on;
# ssl_certificate cert.pem;
# ssl_certificate_key cert.key;
# ssl_session_timeout 5m;
# ssl_protocols SSLv2 SSLv3 TLSv1;
# ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP;
# ssl_prefer_server_ciphers on;
# location / {
# root html;
# index index.html index.htm;
# }
#}
--- NEW FILE upstream-fair.conf ---
#
# This is a sample configuration to use the nginx-upstream-fair module
# that is included.
#
# http://wiki.codemongers.com/NginxHttpUpstreamFairModule
#
# Change your Nginx config file's upstream block to include the 'fair'
# directive:
#
# upstream mongrel {
# fair;
# server 127.0.0.1:5000;
# server 127.0.0.1:5001;
# server 127.0.0.1:5002;
# }
--- NEW FILE virtual.conf ---
#
# A virtual host using mix of IP-, name-, and port-based configuration
#
#server {
# listen 8000;
# listen somename:8080;
# server_name somename alias another.alias;
# location / {
# root html;
# index index.html index.htm;
# }
#}
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-8/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 19 Jan 2008 18:05:57 -0000 1.15
+++ .cvsignore 12 May 2008 05:24:06 -0000 1.16
@@ -1 +1 @@
-nginx-0.5.35.tar.gz
+nginx-0.6.30.tar.gz
nginx-auto-install.patch:
Index: nginx-auto-install.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-8/nginx-auto-install.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nginx-auto-install.patch 24 Mar 2007 18:31:48 -0000 1.1
+++ nginx-auto-install.patch 12 May 2008 05:24:06 -0000 1.2
@@ -1,6 +1,6 @@
---- auto/install.orig 2007-03-22 09:30:15.000000000 -0600
-+++ auto/install 2007-03-22 09:40:42.000000000 -0600
-@@ -19,42 +19,42 @@
+--- auto/install.orig 2008-05-11 15:02:01.000000000 -0600
++++ auto/install 2008-05-11 15:03:54.000000000 -0600
+@@ -19,45 +19,45 @@
install: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \
$NGX_INSTALL_PERL_MODULES
@@ -16,29 +16,34 @@
+ test ! -f '$NGX_DEST_DIR$NGX_SBIN_PATH' || mv '$NGX_DEST_DIR$NGX_SBIN_PATH' '$NGX_DEST_DIR$NGX_SBIN_PATH.old'
+ cp $NGX_OBJS/nginx '$NGX_DEST_DIR$NGX_SBIN_PATH'
-- test -d '`dirname "$NGX_CONF_PATH"`' \
-- || mkdir -p '`dirname "$NGX_CONF_PATH"`'
-+ test -d '`dirname "$NGX_DEST_DIR$NGX_CONF_PATH"`' \
-+ || mkdir -p '`dirname "$NGX_DEST_DIR$NGX_CONF_PATH"`'
-
-- cp conf/koi-win '`dirname "$NGX_CONF_PATH"`'
-- cp conf/koi-utf '`dirname "$NGX_CONF_PATH"`'
-- cp conf/win-utf '`dirname "$NGX_CONF_PATH"`'
-+ cp conf/koi-win '`dirname "$NGX_DEST_DIR$NGX_CONF_PATH"`'
-+ cp conf/koi-utf '`dirname "$NGX_DEST_DIR$NGX_CONF_PATH"`'
-+ cp conf/win-utf '`dirname "$NGX_DEST_DIR$NGX_CONF_PATH"`'
-
-- test -f '`dirname "$NGX_CONF_PATH"`/mime.types' || \
-- cp conf/mime.types '`dirname "$NGX_CONF_PATH"`/mime.types'
-- cp conf/mime.types '`dirname "$NGX_CONF_PATH"`/mime.types.default'
-+ test -f '`dirname "$NGX_DEST_DIR$NGX_CONF_PATH"`/mime.types' || \
-+ cp conf/mime.types '`dirname "$NGX_DEST_DIR$NGX_CONF_PATH"`/mime.types'
-+ cp conf/mime.types '`dirname "$NGX_DEST_DIR$NGX_CONF_PATH"`/mime.types.default'
-
-- test -f '$NGX_CONF_PATH' || cp conf/nginx.conf '$NGX_CONF_PATH'
-- cp conf/nginx.conf '`dirname "$NGX_CONF_PATH"`/nginx.conf.default'
-+ test -f '$NGX_DEST_DIR$NGX_CONF_PATH' || cp conf/nginx.conf '$NGX_DEST_DIR$NGX_CONF_PATH'
-+ cp conf/nginx.conf '`dirname "$NGX_DEST_DIR$NGX_CONF_PATH"`/nginx.conf.default'
+- test -d '$NGX_CONF_PREFIX' || mkdir -p '$NGX_CONF_PREFIX'
++ test -d '$NGX_DEST_DIR$NGX_CONF_PREFIX' || mkdir -p '$NGX_DEST_DIR$NGX_CONF_PREFIX'
+
+- cp conf/koi-win '$NGX_CONF_PREFIX'
+- cp conf/koi-utf '$NGX_CONF_PREFIX'
+- cp conf/win-utf '$NGX_CONF_PREFIX'
++ cp conf/koi-win '$NGX_DEST_DIR$NGX_CONF_PREFIX'
++ cp conf/koi-utf '$NGX_DEST_DIR$NGX_CONF_PREFIX'
++ cp conf/win-utf '$NGX_DEST_DIR$NGX_CONF_PREFIX'
+
+- test -f '$NGX_CONF_PREFIX/mime.types' \
+- || cp conf/mime.types '$NGX_CONF_PREFIX'
+- cp conf/mime.types '$NGX_CONF_PREFIX/mime.types.default'
++ test -f '$NGX_DEST_DIR$NGX_CONF_PREFIX/mime.types' \
++ || cp conf/mime.types '$NGX_DEST_DIR$NGX_CONF_PREFIX'
++ cp conf/mime.types '$NGX_DEST_DIR$NGX_CONF_PREFIX/mime.types.default'
+
+- test -f '$NGX_CONF_PREFIX/fastcgi_params' \
+- || cp conf/fastcgi_params '$NGX_CONF_PREFIX'
+- cp conf/fastcgi_params '$NGX_CONF_PREFIX/fastcgi_params.default'
++ test -f '$NGX_DEST_DIR$NGX_CONF_PREFIX/fastcgi_params' \
++ || cp conf/fastcgi_params '$NGX_DEST_DIR$NGX_CONF_PREFIX'
++ cp conf/fastcgi_params '$NGX_DEST_DIR$NGX_CONF_PREFIX/fastcgi_params.default'
+
+- test -f '$NGX_CONF_PATH' || cp conf/nginx.conf '$NGX_CONF_PREFIX'
+- cp conf/nginx.conf '$NGX_CONF_PREFIX/nginx.conf.default'
++ test -f '$NGX_DEST_DIR$NGX_CONF_PATH' || cp conf/nginx.conf '$NGX_DEST_DIR$NGX_CONF_PREFIX'
++ cp conf/nginx.conf '$NGX_DEST_DIR$NGX_CONF_PREFIX/nginx.conf.default'
- test -d '`dirname "$NGX_PID_PATH"`' \
- || mkdir -p '`dirname "$NGX_PID_PATH"`'
@@ -56,13 +61,13 @@
-if test -n "$NGX_ERROR_LOG_PATH"; then
-+if test -n "$NGX_DEST_DIR/$NGX_ERROR_LOG_PATH"; then
++if test -n "$NGX_DEST_DIR$NGX_ERROR_LOG_PATH"; then
cat << END >> $NGX_MAKEFILE
- test -d '`dirname "$NGX_ERROR_LOG_PATH"`' || \
- mkdir -p '`dirname "$NGX_ERROR_LOG_PATH"`'
-+ test -d '`dirname "$NGX_DEST_DIR/$NGX_ERROR_LOG_PATH"`' || \
-+ mkdir -p '`dirname "$NGX_DEST_DIR/$NGX_ERROR_LOG_PATH"`'
++ test -d '`dirname "$NGX_DEST_DIR$NGX_ERROR_LOG_PATH"`' || \
++ mkdir -p '`dirname "$NGX_DEST_DIR$NGX_ERROR_LOG_PATH"`'
END
fi
nginx-conf.patch:
Index: nginx-conf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-8/nginx-conf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nginx-conf.patch 24 Mar 2007 18:31:48 -0000 1.1
+++ nginx-conf.patch 12 May 2008 05:24:06 -0000 1.2
@@ -1,28 +1,60 @@
---- conf/nginx.conf.orig 2007-03-22 22:44:23.000000000 -0600
-+++ conf/nginx.conf 2007-03-22 23:06:48.000000000 -0600
-@@ -1,12 +1,11 @@
--
+--- conf/nginx.conf.orig 2008-05-11 21:19:44.000000000 -0600
++++ conf/nginx.conf 2008-05-11 22:20:32.000000000 -0600
+@@ -1,28 +1,59 @@
++#######################################################################
++#
++# This is the main Nginx configuration file.
++#
++# More information about the configuration options is available on
++# * the English wiki - http://wiki.codemongers.com/Main
++# * the Russian documentation - http://sysoev.ru/nginx/
++#
++#######################################################################
++
++#----------------------------------------------------------------------
++# Main Module - directives that cover basic functionality
++#
++# http://wiki.codemongers.com/NginxMainModule
++#
++#----------------------------------------------------------------------
+
-#user nobody;
-+user nginx;
++user nginx;
worker_processes 1;
-#error_log logs/error.log;
-#error_log logs/error.log notice;
-#error_log logs/error.log info;
-+error_log /var/log/nginx/error.log;
-+#error_log /var/log/nginx/error.log notice;
-+#error_log /var/log/nginx/error.log info;
++error_log /var/log/nginx/error.log;
++#error_log /var/log/nginx/error.log notice;
++#error_log /var/log/nginx/error.log info;
-#pid logs/nginx.pid;
-+pid /var/run/nginx.pid;
++pid /var/run/nginx.pid;
++
++#----------------------------------------------------------------------
++# Events Module
++#
++# http://wiki.codemongers.com/NginxEventsModule
++#
++#----------------------------------------------------------------------
++
events {
-@@ -15,14 +14,14 @@
+ worker_connections 1024;
+ }
++#----------------------------------------------------------------------
++# HTTP Core Module
++#
++# http://wiki.codemongers.com/NginxHttpCoreModule
++#
++#----------------------------------------------------------------------
++
http {
-- include conf/mime.types;
+- include mime.types;
+ include /etc/nginx/mime.types;
default_type application/octet-stream;
@@ -38,18 +70,88 @@
sendfile on;
#tcp_nopush on;
-@@ -38,7 +37,7 @@
+@@ -31,27 +62,36 @@
+ keepalive_timeout 65;
+
+ #gzip on;
++
++ # Load config files from the /etc/nginx/conf.d directory
++ include /etc/nginx/conf.d/*.conf;
+
++ #
++ # The default server
++ #
+ server {
+- listen 80;
+- server_name localhost;
++ listen 80 default;
++ server_name _;
#charset koi8-r;
-- #access_log logs/host.access.log main;
-+ #access_log /var/log/nginx/host.access.log main;
+ #access_log logs/host.access.log main;
location / {
- root html;
-@@ -113,5 +112,4 @@
- # index index.html index.htm;
- # }
- #}
+- root html;
++ root /usr/share/nginx/html;
+ index index.html index.htm;
+ }
+
+- #error_page 404 /404.html;
++ error_page 404 /404.html;
++ location = /404.html {
++ root /usr/share/nginx/html;
++ }
+
+ # redirect server error pages to the static page /50x.html
+ #
+ error_page 500 502 503 504 /50x.html;
+ location = /50x.html {
+- root html;
++ root /usr/share/nginx/html;
+ }
+
+ # proxy the PHP scripts to Apache listening on 127.0.0.1:80
+@@ -77,42 +117,4 @@
+ # deny all;
+ #}
+ }
+-
+-
+- # another virtual host using mix of IP-, name-, and port-based configuration
+- #
+- #server {
+- # listen 8000;
+- # listen somename:8080;
+- # server_name somename alias another.alias;
+-
+- # location / {
+- # root html;
+- # index index.html index.htm;
+- # }
+- #}
+-
+-
+- # HTTPS server
+- #
+- #server {
+- # listen 443;
+- # server_name localhost;
+-
+- # ssl on;
+- # ssl_certificate cert.pem;
+- # ssl_certificate_key cert.key;
+-
+- # ssl_session_timeout 5m;
+-
+- # ssl_protocols SSLv2 SSLv3 TLSv1;
+- # ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP;
+- # ssl_prefer_server_ciphers on;
+-
+- # location / {
+- # root html;
+- # index index.html index.htm;
+- # }
+- #}
-
}
Index: nginx.init
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-8/nginx.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nginx.init 24 Mar 2007 18:31:48 -0000 1.1
+++ nginx.init 12 May 2008 05:24:06 -0000 1.2
@@ -7,6 +7,7 @@
# proxy and IMAP/POP3 proxy server
# processname: nginx
# config: /etc/nginx/nginx.conf
+# config: /etc/sysconfig/nginx
# pidfile: /var/run/nginx.pid
# Source function library.
@@ -21,13 +22,17 @@
nginx="/usr/sbin/nginx"
prog=$(basename $nginx)
+NGINX_CONF_FILE="/etc/nginx/nginx.conf"
+
[ -e /etc/sysconfig/nginx ] && . /etc/sysconfig/nginx
lockfile=/var/lock/subsys/nginx
start() {
+ [ -x $nginx ] || exit 5
+ [ -f $config ] || exit 6
echo -n $"Starting $prog: "
- daemon $nginx -c /etc/$prog/$prog.conf
+ daemon $nginx -c $config
retval=$?
echo
[ $retval -eq 0 ] && touch $lockfile
@@ -59,24 +64,40 @@
restart
}
-fdr_status() {
+rh_status() {
status $prog
}
+rh_status_q() {
+ rh_status >/dev/null 2>&1
+}
+
case "$1" in
- start|stop|restart|reload)
+ start)
+ rh_status_q && exit 0
+ $1
+ ;;
+ stop)
+ rh_status_q || exit 0
+ $1
+ ;;
+ restart)
+ $1
+ ;;
+ reload)
+ rh_status_q || exit 7
$1
;;
force-reload)
force_reload
;;
status)
- fdr_status
+ rh_status
;;
condrestart|try-restart)
- [ ! -f $lockfile ] || restart
- ;;
+ rh_status_q || exit 0
+ ;;
*)
- echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
+ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
exit 2
esac
Index: nginx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-8/nginx.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- nginx.spec 19 Jan 2008 18:05:57 -0000 1.16
+++ nginx.spec 12 May 2008 05:24:06 -0000 1.17
@@ -5,9 +5,10 @@
%define nginx_logdir %{_localstatedir}/log/nginx
%define nginx_confdir %{_sysconfdir}/nginx
%define nginx_datadir %{_datadir}/nginx
+%define nginx_webroot %{nginx_datadir}/html
Name: nginx
-Version: 0.5.35
+Version: 0.6.30
Release: 1%{?dist}
Summary: Robust, small and high performance http and reverse proxy server
Group: System Environment/Daemons
@@ -18,16 +19,29 @@
URL: http://nginx.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: pcre-devel,zlib-devel,openssl-devel,perl-devel
+BuildRequires: pcre-devel,zlib-devel,openssl-devel,perl-devel,perl(ExtUtils::Embed)
Requires: pcre,zlib,openssl
-Requires(pre): %{_sbindir}/useradd
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig, /sbin/service
-Requires(postun): /sbin/service
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+# for /usr/sbin/useradd
+Requires(pre): shadow-utils
+Requires(post): chkconfig
+# for /sbin/service
+Requires(preun): chkconfig, initscripts
+Requires(postun): initscripts
Source0: http://sysoev.ru/nginx/nginx-%{version}.tar.gz
Source1: %{name}.init
Source2: %{name}.logrotate
+Source3: virtual.conf
+Source4: ssl.conf
+Source5: nginx-upstream-fair.tgz
+Source6: upstream-fair.conf
+Source7: %{name}.sysconfig
+Source100: index.html
+Source101: poweredby.png
+Source102: nginx-logo.png
+Source103: 50x.html
+Source104: 404.html
# removes -Werror in upstream build scripts. -Werror conflicts with
# -D_FORTIFY_SOURCE=2 causing warnings to turn into errors.
@@ -35,8 +49,8 @@
# nginx has its own configure/build scripts. These patches allow nginx
# to install into a buildroot.
-Patch1: nginx-auto-install.patch
-Patch2: nginx-auto-options.patch
+Patch1: nginx-auto-options.patch
+Patch2: nginx-auto-install.patch
# configuration patch to match all the Fedora paths for logs, pid files
# etc.
@@ -44,7 +58,10 @@
%description
Nginx [engine x] is an HTTP(S) server, HTTP(S) reverse proxy and IMAP/POP3
-proxy server written by Igor Sysoev.
+proxy server written by Igor Sysoev.
+
+One third party module, nginx-upstream-fair, is added
+
%prep
%setup -q
@@ -53,6 +70,7 @@
%patch1 -p0
%patch2 -p0
%patch3 -p0
+%{__tar} zxvf %{SOURCE5}
%build
# nginx does not utilize a standard configure script. It has its own
@@ -80,13 +98,18 @@
--with-http_sub_module \
--with-http_dav_module \
--with-http_flv_module \
+ --with-http_gzip_static_module \
--with-http_stub_status_module \
--with-http_perl_module \
--with-mail \
--with-mail_ssl_module \
- --with-cc-opt="%{optflags} $(pcre-config --cflags)"
+ --with-cc-opt="%{optflags} $(pcre-config --cflags)" \
+ --add-module=%{_builddir}/nginx-%{version}/nginx-upstream-fair
make %{?_smp_mflags}
+# rename the readme for nginx-upstream-fair so it doesn't conflict with the main
+# readme
+mv nginx-upstream-fair/README nginx-upstream-fair/README.nginx-upstream-fair
%install
rm -rf %{buildroot}
@@ -99,8 +122,14 @@
chmod 0755 %{buildroot}%{_sbindir}/nginx
%{__install} -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
%{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+%{__install} -p -D -m 0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
+%{__install} -p -d -m 0755 %{buildroot}%{nginx_confdir}/conf.d
+%{__install} -p -m 0644 %{SOURCE3} %{SOURCE4} %{SOURCE6} %{buildroot}%{nginx_confdir}/conf.d
%{__install} -p -d -m 0755 %{buildroot}%{nginx_home_tmp}
%{__install} -p -d -m 0755 %{buildroot}%{nginx_logdir}
+%{__install} -p -d -m 0755 %{buildroot}%{nginx_webroot}
+%{__install} -p -m 0644 %{SOURCE100} %{SOURCE101} %{SOURCE102} %{SOURCE103} %{SOURCE104} %{buildroot}%{nginx_webroot}
+
# convert to UTF-8 all files that give warnings.
for textfile in CHANGES
@@ -132,22 +161,26 @@
%files
%defattr(-,root,root,-)
-%doc LICENSE CHANGES README
+%doc LICENSE CHANGES README nginx-upstream-fair/README.nginx-upstream-fair
%dir %{nginx_datadir}
-%dir %{nginx_datadir}/html
%{_datadir}/%{name}/*/*
%{_sbindir}/%{name}
%{_mandir}/man3/%{name}.3pm.gz
%{_initrddir}/%{name}
%dir %{nginx_confdir}
+%dir %{nginx_confdir}/conf.d
+%config(noreplace) %{nginx_confdir}/conf.d/*.conf
%config(noreplace) %{nginx_confdir}/win-utf
%config(noreplace) %{nginx_confdir}/%{name}.conf.default
%config(noreplace) %{nginx_confdir}/mime.types.default
+%config(noreplace) %{nginx_confdir}/fastcgi_params
+%config(noreplace) %{nginx_confdir}/fastcgi_params.default
%config(noreplace) %{nginx_confdir}/koi-win
%config(noreplace) %{nginx_confdir}/koi-utf
%config(noreplace) %{nginx_confdir}/%{name}.conf
%config(noreplace) %{nginx_confdir}/mime.types
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%dir %{perl_vendorarch}/auto/%{name}
%{perl_vendorarch}/%{name}.pm
%{perl_vendorarch}/auto/%{name}/%{name}.so
@@ -157,12 +190,32 @@
%changelog
+* Sun May 11 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.6.30-1
+- upate to new upstream stable branch 0.6
+- added 3rd party module nginx-upstream-fair
+- added default webpages
+
+* Sun Apr 20 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.5.35-2
+- update init script to match recommended guidelines
+- add /etc/nginx/conf.d support [#443280]
+- use /etc/sysconfig/nginx to determine nginx.conf [#442708]
+
+* Tue Mar 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.5.35-3
+- add Requires for versioned perl (libperl.so)
+- drop silly file Requires
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.5.35-2
+- Autorebuild for GCC 4.3
+
* Sat Jan 19 2008 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.5.35-1
- update to 0.5.35
* Sat Dec 15 2007 Jeremy Hinegardner <jeremy at hinegardner dot org> - 0.5.34-1
- update to 0.5.34
+* Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org> - 0.5.33-2
+ - Rebuild for deps
+
* Sun Nov 11 2007 Jeremy Hinegardner <jeremy at hinegardner.org> - 0.5.33-1
- update to 0.5.33
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nginx/F-8/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 19 Jan 2008 18:05:57 -0000 1.15
+++ sources 12 May 2008 05:24:06 -0000 1.16
@@ -1 +1 @@
-1100d8a2f811777f38eff44fe6548d7e nginx-0.5.35.tar.gz
+415e9bbc71e2ae36d9120af80112c5c1 nginx-0.6.30.tar.gz
- Previous message (by thread): rpms/opencv/F-9 opencv-1.0.0-pkgconfig.diff, NONE, 1.1 opencv.spec, 1.20, 1.21
- Next message (by thread): rpms/nginx/F-9 404.html, NONE, 1.1 50x.html, NONE, 1.1 index.html, NONE, 1.1 nginx-logo.png, NONE, 1.1 nginx-upstream-fair.tgz, NONE, 1.1 nginx.sysconfig, NONE, 1.1 poweredby.png, NONE, 1.1 ssl.conf, NONE, 1.1 upstream-fair.conf, NONE, 1.1 virtual.conf, NONE, 1.1 .cvsignore, 1.15, 1.16 nginx-auto-install.patch, 1.1, 1.2 nginx-conf.patch, 1.1, 1.2 nginx.init, 1.1, 1.2 nginx.spec, 1.19, 1.20 sources, 1.15, 1.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list