SatSale

commit 9b4a7e71df64ce5b2fb2ba1b8c5c71fdea990d43
parent 9d16adae8975d8d07f9238f65c1ac25b93d918a9
Author: nickfarrow <nicholas.w.farrow@gmail.com>
Date:   Fri, 12 Nov 2021 19:03:23 +1100

Remove duplicate lines from config - rebase error

Diffstat:
M
config.py
 | 
28
++++++++--------------------

1 file changed, 8 insertions(+), 20 deletions(-)
diff --git a/config.py b/config.py
@@ -33,7 +33,7 @@ tor_proxy = None
 #### Payment method ####
 pay_method = "bitcoind"
 
-#### Lightning ####
+## Lightning 
 # Switch payment_method to lnd if you want to use lightning payments instead. And uncomment lnd_dir.
 #pay_method = "lnd"
 
@@ -44,6 +44,13 @@ pay_method = "bitcoind"
 #lnd_rpcport = "10009"
 #lnd_macaroon = "admin.macaroon"
 
+# Or clightning
+#pay_method = "clightning"
+
+# If remote clightning, make sure `ssh -nNT -L lightning-rpc:{clightning_rpc_file} {tunnel_host}`
+# creates a lightning-rpc unix domain socket
+#clightning_rpc_file = "/home/user/.lightning/lightning-rpc"
+#######################
 
 # Check for payment every xx seconds
 pollrate = 15
@@ -60,25 +67,6 @@ connection_attempts = 3
 # Generic redirect url after payment
 redirect = "https://github.com/nickfarrow/satsale"
 
-#### Payment Nodes ####
-pay_method = "bitcoind"
-
-# Switch payment_method to lnd if you want to use lightning payments instead. And uncomment lnd_dir.
-#pay_method = "lnd"
-# lnd_dir is only needed if you want to copy macaroon and TLS cert locally
-#lnd_dir = "~/.lnd/"
-#lnd_rpcport = "10009"
-#lnd_macaroon = "invoice.macaroon"
-#lnd_cert = "tls.cert"
-
-# Or clightning
-#pay_method = "clightning"
-
-# If remote clightning, make sure `ssh -nNT -L lightning-rpc:{clightning_rpc_file} {tunnel_host}`
-# creates a lightning-rpc unix domain socket
-#clightning_rpc_file = "/home/user/.lightning/lightning-rpc"
-#######################
-
 # Lightning Address e.g. name@you.satsale.domain (think this requires https url)
 lightning_address = None
 lightning_address_comment = None # Defaults to: "Thank you for your support <3"