~cyphermox/ubuntu/lucid/nginx/merge_0.7.64-2_lp513099

« back to all changes in this revision

Viewing changes to debian/init.d

  • Committer: Mathieu Trudel
  • Date: 2010-01-27 05:47:18 UTC
  • mfrom: (4.2.12 sid)
  • Revision ID: mathieu-tl@ubuntu.com-20100127054718-2z2fcb30lytvowp1
* Merge from debian testing (LP: #513099), remaining changes:
  - Install html files.
    - debian/dirs: Add 'var/www/nginx-default'.
    - debian/nginx.install: Add 'html/* var/www/nginx-default'.
  - Add a UFW profile set: 
    + debian/nginx.ufw.profile: Added.
    + debian/control: nginx: Suggests ufw.
    + debian/dirs: Add 'etc/ufw/applications.d'
    + debian/rules: Add install rule for the nginx UFW profile.
* Fixes CVE-2009-3555, as per changelog entry in 0.7.64-1. (LP: #511681)

Show diffs side-by-side

added added

removed removed

Lines of Context:
27
27
. /lib/lsb/init-functions
28
28
 
29
29
test_nginx_config() {
30
 
  if nginx -t
 
30
  if nginx -t $DAEMON_OPTS
31
31
  then
32
32
    return 0
33
33
  else