Merge "Fix sourcing of proxy related environment variables"
This commit is contained in:
commit
d4219e4c40
@ -1,3 +1,7 @@
|
||||
#!/bin/bash
|
||||
test -f /home/ubuntu/.juju-proxy && source /home/ubuntu/.juju-proxy
|
||||
if [ -f /etc/juju-proxy.conf ]; then
|
||||
source /etc/juju-proxy.conf
|
||||
elif [ -f /home/ubuntu/.juju-proxy ]; then
|
||||
source /home/ubuntu/.juju-proxy
|
||||
fi
|
||||
exec /usr/share/glance-simplestreams-sync/glance-simplestreams-sync.py
|
||||
|
Loading…
Reference in New Issue
Block a user