~ubuntu-branches/ubuntu/oneiric/lighttpd/oneiric

« back to all changes in this revision

Viewing changes to debian/conf-available/90-debian-doc.conf

  • Committer: Bazaar Package Importer
  • Author(s): Bhavani Shankar
  • Date: 2010-11-21 12:09:27 UTC
  • mfrom: (6.1.12 sid)
  • Revision ID: james.westby@ubuntu.com-20101121120927-7tlcueke98p0y25r
Tags: 1.4.28-2ubuntu1
* Merge from debian unstable. Remaining changes:
  - debian/control:
    + libgamin-dev rather than libfam-dev to fix startup warning.
    + debhelper Build-depends bumped to (>= 7.0.50) for
      overrides in rules file.
  - debian/index.html: s/Debian/Ubuntu/g branding on the default page.
  - Added a UFW profile set:
    + debian/lighttpd.dirs: added etc/ufw/applications.d
    + debian/rules: install the ufw profile.
    + debian/control: Suggests on ufw.
  - Add lighttpd-dev package:
    + debian/control: Added lighttpd-dev package; Build-depends on
      automake, libtool
    + debian/lighttpd-dev.install: Added.
  - debian/rules:
    + Add override_dh_installinit to set "defaults 91 09" to not start
      before apache2 but in the same runlevel with the same priority.
  - debian/patches/build-dev-package.patch: Updated
  - debian/lighttpd.conf: Comment 'use-ipv6.pl' by default, which causes
    failure to bind port in ipv4 (LP: #551211)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
#### handle Debian Policy Manual, Section 11.5. urls
2
2
## by default allow them only from localhost
3
 
## (This must come last due to #445459)
4
 
## Note: =~ "127.0.0.1" works with ipv6 enabled, whereas == "127.0.0.1" doesn't
5
 
$HTTP["remoteip"] =~ "127.0.0.1" {
 
3
$HTTP["remoteip"] =~ "^127\.0\.0\.1$|^::1$" {
6
4
        alias.url += (
7
5
                "/cgi-bin/" => "/usr/lib/cgi-bin/",
8
6
                "/doc/" => "/usr/share/doc/",