Merge pull request #283 from FirmlyReality/master

update version and docklet.conf

VERSION

@@ -1 +1 @@
-0.3.0
+0.3.2

conf/docklet.conf.template

@@ -151,22 +151,22 @@
 # PUBLIC_IP=0.0.0.0
 
 # NGINX_CONF: the config path of nginx, default: /etc/nginx
-# NGINX_CONF="/etc/nginx"
+# NGINX_CONF=/etc/nginx
 
 # MASTER_IPS: all master ips in a cente, depart by ','.
 # e.g:192.168.192.191@master1,192.168.192.192@master2
 # you can also add description to each master.
 # e.g:master1_desc="this is master1"
 # defalut:0.0.0.0@docklet
-# MASTER_IPS=""
+# MASTER_IPS=0.0.0.0@docklet
 
 # USER_IP: user listen ip
 # default:0.0.0.0
-# USER_IP=""
+# USER_IP=0.0.0.0
 
 # USER_PORT: user listen port
 # default:9100
-# USER_PORT=""
+# USER_PORT=9100
 
 # AUTH_KEY: the key to request users server from master,
 # or to request master from users server. Please set the

tools/etcd-multi-nodes.sh

@@ -17,12 +17,12 @@ shift
 etcd_1=$1
 index=1
 while [ $# -gt 0 ] ; do
-    h="etcd_$index" 
+    h="etcd_$index"
     if [ $index -eq 1 ] ; then
         CLUSTER="$h=http://$1:2380"
     else
         CLUSTER="$CLUSTER,$h=http://$1:2380"
-    fi 
+    fi
     index=$(($index+1))
     shift
 done
@@ -34,7 +34,7 @@ done
 # -advertise-client-urls        :  tell others what client urls to listen of me
 
 # -initial-cluster-state        :  new means join a new cluster; existing means join an existing cluster
-#                               :  new not means clear 
+#                               :  new not means clear
 
 depdir=${0%/*}
 tempdir=/opt/docklet/local
@@ -44,11 +44,11 @@ tempdir=/opt/docklet/local
 etcd --name $etcdindex \
      --initial-advertise-peer-urls http://$selfip:2380 \
      --listen-peer-urls http://$selfip:2380 \
-     --listen-client-urls http://$selfip:2379 \
+     --listen-client-urls http://$selfip:2379,http://127.0.0.1:2379 \
      --advertise-client-urls http://$selfip:2379 \
      --initial-cluster-token etcd-cluster \
      --initial-cluster $CLUSTER \
-     --initial-cluster-state new 
+     --initial-cluster-state new > $tempdir/log/etcd.log 2>&1 &
 
 etcdpid=$!
 echo "etcd start with pid: $etcdpid and log:$tempdir/log/etcd.log"