← Back to branch summary

~udienz/ubuntu/lucid/nginx/nginx.fix691871

« back to all changes in this revision

Viewing changes to auto/install

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Hahler
  • Date: 2010-03-03 23:50:36 UTC
  • mfrom: (1.1.16 upstream) (4.2.14 sid)
  • Revision ID: james.westby@ubuntu.com-20100303235036-jif3s2b0w3pnvokr
Tags: 0.7.65-1ubuntu1
https://launchpad.net/bugs/531655
* Merge from debian testing. (LP: #531655) 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'.

Show diffs side-by-side

added added

removed removed

Lines of Context:
auto/install
101
101
        cp conf/fastcgi_params \
102
102
                '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params.default'
103
103
 
 
104
        test -f '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi.conf' \
 
105
                || cp conf/fastcgi.conf '\$(DESTDIR)$NGX_CONF_PREFIX'
 
106
        cp conf/fastcgi.conf '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi.conf.default'
 
107
 
104
108
        test -f '\$(DESTDIR)$NGX_CONF_PATH' \
105
109
                || cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PATH'
106
110
        cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX/nginx.conf.default'