Date: Tue, 13 Oct 2009 21:21:54 -0700 From: Doug Barton <dougb@FreeBSD.org> To: =?UTF-8?B?RGFnLUVybGluZyBTbcO4cmdyYXY=?= <des@des.no> Cc: cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/www/varnish Makefile ports/www/varnish/files pkg-message.in varnishd.in varnishlog.in varnishncsa.in Message-ID: <4AD551E2.3010407@FreeBSD.org> In-Reply-To: <86iqeietvu.fsf@ds4.des.no> References: <200910131851.n9DIpB7P057665@repoman.freebsd.org> <4AD4DE92.3090808@FreeBSD.org> <86iqeietvu.fsf@ds4.des.no>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------040500040604070704010609 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dag-Erling Smørgrav wrote: > Doug Barton <dougb@FreeBSD.org> writes: >> Also in varnishd, the test for the existence of $varnishd_config >> should really be encased in a pre_start method since that's the only >> time it's relevant (unless I'm missing something). > > When does pre_start run? um, before start? :) After load_rc_config is what I think you're getting at. It's run as part of run_rc_command. > Does your patch allow the user to override > varnishd_flags? Good point. I added that to the attached version. Doug -- Improve the effectiveness of your Internet presence with a domain name makeover! http://SupersetSolutions.com/ --------------040500040604070704010609 Content-Type: text/plain; name="varnishd.in-diff" Content-Transfer-Encoding: base64 Content-Disposition: inline; filename="varnishd.in-diff" SW5kZXg6IHZhcm5pc2hkLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL3BjdnMv cG9ydHMvd3d3L3Zhcm5pc2gvZmlsZXMvdmFybmlzaGQuaW4sdgpyZXRyaWV2aW5nIHJldmlz aW9uIDEuNwpkaWZmIC11IC1yMS43IHZhcm5pc2hkLmluCi0tLSB2YXJuaXNoZC5pbgkxMyBP Y3QgMjAwOSAxODo1MToxMCAtMDAwMAkxLjcKKysrIHZhcm5pc2hkLmluCTE0IE9jdCAyMDA5 IDA0OjEzOjQ4IC0wMDAwCkBAIC00LDcgKzQsNyBAQAogIwogCiAjIFBST1ZJREU6IHZhcm5p c2hkCi0jIFJFUVVJUkU6IERBRU1PTgorIyBSRVFVSVJFOiBMT0dJTgogIyBLRVlXT1JEOiBz aHV0ZG93bgogCiAjCkBAIC0zNCwxNSArMzQsMTggQEAKICMgdmFybmlzaGRfc3RvcmFnZSAt IHN0b3JhZ2UgbWV0aG9kIGFuZCBwYXJhbWV0ZXJzLgogIwlkZWZhdWx0OiAiZmlsZSwvdG1w LDUwJSIKICMKLSMgdmFybmlzaGRfdXNlciAtIHVucHJpdmlsZWdlZCB1c2VyIGZvciB0aGUg Y2hpbGQgcHJvY2Vzcy4KKyMgdmFybmlzaGRfdWlkIC0gdW5wcml2aWxlZ2VkIHVzZXIgZm9y IHRoZSBjaGlsZCBwcm9jZXNzLgogIwlkZWZhdWx0OiAid3d3IgogIwotIyB2YXJuaXNoZF9n cm91cCAtIHVucHJpdmlsZWdlZCBncm91cCBmb3IgdGhlIGNoaWxkIHByb2Nlc3MuCisjIHZh cm5pc2hkX2dpZCAtIHVucHJpdmlsZWdlZCBncm91cCBmb3IgdGhlIGNoaWxkIHByb2Nlc3Mu CiAjCWRlZmF1bHQ6ICJ3d3ciCiAjCiAjIHZhcm5pc2hkX2ZsYWdzIC0gY29tcGxldGUgY29t bWFuZCBsaW5lIGFyZ3VtZW50cy4KLSMJZGVmYXVsdCBpZiB2YXJuaXNoZF9jb25maWcgaXMg dW5zZXQ6ICItUCAke3Zhcm5pc2hkX3BpZGZpbGV9IC1hICR7dmFybmlzaGRfbGlzdGVufSAt VCAke3Zhcm5pc2hkX2FkbWlufSAtYiAke3Zhcm5pc2hkX2JhY2tlbmR9IC1zICR7dmFybmlz aGRfc3RvcmFnZX0gLXUgJHt2YXJuaXNoZF91c2VyfSAtZyAke3Zhcm5pc2hkX2dyb3VwfSIK LSMJZGVmYXVsdCBpZiB2YXJuaXNoZF9jb25maWcgaXMgc2V0OiAiLVAgJHt2YXJuaXNoZF9w aWRmaWxlfSAtYSAke3Zhcm5pc2hkX2xpc3Rlbn0gLVQgJHt2YXJuaXNoZF9hZG1pbn0gLWYg JHt2YXJuaXNoZF9jb25maWd9IC1zICR7dmFybmlzaGRfc3RvcmFnZX0gLXUgJHt2YXJuaXNo ZF91c2VyfSAtZyAke3Zhcm5pc2hkX2dyb3VwfSIKKyMJQ29tbW9uIGZsYWdzOgktUCAke3Zh cm5pc2hkX3BpZGZpbGV9IC1hICR7dmFybmlzaGRfbGlzdGVufQorIwkJCS1UICR7dmFybmlz aGRfYWRtaW59IC1zICR7dmFybmlzaGRfc3RvcmFnZX0KKyMJCQktdSAke3Zhcm5pc2hkX3Vp ZH0gLWcgJHt2YXJuaXNoZF9naWR9CisjIGRlZmF1bHQgaWYgdmFybmlzaGRfY29uZmlnIGlz IHVuc2V0OiAiPENvbW1vbiBmbGFncz4gLWIgJHt2YXJuaXNoZF9iYWNrZW5kfSIKKyMgZGVm YXVsdCBpZiB2YXJuaXNoZF9jb25maWcgaXMgc2V0OiAgICI8Q29tbW9uIGZsYWdzPiAtZiAk e3Zhcm5pc2hkX2NvbmZpZ30iCiAjCiAjIFNlZSB2YXJuaXNoZCgxKSBmb3IgYSBkZXRhaWxl ZCBvdmVydmlldyBvZiBjb21tYW5kLWxpbmUgb3B0aW9ucy4KICMKQEAgLTU0LDYgKzU3LDIz IEBACiAKIGNvbW1hbmQ9IiUlUFJFRklYJSUvc2Jpbi8ke25hbWV9IgogCitzdGFydF9wcmVj bWQ9JHtuYW1lfV9wcmVzdGFydAorCit2YXJuaXNoZF9wcmVzdGFydCgpCit7CisJWyAtbiAi JHZhcm5pc2hkX2ZsYWdzIiBdICYmIHJldHVybiAKKworCWxvY2FsIGNvbW1vbgorCisJY29t bW9uPSItUCAke3Zhcm5pc2hkX3BpZGZpbGV9IC1hICR7dmFybmlzaGRfbGlzdGVufSAtVCAk e3Zhcm5pc2hkX2FkbWlufSAtcyAke3Zhcm5pc2hkX3N0b3JhZ2V9IC11ICR7dmFybmlzaGRf dWlkfSAtZyAke3Zhcm5pc2hkX2dyb3VwfSIKKworCWlmIFsgLW4gIiR7dmFybmlzaGRfY29u ZmlnfSIgXSA7IHRoZW4KKwkJdmFybmlzaGRfZmxhZ3M9IiRjb21tb24gLWYgJHt2YXJuaXNo ZF9jb25maWd9IgorCWVsc2UKKwkJdmFybmlzaGRfZmxhZ3M9IiRjb21tb24gLWIgJHt2YXJu aXNoZF9iYWNrZW5kfSIKKwlmaQorfQorCiAjIHJlYWQgY29uZmlndXJhdGlvbiBhbmQgc2V0 IGRlZmF1bHRzCiBsb2FkX3JjX2NvbmZpZyAke25hbWV9CiA6ICR7dmFybmlzaGRfZW5hYmxl Oj0iTk8ifQpAQCAtNjMsMTggKzgzLDggQEAKIDogJHt2YXJuaXNoZF9iYWNrZW5kOj0ibG9j YWxob3N0OjgwODAifQogOiAke3Zhcm5pc2hkX2NvbmZpZzo9IiJ9CiA6ICR7dmFybmlzaGRf c3RvcmFnZTo9ImZpbGUsL3RtcCw1MCUifQotOiAke3Zhcm5pc2hkX3VzZXI6PSJ3d3cifQot OiAke3Zhcm5pc2hkX2dyb3VwOj0id3d3In0KLWlmIFsgLW4gIiR7dmFybmlzaGRfY29uZmln fSIgXSA7IHRoZW4KLQk6ICR7dmFybmlzaGRfZmxhZ3M6PSItUCAke3Zhcm5pc2hkX3BpZGZp bGV9IC1hICR7dmFybmlzaGRfbGlzdGVufSAtVCAke3Zhcm5pc2hkX2FkbWlufSAtZiAke3Zh cm5pc2hkX2NvbmZpZ30gLXMgJHt2YXJuaXNoZF9zdG9yYWdlfSAtdSAke3Zhcm5pc2hkX3Vz ZXJ9IC1nICR7dmFybmlzaGRfZ3JvdXB9In0KLWVsc2UKLQk6ICR7dmFybmlzaGRfZmxhZ3M6 PSItUCAke3Zhcm5pc2hkX3BpZGZpbGV9IC1hICR7dmFybmlzaGRfbGlzdGVufSAtVCAke3Zh cm5pc2hkX2FkbWlufSAtYiAke3Zhcm5pc2hkX2JhY2tlbmR9IC1zICR7dmFybmlzaGRfc3Rv cmFnZX0gLXUgJHt2YXJuaXNoZF91c2VyfSAtZyAke3Zhcm5pc2hkX2dyb3VwfSJ9Ci1maQot Ci0jIElmIHdlIGxlYXZlIHRoZXNlIHNldCwgcmMuc3ViciB3aWxsIHN1IHRvIHRoZW0gYmVm b3JlIHN0YXJ0aW5nCi0jIHZhcm5pc2hkLCB3aGljaCBpcyBub3Qgd2hhdCB3ZSB3YW50Lgot dW5zZXQgdmFybmlzaGRfdXNlcgotdW5zZXQgdmFybmlzaGRfZ3JvdXAKKzogJHt2YXJuaXNo ZF91aWQ6PSJ3d3cifQorOiAke3Zhcm5pc2hkX2dpZDo9Ind3dyJ9CiAKIHBpZGZpbGU9IiR7 dmFybmlzaGRfcGlkZmlsZX0iCiBydW5fcmNfY29tbWFuZCAiJDEiCg== --------------040500040604070704010609--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4AD551E2.3010407>