reweave/weave
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

working on bash argument parsing

Browse Source
This commit is contained in:
Paul Bellamy committed 2015-06-01 16:50:52 +01:00
1 parent 74afbc5505
commit d80ffa8ad2
2 files changed
+24 -30
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

proxy/listener.go
-18
View File
@@ -1,18 +0,0 @@
package proxy
import (
"crypto/tls"
"net"
)
func (proxy *Proxy) listener(addr string) (net.Listener, error) {
listener, err := net.Listen("tcp", addr)
if err != nil {
return nil, err
}
if proxy.tlsConfig.enabled() {
listener = tls.NewListener(listener, proxy.tlsConfig.Config)
}
return listener, nil
}
weave
+24 -12
View File
@@ -726,26 +726,38 @@ get_ipam_cidr() {
# weave proxy helpers
######################################################################
# TODO: Handle args with spaces
# TODO: Handle non-absolute paths for certs
# TODO: Handle relative paths for args
proxy_args() {
PROXY_VOLUMES=""
PROXY_ARGS=""
while [ $# -gt 0 ]; do
case $1 in
--tlscacert|--tlscacert=*)
[[ "${1#*=}" != "$1" ]] || shift
PROXY_VOLUMES="$PROXY_VOLUMES -v ${1#--tlscacert=}:/home/weave/tls/ca.pem"
case "$1" in
--tlscacert)
shift
PROXY_VOLUMES="$PROXY_VOLUMES -v $1:/home/weave/tls/ca.pem"
PROXY_ARGS="$PROXY_ARGS --tlscacert /home/weave/tls/ca.pem"
;;
--tlscert|--tlscert=*)
[[ "${1#*=}" != "$1" ]] || shift
PROXY_VOLUMES="$PROXY_VOLUMES -v ${1#--tlscert=}:/home/weave/tls/cert.pem"
--tlscacert=*)
PROXY_VOLUMES="$PROXY_VOLUMES -v ${1#*=}:/home/weave/tls/ca.pem"
PROXY_ARGS="$PROXY_ARGS --tlscacert /home/weave/tls/ca.pem"
;;
--tlscert)
shift
PROXY_VOLUMES="$PROXY_VOLUMES -v $1:/home/weave/tls/cert.pem"
PROXY_ARGS="$PROXY_ARGS --tlscert /home/weave/tls/cert.pem"
;;
--tlskey|--tlskey=*)
[[ "${1#*=}" != "$1" ]] || shift
PROXY_VOLUMES="$PROXY_VOLUMES -v ${1#--tlskey=}:/home/weave/tls/key.pem"
--tlscert=*)
PROXY_VOLUMES="$PROXY_VOLUMES -v ${1#*=}:/home/weave/tls/cert.pem"
PROXY_ARGS="$PROXY_ARGS --tlscert /home/weave/tls/cert.pem"
;;
--tlskey)
shift
PROXY_VOLUMES="$PROXY_VOLUMES -v $1:/home/weave/tls/key.pem"
PROXY_ARGS="$PROXY_ARGS --tlskey /home/weave/tls/key.pem"
;;
--tlskey=*)
PROXY_VOLUMES="$PROXY_VOLUMES -v ${1#*=}:/home/weave/tls/key.pem"
PROXY_ARGS="$PROXY_ARGS --tlskey /home/weave/tls/key.pem"
;;
*)