unixweb/ttn-resin-gateway-rpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xxx

Browse Source
This commit is contained in:
Ray Ozzie 2016-03-22 15:09:41 -07:00
parent 6e0575d97d
commit 8c0a37dec0
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resin-run.sh
View File

@ -114,6 +114,9 @@ if [[ $GW_SYSTEM_CALLS == "" ]]; then GW_SYSTEM_CALLS="[\"df -m\",\"free -h\",\"
if [[ $GW_PLATFORM == "" ]]; then GW_PLATFORM="\"*\""; fi if [[ $GW_PLATFORM == "" ]]; then GW_PLATFORM="\"*\""; fi
# create local.conf # create local.conf
# \t\t\"server_address\": $GW_SERVER_ADDRESS,\n\
# \t\t\"serv_port_up\": $GW_SERV_PORT_UP,\n\
# \t\t\"serv_port_down\": $GW_SERV_PORT_DOWN,\n\
echo -e "{\n\ echo -e "{\n\
\t\"gateway_conf\": {\n\ \t\"gateway_conf\": {\n\
@ -130,9 +133,6 @@ echo -e "{\n\
\t\t\"ghoststream\": $GW_GHOSTSTREAM,\n\ \t\t\"ghoststream\": $GW_GHOSTSTREAM,\n\
\t\t\"radiostream\": $GW_RADIOSTREAM,\n\ \t\t\"radiostream\": $GW_RADIOSTREAM,\n\
\t\t\"statusstream\": $GW_STATUSSTREAM,\n\ \t\t\"statusstream\": $GW_STATUSSTREAM,\n\
# \t\t\"server_address\": $GW_SERVER_ADDRESS,\n\
# \t\t\"serv_port_up\": $GW_SERV_PORT_UP,\n\
# \t\t\"serv_port_down\": $GW_SERV_PORT_DOWN,\n\
\t\t\"keepalive_interval\": $GW_KEEPALIVE_INTERVAL,\n\ \t\t\"keepalive_interval\": $GW_KEEPALIVE_INTERVAL,\n\
\t\t\"stat_interval\": $GW_STAT_INTERVAL,\n\ \t\t\"stat_interval\": $GW_STAT_INTERVAL,\n\
\t\t\"push_timeout_ms\": $GW_PUSH_TIMEOUT_MS,\n\ \t\t\"push_timeout_ms\": $GW_PUSH_TIMEOUT_MS,\n\

19
resin-run.sh~
View File

@ -58,6 +58,18 @@ else
exit 1 exit 1
fi fi
# fetch location info, which we'll use as a hint to the gateway software
if curl -sS --fail ipinfo.io --output ./ipinfo.json
then
echo "Gateway Location:"
IPINFO=$(cat ./ipinfo.json)
echo $IPINFO
else
echo "Unable to determine gateway location"
IPINFO="\"\""
fi
# set up environmental defaults for local.conf # set up environmental defaults for local.conf
if [[ $GW_GPS == "" ]]; then GW_GPS="true"; fi if [[ $GW_GPS == "" ]]; then GW_GPS="true"; fi
@ -118,9 +130,9 @@ echo -e "{\n\
\t\t\"ghoststream\": $GW_GHOSTSTREAM,\n\ \t\t\"ghoststream\": $GW_GHOSTSTREAM,\n\
\t\t\"radiostream\": $GW_RADIOSTREAM,\n\ \t\t\"radiostream\": $GW_RADIOSTREAM,\n\
\t\t\"statusstream\": $GW_STATUSSTREAM,\n\ \t\t\"statusstream\": $GW_STATUSSTREAM,\n\
\t\t\"server_address\": $GW_SERVER_ADDRESS,\n\ # \t\t\"server_address\": $GW_SERVER_ADDRESS,\n\
\t\t\"serv_port_up\": $GW_SERV_PORT_UP,\n\ # \t\t\"serv_port_up\": $GW_SERV_PORT_UP,\n\
\t\t\"serv_port_down\": $GW_SERV_PORT_DOWN,\n\ # \t\t\"serv_port_down\": $GW_SERV_PORT_DOWN,\n\
\t\t\"keepalive_interval\": $GW_KEEPALIVE_INTERVAL,\n\ \t\t\"keepalive_interval\": $GW_KEEPALIVE_INTERVAL,\n\
\t\t\"stat_interval\": $GW_STAT_INTERVAL,\n\ \t\t\"stat_interval\": $GW_STAT_INTERVAL,\n\
\t\t\"push_timeout_ms\": $GW_PUSH_TIMEOUT_MS,\n\ \t\t\"push_timeout_ms\": $GW_PUSH_TIMEOUT_MS,\n\
@ -139,6 +151,7 @@ echo -e "{\n\
\t\t\"ngrok_path\": $GW_NGROK_PATH,\n\ \t\t\"ngrok_path\": $GW_NGROK_PATH,\n\
\t\t\"system_calls\": $GW_SYSTEM_CALLS,\n\ \t\t\"system_calls\": $GW_SYSTEM_CALLS,\n\
\t\t\"platform\": $GW_PLATFORM,\n\ \t\t\"platform\": $GW_PLATFORM,\n\
\t\t\"ipinfo\": $IPINFO,\n\
\t\t\"gateway_ID\": \"0000000000000000\"\n\ \t\t\"gateway_ID\": \"0000000000000000\"\n\
\t}\n\ \t}\n\
}" >./local_conf.json }" >./local_conf.json