Commit 17583c8b authored by Mark Beierl's avatar Mark Beierl
Browse files

Merge branch 'master' into 'master' 

Update squid charm

See merge request !105
parents e2197769 9c012576

magma/squid_cnf/charms/squid/actions/addurl

deleted100755 → 0
+0 −13
Original line number Diff line number Diff line 
#!/bin/bash



URL=`action-get url`



if ! grep -Fxq "http_access allow allowedurls" /etc/squid/squid.conf

then

    sed  -i '/^# And finally deny all .*/i http_access allow allowedurls\n' /etc/squid/squid.conf

fi



sed -i "/^http_access allow allowedurls.*/i acl allowedurls dstdomain \.$URL" /etc/squid/squid.conf



kill -HUP `cat /var/run/squid.pid`

magma/squid_cnf/charms/squid/config.yaml

+1 −5
Original line number Diff line number Diff line 
options:

    image:

        type: string

        description: 'Docker image for squid'

        default: 'domfleischmann/squid-python'

    port:

        type: int

        description: 'Port'

        description: "Port"

        default: 3128

magma/squid_cnf/charms/squid/dispatch

0 → 100755
+3 −0
Original line number Diff line number Diff line 
#!/bin/sh



JUJU_DISPATCH_PATH="${JUJU_DISPATCH_PATH:-$0}" PYTHONPATH=lib:venv ./src/charm.py

magma/squid_cnf/charms/squid/hooks/install

+1 −1
Original line number Diff line number Diff line 
../src/charm.py
 
 No newline at end of file
 
../dispatch
 
 No newline at end of file

magma/squid_cnf/charms/squid/hooks/start

0 → 120000
+1 −0
Original line number Diff line number Diff line 
../dispatch
 
 No newline at end of file