<!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>[121137] trunk/dports/www/varnish</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/121137">121137</a></dd>
<dt>Author</dt> <dd>snc@macports.org</dd>
<dt>Date</dt> <dd>2014-06-18 09:13:09 -0700 (Wed, 18 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>varnish: update to 3.0.3, #35863</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportswwwvarnishPortfile">trunk/dports/www/varnish/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/www/varnish/files/</li>
<li><a href="#trunkdportswwwvarnishfilesvarnishvclreloadin">trunk/dports/www/varnish/files/varnish-vcl-reload.in</a></li>
<li><a href="#trunkdportswwwvarnishfilesvarnishconfin">trunk/dports/www/varnish/files/varnish.conf.in</a></li>
<li><a href="#trunkdportswwwvarnishfilesvarnishinitin">trunk/dports/www/varnish/files/varnish.init.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportswwwvarnishPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/varnish/Portfile (121136 => 121137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/varnish/Portfile 2014-06-18 16:08:42 UTC (rev 121136)
+++ trunk/dports/www/varnish/Portfile 2014-06-18 16:13:09 UTC (rev 121137)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx"> name varnish
</span><span class="cx"> epoch 20110709
</span><span class="cx"> version 3.0.3
</span><ins>+revision 1
</ins><span class="cx"> categories www
</span><span class="cx"> license BSD zlib
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -23,3 +24,44 @@
</span><span class="cx"> depends_build port:pkgconfig
</span><span class="cx">
</span><span class="cx"> depends_lib port:pcre
</span><ins>+
+startupitem.create yes
+startupitem.start "${prefix}/share/${name}/varnish.init start"
+startupitem.stop "${prefix}/share/${name}/varnish.init stop"
+
+post-destroot {
+ # create dir
+ xinstall -d -m 755 ${destroot}${prefix}/share/${name}
+
+ # copy files
+ xinstall -m 644 ${filespath}/varnish.conf.in ${destroot}${prefix}/etc/${name}/varnish.conf.default
+ xinstall -m 755 ${filespath}/varnish.init.in ${destroot}${prefix}/share/${name}/${name}.init
+ xinstall -m 755 ${filespath}/varnish-vcl-reload.in ${destroot}${prefix}/sbin/varnish-vcl-reload
+
+ # replace @PREFIX@ to ${prefix}
+ reinplace "s|@PREFIX@|${prefix}|g" \
+ ${destroot}${prefix}/etc/${name}/varnish.conf.default \
+ ${destroot}${prefix}/share/${name}/${name}.init \
+ ${destroot}${prefix}/sbin/varnish-vcl-reload
+
+ file rename ${destroot}${prefix}/etc/${name}/default.vcl ${destroot}${prefix}/etc/${name}/default.vcl.default
+}
+
+post-activate {
+ if {![file exists ${prefix}/etc/${name}/default.vcl]} {
+ file copy ${prefix}/etc/${name}/default.vcl.default \
+ ${prefix}/etc/${name}/default.vcl
+ }
+ if {![file exists ${prefix}/etc/${name}/varnish.conf]} {
+ file copy ${prefix}/etc/${name}/varnish.conf.default \
+ ${prefix}/etc/${name}/varnish.conf
+ }
+
+ # dirs nedded to run varnish
+ xinstall -d -m 755 -o nobody -g nobody ${prefix}/var/${name}
+ xinstall -d -m 755 -o nobody -g nobody ${prefix}/var/run/${name}
+}
+
+livecheck.url ${master_sites}
+livecheck.type regex
+livecheck.regex ${name}-(\\d+\\.\\d+\\.\\d+).tar.gz
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkdportswwwvarnishfilesvarnishvclreloadin"></a>
<div class="addfile"><h4>Added: trunk/dports/www/varnish/files/varnish-vcl-reload.in (0 => 121137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/varnish/files/varnish-vcl-reload.in (rev 0)
+++ trunk/dports/www/varnish/files/varnish-vcl-reload.in 2014-06-18 16:13:09 UTC (rev 121137)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+#!/bin/sh
+
+cfg=${1:-@PREFIX@/etc/varnish/default.vcl}
+if [ ! -e "$cfg" ]; then
+ printf 'ERROR: VCL file %s does not exist\n' "$cfg" >&2
+ exit 1
+fi
+
+activecfg=$(varnishadm 'vcl.list' | awk '/active/ { print $3 }')
+if [ -z "$activecfg" ]; then
+ printf 'ERROR: No active VCL found!\n' >&2
+ exit 1
+fi
+
+newcfg=$(date +'vcl-%s')
+printf 'INFO: using new config %s\n' "$cfg"
+
+varnishadm "vcl.load $newcfg $cfg" &&
+varnishadm "vcl.use $newcfg" &&
+varnishadm "vcl.discard $activecfg"
</ins></span></pre></div>
<a id="trunkdportswwwvarnishfilesvarnishconfin"></a>
<div class="addfile"><h4>Added: trunk/dports/www/varnish/files/varnish.conf.in (0 => 121137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/varnish/files/varnish.conf.in (rev 0)
+++ trunk/dports/www/varnish/files/varnish.conf.in 2014-06-18 16:13:09 UTC (rev 121137)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+#
+# MANDATORIES command line options to varnishd
+#
+
+VARNISH_CFG="@PREFIX@/etc/varnish/default.vcl"
+VARNISHD_PID="@PREFIX@/var/run/varnish/varnish.pid"
+
+VARNISHD_OPTS="-a 0.0.0.0:80 \
+ -f $VARNISH_CFG \
+ -T localhost:6082 \
+ -P $VARNISHD_PID \
+ -s malloc,64M
+ -u nobody -g nobody"
</ins></span></pre></div>
<a id="trunkdportswwwvarnishfilesvarnishinitin"></a>
<div class="addfile"><h4>Added: trunk/dports/www/varnish/files/varnish.init.in (0 => 121137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/varnish/files/varnish.init.in (rev 0)
+++ trunk/dports/www/varnish/files/varnish.init.in 2014-06-18 16:13:09 UTC (rev 121137)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+#!/bin/bash
+
+. @PREFIX@/etc/varnish/varnish.conf
+
+if [[ -r $VARNISHD_PID ]]; then
+ read -r PID < "$VARNISHD_PID"
+ ps -p $PID &> /dev/null
+ CHECK=$?
+ if [[ "x$CHECK" == "x1" ]]; then
+ unset PID
+ rm -f "$VARNISHD_PID"
+ fi
+fi
+
+case $1 in
+ start)
+ @PREFIX@/sbin/varnishd $VARNISHD_OPTS
+ ;;
+ stop)
+ [[ $PID ]] && kill $PID &>/dev/null
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ reload)
+ @PREFIX@/sbin/varnish-vcl-reload $VARNISH_CFG
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart|reload}"
+ ;;
+esac
</ins></span></pre>
</div>
</div>
</body>
</html>