~ubuntu-branches/ubuntu/natty/nginx/natty

Viewing all changes in revision 34.

  • Committer: Bazaar Package Importer
  • Author(s): Mikhail Turov
  • Date: 2010-08-16 22:52:17 UTC
  • mfrom: (4.2.23 sid)
  • Revision ID: james.westby@ubuntu.com-20100816225217-cntm1hyeqsbj7111
Tags: 0.7.67-3ubuntu1
* Merge from debian testing. (LP: #616685) Remaining changes:
  - 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.
  - Install html files.
    - debian/dirs: Add 'var/www/nginx-default'.
    - debian/nginx.install: Add 'html/* var/www/nginx-default'.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: