← Back to branch summary

~ubuntu-branches/ubuntu/saucy/squid3/saucy-proposed

« back to all changes in this revision

Viewing changes to debian/squid3.upstart

  • Committer: Package Import Robot
  • Author(s): Jamie Strandboge
  • Date: 2012-06-13 09:06:51 UTC
  • Revision ID: package-import@ubuntu.com-20120613090651-pbyrpkzido6sjojh
Tags: 3.1.19-1ubuntu3.1
https://launchpad.net/bugs/986314
https://launchpad.net/bugs/986159
* debian/rules: re-enable all hardening options lost in the
  squid->squid3 transition (LP: #986314)
* debian/squid3.upstart: move ulimit command to script section
  so that it applies to the started squid daemon. Thanks to Timur
  Irmatov (LP: #986159)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/squid3.upstart
47
47
        then
48
48
                /usr/sbin/squid3 $SQUID_ARGS -z -f $CONFIG
49
49
        fi
 
50
end script
 
51
 
 
52
script
 
53
        if [ -f /etc/default/squid3 ]; then
 
54
                . /etc/default/squid3
 
55
        fi
50
56
 
51
57
        umask 027
52
58
        ulimit -n 65535
53
 
end script
54
 
 
55
 
script
56
 
        if [ -f /etc/default/squid3 ]; then
57
 
                . /etc/default/squid3
58
 
        fi
59
 
 
60
59
        exec /usr/sbin/squid3 -N $SQUID_ARGS -f $CONFIG
61
60
end script