~ubuntu-branches/ubuntu/lucid/nginx/lucid

Viewing all changes in revision 28.

  • Committer: Bazaar Package Importer
  • Author(s): Andres Rodriguez
  • Date: 2009-11-30 13:34:00 UTC
  • mfrom: (1.1.14 upstream) (4.2.10 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091130133400-n0ux4igma2y3y0pl
Tags: 0.7.63-1ubuntu1
* Merge from debian testing (LP: #490450), remaining changes:
  - Install html files.
    - debian/dirs: Add 'var/www/nginx-default'.
    - debian/nginx.install: Add 'html/* var/www/nginx-default'.
  - Added a UFW profile set: (LP: #308695)
    + debian/nginx.ufw.profile: Added.
    + debian/control: nginx: Suggests ufw.
    + debian/dirs: Added 'etc/ufw/applications.d'
    + debian/rules: Added install rule for the nginx UFW profile. 

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: