Date: Tue, 13 Oct 2009 13:09:54 -0700 From: Doug Barton <dougb@FreeBSD.org> To: Dag-Erling Smorgrav <des@FreeBSD.org> 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: <4AD4DE92.3090808@FreeBSD.org> In-Reply-To: <200910131851.n9DIpB7P057665@repoman.freebsd.org> References: <200910131851.n9DIpB7P057665@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------080707040407050708030103 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Dag-Erling Smorgrav wrote: > des 2009-10-13 18:51:11 UTC > > FreeBSD ports repository > > Modified files: > www/varnish Makefile > www/varnish/files varnishd.in varnishlog.in varnishncsa.in > Added files: > www/varnish/files pkg-message.in > Log: > Reorganize the rc scripts; there were several things about the old ones > that simply didn't make sense. Add a pkg-message containing a very brief > quick-start guide and a warning to existing users about the rc changes. > > Revision Changes Path > 1.28 +6 -0 ports/www/varnish/Makefile > 1.1 +18 -0 ports/www/varnish/files/pkg-message.in (new) > 1.7 +49 -21 ports/www/varnish/files/varnishd.in > 1.5 +23 -13 ports/www/varnish/files/varnishlog.in > 1.3 +23 -13 ports/www/varnish/files/varnishncsa.in > > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/www/varnish/Makefile.diff?&r1=1.27&r2=1.28&f=h > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/www/varnish/files/pkg-message.in > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/www/varnish/files/varnishd.in.diff?&r1=1.6&r2=1.7&f=h > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/www/varnish/files/varnishlog.in.diff?&r1=1.4&r2=1.5&f=h > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/www/varnish/files/varnishncsa.in.diff?&r1=1.2&r2=1.3&f=h Overall the scripts now look quite good. :) I have a few notes, only the first of which is really significant. Since the varnishd script uses a specific user and group it should REQUIRE: LOGIN rather than DAEMON. In fact, unless there is a good reason to start before LOGIN we generally prefer that all ports scripts REQUIRE it. 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). I've also simplified it a bit to make it more clear what is different. If there is some reason that the command line flags have to be in a certain order I'm sure you can adapt it as you like. I'd also suggest using varnishd_[ug]id instead of _user and _group, since as you point out rc.subr special cases those two variables. I used _uid in rc.d/named to good effect. hth, Doug -- Improve the effectiveness of your Internet presence with a domain name makeover! http://SupersetSolutions.com/ --------------080707040407050708030103 Content-Type: text/plain; name="varnish-rcd.diff" Content-Transfer-Encoding: base64 Content-Disposition: inline; filename="varnish-rcd.diff" SW5kZXg6IHZhcm5pc2hkLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL3BjdnMv cG9ydHMvd3d3L3Zhcm5pc2gvZmlsZXMvdmFybmlzaGQuaW4sdgpyZXRyaWV2aW5nIHJldmlz aW9uIDEuNwpkaWZmIC11IC1yMS43IHZhcm5pc2hkLmluCi0tLSB2YXJuaXNoZC5pbgkxMyBP Y3QgMjAwOSAxODo1MToxMCAtMDAwMAkxLjcKKysrIHZhcm5pc2hkLmluCTEzIE9jdCAyMDA5 IDIwOjA4OjQxIC0wMDAwCkBAIC00LDcgKzQsNyBAQAogIwogCiAjIFBST1ZJREU6IHZhcm5p c2hkCi0jIFJFUVVJUkU6IERBRU1PTgorIyBSRVFVSVJFOiBMT0dJTgogIyBLRVlXT1JEOiBz aHV0ZG93bgogCiAjCkBAIC0zNCwxNSArMzQsMTggQEAKICMgdmFybmlzaGRfc3RvcmFnZSAt IHN0b3JhZ2UgbWV0aG9kIGFuZCBwYXJhbWV0ZXJzLgogIwlkZWZhdWx0OiAiZmlsZSwvdG1w LDUwJSIKICMKLSMgdmFybmlzaGRfdXNlciAtIHVucHJpdmlsZWdlZCB1c2VyIGZvciB0aGUg Y2hpbGQgcHJvY2Vzcy4KKyMgdmFybmlzaGRfdWlkIC0gdW5wcml2aWxlZ2VkIHVzZXIgZm9y IHRoZSBjaGlsZCBwcm9jZXNzLgogIwlkZWZhdWx0OiAid3d3IgogIwotIyB2YXJuaXNoZF9n cm91cCAtIHVucHJpdmlsZWdlZCBncm91cCBmb3IgdGhlIGNoaWxkIHByb2Nlc3MuCisjIHZh cm5pc2hkX2dpZCAtIHVucHJpdmlsZWdlZCBncm91cCBmb3IgdGhlIGNoaWxkIHByb2Nlc3Mu CiAjCWRlZmF1bHQ6ICJ3d3ciCiAjCiAjIHZhcm5pc2hkX2ZsYWdzIC0gY29tcGxldGUgY29t bWFuZCBsaW5lIGFyZ3VtZW50cy4KLSMJZGVmYXVsdCBpZiB2YXJuaXNoZF9jb25maWcgaXMg dW5zZXQ6ICItUCAke3Zhcm5pc2hkX3BpZGZpbGV9IC1hICR7dmFybmlzaGRfbGlzdGVufSAt VCAke3Zhcm5pc2hkX2FkbWlufSAtYiAke3Zhcm5pc2hkX2JhY2tlbmR9IC1zICR7dmFybmlz aGRfc3RvcmFnZX0gLXUgJHt2YXJuaXNoZF91c2VyfSAtZyAke3Zhcm5pc2hkX2dyb3VwfSIK LSMJZGVmYXVsdCBpZiB2YXJuaXNoZF9jb25maWcgaXMgc2V0OiAiLVAgJHt2YXJuaXNoZF9w aWRmaWxlfSAtYSAke3Zhcm5pc2hkX2xpc3Rlbn0gLVQgJHt2YXJuaXNoZF9hZG1pbn0gLWYg JHt2YXJuaXNoZF9jb25maWd9IC1zICR7dmFybmlzaGRfc3RvcmFnZX0gLXUgJHt2YXJuaXNo ZF91c2VyfSAtZyAke3Zhcm5pc2hkX2dyb3VwfSIKKyMJQ29tbW9uIGZsYWdzOgktUCAke3Zh cm5pc2hkX3BpZGZpbGV9IC1hICR7dmFybmlzaGRfbGlzdGVufQorIwkJCS1UICR7dmFybmlz aGRfYWRtaW59IC1zICR7dmFybmlzaGRfc3RvcmFnZX0KKyMJCQktdSAke3Zhcm5pc2hkX3Vp ZH0gLWcgJHt2YXJuaXNoZF9naWR9CisjIGRlZmF1bHQgaWYgdmFybmlzaGRfY29uZmlnIGlz IHVuc2V0OiAiPENvbW1vbiBmbGFncz4gLWIgJHt2YXJuaXNoZF9iYWNrZW5kfSIKKyMgZGVm YXVsdCBpZiB2YXJuaXNoZF9jb25maWcgaXMgc2V0OiAgICI8Q29tbW9uIGZsYWdzPiAtZiAk e3Zhcm5pc2hkX2NvbmZpZ30iCiAjCiAjIFNlZSB2YXJuaXNoZCgxKSBmb3IgYSBkZXRhaWxl ZCBvdmVydmlldyBvZiBjb21tYW5kLWxpbmUgb3B0aW9ucy4KICMKQEAgLTU0LDYgKzU3LDIx IEBACiAKIGNvbW1hbmQ9IiUlUFJFRklYJSUvc2Jpbi8ke25hbWV9IgogCitzdGFydF9wcmVj bWQ9JHtuYW1lfV9wcmVzdGFydAorCit2YXJuaXNoZF9wcmVzdGFydCgpCit7CisJbG9jYWwg Y29tbW9uCisKKwljb21tb249Ii1QICR7dmFybmlzaGRfcGlkZmlsZX0gLWEgJHt2YXJuaXNo ZF9saXN0ZW59IC1UICR7dmFybmlzaGRfYWRtaW59IC1zICR7dmFybmlzaGRfc3RvcmFnZX0g LXUgJHt2YXJuaXNoZF91aWR9IC1nICR7dmFybmlzaGRfZ3JvdXB9IgorCisJaWYgWyAtbiAi JHt2YXJuaXNoZF9jb25maWd9IiBdIDsgdGhlbgorCQl2YXJuaXNoZF9mbGFncz0iJGNvbW1v biAtZiAke3Zhcm5pc2hkX2NvbmZpZ30iCisJZWxzZQorCQl2YXJuaXNoZF9mbGFncz0iJGNv bW1vbiAtYiAke3Zhcm5pc2hkX2JhY2tlbmR9IgorCWZpCit9CisKICMgcmVhZCBjb25maWd1 cmF0aW9uIGFuZCBzZXQgZGVmYXVsdHMKIGxvYWRfcmNfY29uZmlnICR7bmFtZX0KIDogJHt2 YXJuaXNoZF9lbmFibGU6PSJOTyJ9CkBAIC02MywxOCArODEsOCBAQAogOiAke3Zhcm5pc2hk X2JhY2tlbmQ6PSJsb2NhbGhvc3Q6ODA4MCJ9CiA6ICR7dmFybmlzaGRfY29uZmlnOj0iIn0K IDogJHt2YXJuaXNoZF9zdG9yYWdlOj0iZmlsZSwvdG1wLDUwJSJ9Ci06ICR7dmFybmlzaGRf dXNlcjo9Ind3dyJ9Ci06ICR7dmFybmlzaGRfZ3JvdXA6PSJ3d3cifQotaWYgWyAtbiAiJHt2 YXJuaXNoZF9jb25maWd9IiBdIDsgdGhlbgotCTogJHt2YXJuaXNoZF9mbGFnczo9Ii1QICR7 dmFybmlzaGRfcGlkZmlsZX0gLWEgJHt2YXJuaXNoZF9saXN0ZW59IC1UICR7dmFybmlzaGRf YWRtaW59IC1mICR7dmFybmlzaGRfY29uZmlnfSAtcyAke3Zhcm5pc2hkX3N0b3JhZ2V9IC11 ICR7dmFybmlzaGRfdXNlcn0gLWcgJHt2YXJuaXNoZF9ncm91cH0ifQotZWxzZQotCTogJHt2 YXJuaXNoZF9mbGFnczo9Ii1QICR7dmFybmlzaGRfcGlkZmlsZX0gLWEgJHt2YXJuaXNoZF9s aXN0ZW59IC1UICR7dmFybmlzaGRfYWRtaW59IC1iICR7dmFybmlzaGRfYmFja2VuZH0gLXMg JHt2YXJuaXNoZF9zdG9yYWdlfSAtdSAke3Zhcm5pc2hkX3VzZXJ9IC1nICR7dmFybmlzaGRf Z3JvdXB9In0KLWZpCi0KLSMgSWYgd2UgbGVhdmUgdGhlc2Ugc2V0LCByYy5zdWJyIHdpbGwg c3UgdG8gdGhlbSBiZWZvcmUgc3RhcnRpbmcKLSMgdmFybmlzaGQsIHdoaWNoIGlzIG5vdCB3 aGF0IHdlIHdhbnQuCi11bnNldCB2YXJuaXNoZF91c2VyCi11bnNldCB2YXJuaXNoZF9ncm91 cAorOiAke3Zhcm5pc2hkX3VpZDo9Ind3dyJ9Cis6ICR7dmFybmlzaGRfZ2lkOj0id3d3In0K IAogcGlkZmlsZT0iJHt2YXJuaXNoZF9waWRmaWxlfSIKIHJ1bl9yY19jb21tYW5kICIkMSIK SW5kZXg6IHZhcm5pc2hsb2cuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2hvbWUvcGN2 cy9wb3J0cy93d3cvdmFybmlzaC9maWxlcy92YXJuaXNobG9nLmluLHYKcmV0cmlldmluZyBy ZXZpc2lvbiAxLjUKZGlmZiAtdSAtcjEuNSB2YXJuaXNobG9nLmluCi0tLSB2YXJuaXNobG9n LmluCTEzIE9jdCAyMDA5IDE4OjUxOjEwIC0wMDAwCTEuNQorKysgdmFybmlzaGxvZy5pbgkx MyBPY3QgMjAwOSAyMDowODo0MSAtMDAwMApAQCAtNCw3ICs0LDcgQEAKICMKIAogIyBQUk9W SURFOiB2YXJuaXNobG9nCi0jIFJFUVVJUkU6IERBRU1PTgorIyBSRVFVSVJFOiBMT0dJTgog IyBLRVlXT1JEOiBzaHV0ZG93bgogCiAjCkluZGV4OiB2YXJuaXNobmNzYS5pbgo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09ClJDUyBmaWxlOiAvaG9tZS9wY3ZzL3BvcnRzL3d3dy92YXJuaXNoL2ZpbGVzL3Zh cm5pc2huY3NhLmluLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjMKZGlmZiAtdSAtcjEuMyB2 YXJuaXNobmNzYS5pbgotLS0gdmFybmlzaG5jc2EuaW4JMTMgT2N0IDIwMDkgMTg6NTE6MTAg LTAwMDAJMS4zCisrKyB2YXJuaXNobmNzYS5pbgkxMyBPY3QgMjAwOSAyMDowODo0MSAtMDAw MApAQCAtNCw3ICs0LDcgQEAKICMKIAogIyBQUk9WSURFOiB2YXJuaXNobmNzYQotIyBSRVFV SVJFOiBEQUVNT04KKyMgUkVRVUlSRTogTE9HSU4KICMgS0VZV09SRDogc2h1dGRvd24KIAog Iwo= --------------080707040407050708030103--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4AD4DE92.3090808>