From b025ec68b77d937f84e46ad626e9319f8e549d6c Mon Sep 17 00:00:00 2001
From: kexkey <github@kexkey.com>
Date: Wed, 26 Dec 2018 13:57:20 -0500
Subject: [PATCH] Put back LN port exposition but changed default value to true

---
 install/generator-cyphernode/generators/app/help.json      | 1 +
 install/generator-cyphernode/generators/app/index.js       | 1 +
 .../generators/app/prompters/999_installer.js              | 7 +++++++
 .../app/templates/installer/docker/docker-compose.yaml     | 2 ++
 4 files changed, 11 insertions(+)

diff --git a/install/generator-cyphernode/generators/app/help.json b/install/generator-cyphernode/generators/app/help.json
index a1a6b52..dcb3378 100644
--- a/install/generator-cyphernode/generators/app/help.json
+++ b/install/generator-cyphernode/generators/app/help.json
@@ -33,6 +33,7 @@
   "lightning_nodecolor": "LN nodes have colors. Choose the <font underline='true'>color you want</font> for yours in RGB format (RRGGBB). For example, pure red would be <font color='#ff0000'>ff0000</font>.",
   "lightning_datapath": "<font underline='true'>Path name</font> to where LN's data files are stored. This directory will be mounted into the LN node's container.",
   "lightning_datapath_custom": " ",
+  "lightning_expose": "By default, LN node port will be <font underline='true'>published</font> outside of Docker.  Do you want to hide it so that your node can't be accessed from outside of the Docker network?",
   "otsclient_datapath": "<font underline='true'>Full path</font> where the OTS files will be stored. This path will be mounted into the otsclient container which will create the OTS files when <font color='#00ff00'>stamping</font> and update them when <font color='#00ff00'>upgrading</font> stamps. It will also be mounted to the proxy container so that it can serve the <font color='#00ff00'>ots_getfile</font> and send the OTS files to clients.",
   "otsclient_datapath_custom": " ",
   "installer_mode": "Only one <font underline='true'>installation mode</font> is supported, right now: <font color='#0000ff'>local docker (self-hosted)</font>. Choose wisely ;-)",
diff --git a/install/generator-cyphernode/generators/app/index.js b/install/generator-cyphernode/generators/app/index.js
index 51ea22b..177d453 100644
--- a/install/generator-cyphernode/generators/app/index.js
+++ b/install/generator-cyphernode/generators/app/index.js
@@ -388,6 +388,7 @@ module.exports = class extends Generator {
       bitcoin_node_ip: '',
       bitcoin_mode: 'internal',
       bitcoin_expose: false,
+      lightning_expose: true,
       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 d6ef062..aca41c1 100644
--- a/install/generator-cyphernode/generators/app/prompters/999_installer.js
+++ b/install/generator-cyphernode/generators/app/prompters/999_installer.js
@@ -207,6 +207,13 @@ 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 7f1220b..d39a559 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,8 +99,10 @@ 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"