From f8431cb39fdc73930cb97ceaeb5d23e4046a66ac Mon Sep 17 00:00:00 2001
From: jash <jash@schulterklopfer-productions.de>
Date: Sun, 23 Dec 2018 17:48:22 +0100
Subject: [PATCH] exposing lightning port is not optional

---
 install/generator-cyphernode/generators/app/index.js       | 1 -
 .../generators/app/prompters/999_installer.js              | 7 -------
 .../app/templates/installer/docker/docker-compose.yaml     | 2 --
 3 files changed, 10 deletions(-)

diff --git a/install/generator-cyphernode/generators/app/index.js b/install/generator-cyphernode/generators/app/index.js
index 64c43c1..5bed715 100644
--- a/install/generator-cyphernode/generators/app/index.js
+++ b/install/generator-cyphernode/generators/app/index.js
@@ -388,7 +388,6 @@ module.exports = class extends Generator {
       bitcoin_node_ip: '',
       bitcoin_mode: 'internal',
       bitcoin_expose: false,
-      lightning_expose: false,
       gatekeeper_apiproperties: defaultAPIProperties,
       gatekeeper_ipwhitelist: '',
       gatekeeper_keys: { configEntries: [], clientInformation: [] },
diff --git a/install/generator-cyphernode/generators/app/prompters/999_installer.js b/install/generator-cyphernode/generators/app/prompters/999_installer.js
index aca41c1..d6ef062 100644
--- a/install/generator-cyphernode/generators/app/prompters/999_installer.js
+++ b/install/generator-cyphernode/generators/app/prompters/999_installer.js
@@ -207,13 +207,6 @@ module.exports = {
       default: utils._getDefault( 'bitcoin_expose' ),
       message: prefix()+'Expose bitcoin full node outside of the docker network?'+utils._getHelp('bitcoin_expose'),
     },
-    {
-      when: function(props) { return installerDocker(props) && props.features.indexOf('lightning') !== -1  },
-      type: 'confirm',
-      name: 'lightning_expose',
-      default: utils._getDefault( 'lightning_expose' ),
-      message: prefix()+'Expose lightning node outside of the docker network?'+utils._getHelp('lightning_expose'),
-    },
     {
       when: installerDocker,
       type: 'list',
diff --git a/install/generator-cyphernode/generators/app/templates/installer/docker/docker-compose.yaml b/install/generator-cyphernode/generators/app/templates/installer/docker/docker-compose.yaml
index a050c43..7f1220b 100644
--- a/install/generator-cyphernode/generators/app/templates/installer/docker/docker-compose.yaml
+++ b/install/generator-cyphernode/generators/app/templates/installer/docker/docker-compose.yaml
@@ -99,10 +99,8 @@ services:
     command: $USER lightningd
     image: cyphernode/clightning:<%= lightning_version %>
 
-<% if( lightning_expose ) { %>
     ports:
       - "9735:9735"
-<% } %>
     volumes:
       - "<%= lightning_datapath%>:/.lightning"
       - "<%= lightning_datapath%>/bitcoin.conf:/.bitcoin/bitcoin.conf"