From 9b979ed4eb960edeb3201b330fde80d21434bf55 Mon Sep 17 00:00:00 2001
From: jash <jash@schulterklopfer-productions.de>
Date: Mon, 8 Oct 2018 15:24:13 +0200
Subject: [PATCH] added "expose" option to installer and template

---
 .../generators/app/prompters/999_installer.js | 19 ++++++++++++-------
 .../installer/docker/docker-compose.yaml      | 10 ++++------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/install/generator-cyphernode/generators/app/prompters/999_installer.js b/install/generator-cyphernode/generators/app/prompters/999_installer.js
index fbe83a8..0488fcd 100644
--- a/install/generator-cyphernode/generators/app/prompters/999_installer.js
+++ b/install/generator-cyphernode/generators/app/prompters/999_installer.js
@@ -4,11 +4,19 @@ const chalk = require('chalk');
 const name = 'installer';
 
 const installerDocker = function(props) {
-  return props.installer === 'docker'
+  return props.installer_mode === 'docker'
+};
+
+const installerDocker_bitcoinInternal = function(props) {
+  return props.installer_mode === 'docker' && props.bitcoin_mode === 'internal' 
+};
+
+const installerDocker_bitcoinExternal = function(props) {
+  return props.installer_mode === 'docker' && props.bitcoin_mode === 'external'
 };
 
 const installerLunanode = function(props) {
-  return props.installer === 'lunanode'
+  return props.installer_mode === 'lunanode'
 };
 
 module.exports = {
@@ -35,9 +43,7 @@ module.exports = {
       }]
     },
     {
-      when: function(props) { 
-        return (installerDocker(props) && props.bitcoin_mode === 'internal') 
-      },
+      when: installerDocker_bitcoinInternal,
       type: 'confirm',
       name: 'bitcoin_expose',
       default: utils._getDefault( 'bitcoin_expose' ),
@@ -49,8 +55,7 @@ module.exports = {
       name: 'installer_confirm_lunanode',
       default: utils._getDefault( 'installer_confirm_lunanode' ),
       message: 'Lunanode?! No wayyyy!'+'\n'
-    }
-    ];
+    }];
   },
   templates: function( props ) {
     if( props.installer_mode === 'docker' ) {
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 b0bb12d..84a62db 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
@@ -77,12 +77,10 @@ services:
   bitcoin:
     # Bitcoin node
     image: cyphernode/bitcoin
-#    ports:
-#      - "18333:18333"
-#      - "18332:18332"
-#      - "29000:29000"
-#      - "8333:8333"
-#      - "8332:8332"
+<% if( bitcoin_expose ) { %>
+    ports:
+      - "<%= (net === 'mainnet')?'8332:8332':'18332:18332' %>"
+<% } %>
     volumes:
       - "~/.bitcoin:/bitcoinuser/.bitcoin"
     networks: