Merge pull request #22 from KoalaSat/add-lndg

Fix supervisord

compose/docker-compose.override-lnd.yml

@@ -51,6 +51,7 @@ services:
     restart: always
     container_name: lndg${SUFFIX}
     volumes:
+      - ${LND_CONFIG}:/root/supervisord.conf:ro
       - ${LND_DATA}:/root/.lnd:ro
       - ${LNDG_DATA}:/lndg/data:rw
     depends_on:
@@ -59,7 +60,7 @@ services:
     command:
       - sh
       - -c
-      - python initialize.py -net ${NETWORK} -dir /root/.lnd -rpc 127.0.0.1:${GUEST_LND_RPC_PORT:?} -u ${LNDG_USER:?} -pw ${LNDG_PASSWORD:?} -d && supervisord && python manage.py runserver 0.0.0.0:8889
+      - python initialize.py -net ${NETWORK} -dir /root/.lnd -rpc 127.0.0.1:${GUEST_LND_RPC_PORT:?} -u ${LNDG_USER:?} -pw ${LNDG_PASSWORD:?} -d && supervisord -c /root/supervisord.conf && python manage.py runserver 0.0.0.0:8889
     network_mode: service:tor
 
 # Patch common services

compose/env-sample/lndtn/compose.env

@@ -62,6 +62,7 @@ THUB_ACCOUNTS='./env/lndtn/thunderhub-accounts.yml'
 # THUB_ACCOUNTS_CONFIG_PATH must match thub...env
 THUB_ACCOUNTS_CONFIG_PATH='/config/accounts.yml'
 
+LNDG_CONFIG='/custom_path/testnet/lndg/config'
 LNDG_DATA='/custom_path/testnet/lndg/data'
 LNDG_USER='lndg-admin'
 LNDG_PASSWORD=999999999

compose/env-sample/lndtn/supervisord.conf

@@ -0,0 +1,24 @@
+[supervisord]
+user=root
+childlogdir = /var/log
+logfile = /var/log/supervisord.log
+logfile_maxbytes = 50MB
+logfile_backups = 30
+loglevel = info
+pidfile = /var/supervisord.pid
+umask = 022
+nodaemon = false
+nocleanup = false
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory=supervisor.rpcinterface:make_main_rpcinterface
+
+[program:controller]
+command = sh -c "python controller.py && sleep 15"
+process_name = lndg-controller
+directory = /app
+autorestart = true
+redirect_stderr = true
+stdout_logfile = /var/log/lndg-controller.log
+stdout_logfile_maxbytes = 150MB
+stdout_logfile_backups = 15

compose/env-sample/lndtn/torrc

@@ -17,7 +17,7 @@ HiddenServiceVersion 3
 HiddenServicePort 80 127.0.0.1:80
 
 # Robosats Admin Testnet Onion Service
-HiddenServiceDir /var/lib/tor/satstralia-admin/
+HiddenServiceDir /var/lib/tor/robotest-admin/
 HiddenServiceVersion 3
 HiddenServicePort 80 127.0.0.1:80