Merge pull request #238 from nolim1t/issue-236

Merged into master as now working

.gitignore

@@ -2,6 +2,9 @@
 
 /.idea
 
+# Don't commit .vagrant
+.vagrant
+
 # Alpine sensitive stuff: Docker key
 key.json
 
@@ -24,9 +27,11 @@ home/lncm/README.*
 # Don't commit LNCM variant build stuff
 lncm-box-*.tar.gz
 *.img
+lncm-box-*.img.zip
 
 # Don't commit work dir
 lncm-workdir/
 
 # Don't apkvol
 *.apkovl.tar.gz
+

etc/apk/arch

@@ -1 +1 @@
-armhf
+aarch64

etc/apk/protected_paths.d/lbu.list

@@ -1,14 +1,15 @@
-+etc/tor/torrc
++etc/motd
 +etc/init.d/lncm
 +etc/init.d/lncm-post
 +etc/init.d/lncm-online
 +etc/init.d/docker-compose
-+etc/init.d/iotwifi
++etc/tor/torrc
 +etc/init.d/avahi-daemon
-+etc/init.d/portainer
++etc/init.d/wpa_supplicant
++etc/init.d/noma
 +etc/init.d/sshd
-+etc/init.d/nginx
-+etc/init.d/wpa_supplicant.alt
++etc/init.d/wpa_supplicant
++home/lncm/.ssh
 +home/lncm/bitcoin
 +home/lncm/litecoin
 +home/lncm/lnd
@@ -21,15 +22,8 @@
 +home/lncm/public_html/wifi/index.html
 +home/lncm/nginx
 +home/lncm/nginx/conf.d
-+home/lncm/.ssh/authorized_keys
-+home/lncm/save_password
-+home/lncm/seed.txt
++home/lncm/.ssh/authorized_key
++etc/ssh/sshd_config
++usr/local/bin/setup-disk.sh
 +usr/local/sbin
-+usr/local/sbin/mana
-+usr/local/sbin/lncm-usb
-+usr/local/sbin/lncm-usb.py
-+usr/local/sbin/lncm-unlock.py
-+usr/local/sbin/check-invoicer-status
-+usr/local/sbin/lncm-createwallet.py
-+usr/local/sbin/lncm-istorprivkeycreated.py
-+usr/local/sbin/lncm-configinvoicer.py
++usr/local/sbin/lncm-getinfo.py

etc/apk/repositories

@@ -1,11 +1,7 @@
 /media/mmcblk0p1/apks
-http://mirror.rise.ph/alpine-linux/v3.8/main
-http://mirror.rise.ph/alpine-linux/v3.8/community
-http://mirror.xtom.com.hk/alpine/v3.8/main
-http://mirror.xtom.com.hk/alpine/v3.8/community
-#http://dl-3.alpinelinux.org/alpine/v3.8/main
-#http://dl-3.alpinelinux.org/alpine/v3.8/community
-#http://dl-5.alpinelinux.org/alpine/v3.8/main
-#http://dl-5.alpinelinux.org/alpine/v3.8/community
-#http://dl-8.alpinelinux.org/alpine/v3.8/main
-#http://dl-8.alpinelinux.org/alpine/v3.8/community
+http://mirror.xtom.com.hk/alpine/v3.10/main
+http://mirror.xtom.com.hk/alpine/v3.10/community
+#http://mirror.xtom.com.hk/alpine/edge/main
+#http://mirror.xtom.com.hk/alpine/edge/community
+#http://mirror.xtom.com.hk/alpine/edge/testing
+

etc/apk/world

@@ -1,7 +1,7 @@
 alpine-base
 avahi
-dbus
-docker
+chrony
 openssh
+openssl
 wireless-tools
 wpa_supplicant

etc/group

@@ -48,5 +48,6 @@ nogroup:x:65533:
 nobody:x:65534:
 avahi:x:86:avahi
 messagebus:x:101:messagebus
-docker:x:102:
+docker:x:102:lncm
 lncm:x:1001:
+chrony:x:101:chrony

etc/init.d/lncm

