Merge #295: Remove deprecated nanopos & lightning-charge

79f4723 lightning-charge: remove package and module (Jonas Nick)
58de79d nanopos: remove package and module (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 79f4723

Tree-SHA512: 853022697966159a3d1d32317b2d2e11d1f3d1f014956cf8ca72d12b30c8990a097ae17e2a11bcd666ade798695787a28f75fee1b42b21ac4bbe0d9875d112a2

README.md

@@ -68,8 +68,6 @@ NixOS modules
   * [electrs](https://github.com/romanz/electrs)
   * [btcpayserver](https://github.com/btcpayserver/btcpayserver)
   * [liquid](https://github.com/elementsproject/elements)
-  * [lightning charge](https://github.com/ElementsProject/lightning-charge) (deprecated)
-  * [nanopos](https://github.com/ElementsProject/nanopos) (deprecated)
   * [Lightning Loop](https://github.com/lightninglabs/loop)
   * [JoinMarket](https://github.com/joinmarket-org/joinmarket-clientserver)
   * [recurring-donations](modules/recurring-donations.nix): for periodic lightning payments

examples/configuration.nix

@@ -101,22 +101,9 @@
   # tool run as user operator.
   # services.liquidd.enable = true;
 
-  ### LIGHTNING CHARGE
-  # Enable this module to use lightning-charge, a simple drop-in solution for
-  # accepting lightning payments.
-  # Automatically enables clightning.
-  # services.lightning-charge.enable = true;
-
-  ### NANOPOS
-  # Enable this module to use nanopos, a simple Lightning point-of-sale
-  # system, powered by Lightning Charge.
-  # Automatically enables lightning-charge.
-  # services.nanopos.enable = true;
-
   ### WEBINDEX
   # Enable this module to use the nix-bitcoin-webindex, a simple website
-  # displaying your node information and link to nanopos store. Only available
-  # if clightning, lightning-charge, and nanopos are enabled.
+  # displaying your node information. Only available if clightning is enabled.
   # services.nix-bitcoin-webindex.enable = true;
 
   ### RECURRING-DONATIONS

modules/backups.nix

@@ -15,7 +15,6 @@ let
     ${optionalString (!cfg.with-bulk-data) "- ${config.services.liquidd.dataDir}/*/chainstate"}
     ${config.services.liquidd.dataDir}
     ${optionalString cfg.with-bulk-data "${config.services.electrs.dataDir}"}
-    ${config.services.lightning-charge.dataDir}
     ${config.services.nbxplorer.dataDir}
     ${config.services.btcpayserver.dataDir}
     ${config.services.joinmarket.dataDir}

modules/default.nix

@@ -4,9 +4,7 @@
   clightning = ./clightning.nix;
   default = ./default.nix;
   electrs = ./electrs.nix;
-  lightning-charge = ./lightning-charge.nix;
   liquid = ./liquid.nix;
-  nanopos = ./nanopos.nix;
   presets.secure-node = ./presets/secure-node.nix;
   nix-bitcoin-webindex = ./nix-bitcoin-webindex.nix;
   spark-wallet = ./spark-wallet.nix;

modules/modules.nix

@@ -11,8 +11,6 @@ with lib;
     ./bitcoind.nix
     ./clightning.nix
     ./clightning-plugins
-    ./lightning-charge.nix
-    ./nanopos.nix
     ./spark-wallet.nix
     ./lnd.nix
     ./lightning-loop.nix

modules/netns-isolation.nix

@@ -217,14 +217,6 @@ in {
         id = 17;
         # communicates with clightning over lightning-rpc socket
       };
-      lightning-charge = {
-        id = 18;
-        # communicates with clightning over lightning-rpc socket
-      };
-      nanopos = {
-        id = 19;
-        connections = [ "nginx" "lightning-charge" ];
-      };
       recurring-donations = {
         id = 20;
         # communicates with clightning over lightning-rpc socket
@@ -286,13 +278,6 @@ in {
       extraArgs = "--no-tls";
     };
 
-    services.lightning-charge.host = netns.lightning-charge.address;
-
-    services.nanopos = {
-      charged-url = "http://${netns.lightning-charge.address}:9112";
-      host = netns.nanopos.address;
-    };
-
     services.lightning-loop.rpcAddress = netns.lightning-loop.address;
 
     services.nbxplorer.bind = netns.nbxplorer.address;

modules/nix-bitcoin-webindex.nix

@@ -13,7 +13,6 @@ let
             nix-bitcoin
           </h1>
         </p>
-        ${optionalString config.services.nanopos.enable ''<p><h2><a href="store/">store</a></h2></p>''}
         <p>
         <h3>
           lightning node: CLIGHTNING_ID
@@ -52,8 +51,8 @@ in {
 
   config = mkIf cfg.enable {
     assertions = [
-      { assertion = config.services.nanopos.enable;
-        message = "nix-bitcoin-webindex requires nanopos.";
+      { assertion = config.services.clightning.enable;
+        message = "nix-bitcoin-webindex requires clightning.";
       }
     ];
 

modules/presets/secure-node.nix

@@ -111,10 +111,6 @@ in {
       enforceTor = true;
     };
 
-    services.lightning-charge.enforceTor = true;
-
-    services.nanopos.enforceTor = true;
-
     services.recurring-donations.enforceTor = true;
 
     services.nix-bitcoin-webindex.enforceTor = true;

pkgs/default.nix

@@ -1,7 +1,5 @@
 { pkgs ? import <nixpkgs> {} }:
 let self = {
-  lightning-charge = pkgs.callPackage ./lightning-charge { };
-  nanopos = pkgs.callPackage ./nanopos { };
   spark-wallet = pkgs.callPackage ./spark-wallet { };
   electrs = pkgs.callPackage ./electrs { };
   elementsd = pkgs.callPackage ./elementsd { withGui = false; };

pkgs/generate-secrets/generate-secrets.sh

@@ -18,16 +18,13 @@ makePasswordSecret bitcoin-rpcpassword-btcpayserver
 makePasswordSecret bitcoin-rpcpassword-public
 makePasswordSecret lnd-wallet-password
 makePasswordSecret liquid-rpcpassword
-makePasswordSecret lightning-charge-token
 makePasswordSecret spark-wallet-password
 makePasswordSecret backup-encryption-password
 makePasswordSecret jm-wallet-password
 
 [[ -e bitcoin-HMAC-privileged ]] || makeHMAC privileged
 [[ -e bitcoin-HMAC-public ]] || makeHMAC public
 [[ -e bitcoin-HMAC-btcpayserver ]] || makeHMAC btcpayserver
-[[ -e lightning-charge-env ]] || echo "API_TOKEN=$(cat lightning-charge-token)" > lightning-charge-env
-[[ -e nanopos-env          ]] || echo "CHARGE_TOKEN=$(cat lightning-charge-token)" > nanopos-env
 [[ -e spark-wallet-login   ]] || echo "login=spark-wallet:$(cat spark-wallet-password)" > spark-wallet-login
 [[ -e backup-encryption-env ]] || echo "PASSPHRASE=$(cat backup-encryption-password)" > backup-encryption-env
 

pkgs/generate-secrets/update-secrets.sh

@@ -37,7 +37,6 @@ rename() {
 extractPassword bitcoinrpcpassword bitcoin-rpcpassword
 extractPassword lnd-wallet-password
 extractPassword liquidrpcpassword liquid-rpcpassword
-extractPassword lightning-charge-api-token lightning-charge-token
 extractPassword spark-wallet-password
 
 rename lnd.key lnd-key