Merge pull request #39 from cubedro/develop

Build.sh & eth.sh changes

bin/build.sh

@@ -2,49 +2,26 @@
 
 cd ~
 
+mkdir bin
+mkdir logs
+
 # let's install packages
 sudo apt-get -y update
-sudo apt-get -y install language-pack-en-base
-sudo dpkg-reconfigure locales
-wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -
-sudo add-apt-repository "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.5-binaries main"
+sudo apt-get -y upgrade
 
 # Setup Ethereum repos
 sudo add-apt-repository -y ppa:ethereum/ethereum
 sudo add-apt-repository -y ppa:ethereum/ethereum-dev
 sudo apt-get -y update
-sudo apt-get -y upgrade
 
-sudo apt-get -y install software-properties-common build-essential g++-4.8 git cmake libboost-all-dev automake unzip libgmp-dev libtool libleveldb-dev yasm libminiupnpc-dev libreadline-dev scons libncurses5-dev libcurl4-openssl-dev wget qtbase5-dev qt5-default qtdeclarative5-dev libqt5webkit5-dev libcryptopp-dev libjson-rpc-cpp-dev libmicrohttpd-dev libjsoncpp-dev libargtable2-dev clang-3.5 lldb-3.5 nodejs npm ntp
+sudo apt-get -y install software-properties-common build-essential git unzip wget nodejs npm ntp cloud-utils eth
+
+# add eth symlink
+ln -s /usr/bin/eth ~/bin/eth
 
 # add node symlink
 sudo ln -s /usr/bin/nodejs /usr/bin/node
 
-# create directories structure
-[ ! -d "ethereum" ] && mkdir ethereum # ethereum dir maybe mapped from host machine
-mkdir opt
-mkdir bin
-mkdir logs
-
-# download cpp-ethereum if needed
-cd ethereum
-[ ! -d "cpp-ethereum" ] && git clone --depth=1 --branch develop https://github.com/ethereum/cpp-ethereum
-
-# build ethereum
-cd ~/opt
-mkdir cpp-ethereum-build
-cd cpp-ethereum-build
-cmake ~/ethereum/cpp-ethereum -DHEADLESS=1 -DCMAKE_BUILD_TYPE=Debug
-# cmake ~/ethereum/cpp-ethereum -DHEADLESS=1 -DEVMJIT=1 -DCMAKE_BUILD_TYPE=Debug
-make -j2
-
-# now let's create bin folder in user's home dir and create symlinks to executables
-cd ~
-ln -s ~/opt/cpp-ethereum-build/eth/eth ~/bin/eth
-
-# install cloud-utils to fetch instance meta-data
-sudo apt-get -y install cloud-utils
-
 # add node service
 cd ~/bin
 

bin/eth.sh

@@ -4,5 +4,5 @@ if [[ -f /usr/bin/geth ]];
 then
 	geth -rpc -maxpeers "50" -loglevel "1"
 else
-	eth -b -x 50 -r poc-9.ethdev.com -p 30303 -m off -n off -v 0 -j
+	eth -b -x 50 -r 52.16.188.185 -p 30303 -m off -n off -v 0 -j
 fi

processes.json

@@ -9,7 +9,6 @@
 		"error_file"				: "/home/ubuntu/logs/eth-err.log",
 		"merge_logs"				: false,
 		"watch"						: false,
-		"cron_restart"				: "0 0 * * *",
 		"exec_interpreter"			: "bash",
 		"exec_mode"					: "fork_mode"
 	},
@@ -20,7 +19,7 @@
 		"log_file"					: "/home/ubuntu/logs/node-app-log.log",
 		"out_file"					: "/home/ubuntu/logs/node-app-out.log",
 		"error_file"				: "/home/ubuntu/logs/node-app-err.log",
-		"merge_logs"				: true,
+		"merge_logs"				: false,
 		"watch"						: false,
 		"exec_interpreter"			: "node",
 		"exec_mode"					: "fork_mode",