@@ -12,7 +12,7 @@ start() {
   # This script will only run once, for persistent installation to SD
 
   # LNCM version
-  VER="v0.4.1"
+  VER="v0.5.0"
 
   # apkovl
   APK=box.apkovl.tar.gz
@@ -47,7 +47,6 @@ start() {
 
   install_tools() {
     echo "Add partitioning and filesystem tools"
-    /sbin/setup-apkcache /media/mmcblk0p1/cache && \
     /sbin/apk add parted e2fsprogs
   }
 
@@ -103,8 +102,8 @@ start() {
   setup_user() {
     echo "Create lncm home dir if necessary"
     /bin/mkdir -p /media/sd/home/lncm
-    echo "Set user permissions"
-    /bin/chown lncm:lncm /media/sd/home/lncm
+    echo "Fix user permissions"
+    /bin/chown -R lncm:lncm /media/sd/home/lncm
   }
 
   install_boot() {
@@ -190,7 +189,7 @@ start() {
     setup_user
     install_boot
     mark_sd
-    #create_swap # disable sd card swap
+    create_swap
     enable_post
     disable_install
     persist_state

etc/init.d/lncm-online

@@ -18,17 +18,23 @@ start() {
   }
 
   ONLINE=1
+  COUNT=0
 
-  while [ $ONLINE -eq 1 ]
+  while [ $ONLINE -eq 1 ] && [ $COUNT -lt 10 ]
   do
-      echo "Checking for internet connection..."
+      echo "Checking for internet connection for 10 seconds..."
       net_check
+      COUNT=$((COUNT + 1))
       sleep 1
   done
 
   if [ $ONLINE -eq 0 ]; then
     echo "Connected to internet"
     exit 0
+  else
+    echo "Not connected to internet.. please update wpa_supplicant"
+    echo "and then reboot to continue the setup process"
+    exit 1
   fi
 
   eend $?

etc/init.d/lncm-post

@@ -29,6 +29,41 @@ start() {
     fi
     /sbin/setup-apkcache /var/cache/apk
   }
+
+  install_python3() {
+    echo "Install Python 3 and upgrade PIP"
+    /sbin/apk update && \
+    /sbin/apk add python3 python3-dev
+
+    /usr/bin/pip3 install --upgrade pip 
+  }
+
+  install_utils() {
+    echo "Installing utils (avahi/dbus/curl/jq)"
+    /sbin/apk update && \
+    /sbin/apk add dbus avahi curl jq docker
+  }
+
+  config_avahi() {
+    echo "Configuring Avahi"
+    /sbin/rc-update add dbus boot || echo "Unable to add dbus to boot runlevels"
+    /sbin/rc-update add avahi-daemon boot || echo "Unable to add avahi to boot runlevels"
+    echo "Starting DBUS and AVAHI"
+    /etc/init.d/dbus start || echo "Failed to start dbus"
+    /etc/init.d/avahi-daemon start || echo "Failed to start avahi"
+  }
+
+  config_docker() {
+    echo "Configuring docker"
+    /sbin/rc-update add docker default
+    echo "Starting docker"
+    /etc/init.d/docker start || echo "Failed to start docker"
+  }
+
+  install_alpine_sdk() {
+    echo "Install alpine devtools (used for building)"
+    /sbin/apk add alpine-sdk linux-headers libffi-dev
+  }
 
   install_compose() {
     echo "Install docker-compose and dependencies"
@@ -44,7 +79,7 @@ start() {
     echo "Install Noma dependencies in case user wants to install it"
     /sbin/apk add py3-psutil
     #Uncomment noma for now because noma stop seems to be broken
-    #/usr/bin/pip3 install noma==0.4.5
+    /usr/bin/pip3 install noma==0.5.0
   }
 
   install_toml() {
@@ -148,7 +183,7 @@ start() {
   setup_tor() {
     CHECKTOR_HOSTNAME=1
     # Check to see if Tor generated directory exists
-    while [ ! -d /var/lib/tor/lnd-v3 ] && [ $CHECKTOR_HOSTNAME -lt 10 ];
+    while [ ! -d /var/lib/tor/ssh-v3 ] && [ $CHECKTOR_HOSTNAME -lt 10 ];
     do
       echo "Tor generated directory doesn't exist yet.. waiting";
       CHECKTOR_HOSTNAME=$((CHECKTOR_HOSTNAME+1))
@@ -266,11 +301,6 @@ start() {
     /usr/bin/crontab /home/lncm/crontab
   }
 
-  persist_state() {
-    echo "Backup apkovl.tar.gz to USB storage"
-    /sbin/lbu package /media/important/important/box.apkovl.tar.gz
-  }
-
   disable_post() {
     echo "Remove lncm-post from boot"
     /sbin/rc-update del lncm-post default
@@ -291,29 +321,14 @@ start() {
     fi
 
     move_cache
-    install_compose
-    install_toml
-    install_noma
-    usb_setup
-    verify_usb
-    # Fetch invoicer into path
-    fetch_invoicerconfig
-    fetch_rpcauth
-    check_rpc
-    # Configure invoicer, and services stage
-    generate_rpc
+    install_utils
+    config_docker
+    config_avahi
+    install_alpine_sdk
+    install_python3
     install_tor
     enable_tor
-    setup_tor
-    # Copy into path
-    config_bitcoind
-    config_lnd
-    config_nginx
-    fetch_invoicerui
-    install_crontab
     disable_post
-    enable_compose
-    persist_state
   }
 
   main