From a5b5f3f1dd2b63c2bbdbb43a2994593d7b3a6e01 Mon Sep 17 00:00:00 2001
From: Tomas Bures <bures@d3s.mff.cuni.cz>
Date: Fri, 21 Dec 2018 23:04:31 +0100
Subject: [PATCH] Fixes to builtin ZoneMTA settings

---
 client/src/send-configurations/helpers.js | 23 ++++++++++++++---------
 setup/install-centos7.sh                  |  9 ++++++---
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/client/src/send-configurations/helpers.js b/client/src/send-configurations/helpers.js
index 367a97cb..e4d78620 100644
--- a/client/src/send-configurations/helpers.js
+++ b/client/src/send-configurations/helpers.js
@@ -100,15 +100,19 @@ export function getMailerTypes(t) {
         data.mailer_settings.logTransactions = data.logTransactions;
     }
 
-    function beforeSaveGenericSMTP(data) {
+    function beforeSaveGenericSMTP(data, builtin = false) {
         beforeSaveCommon(data);
-        data.mailer_settings.hostname = data.smtpHostname;
-        data.mailer_settings.port = Number(data.smtpPort);
-        data.mailer_settings.encryption = data.smtpEncryption;
-        data.mailer_settings.useAuth = data.smtpUseAuth;
-        data.mailer_settings.user = data.smtpUser;
-        data.mailer_settings.password = data.smtpPassword;
-        data.mailer_settings.allowSelfSigned = data.smtpAllowSelfSigned;
+
+        if (!builtin) {
+            data.mailer_settings.hostname = data.smtpHostname;
+            data.mailer_settings.port = Number(data.smtpPort);
+            data.mailer_settings.encryption = data.smtpEncryption;
+            data.mailer_settings.useAuth = data.smtpUseAuth;
+            data.mailer_settings.user = data.smtpUser;
+            data.mailer_settings.password = data.smtpPassword;
+            data.mailer_settings.allowSelfSigned = data.smtpAllowSelfSigned;
+        }
+
         data.mailer_settings.maxMessages = Number(data.smtpMaxMessages);
     }
 
@@ -254,7 +258,8 @@ export function getMailerTypes(t) {
             data.dkimPrivateKey = data.mailer_settings.dkimPrivateKey;
         },
         beforeSave: data => {
-            beforeSaveGenericSMTP(data);
+            beforeSaveGenericSMTP(data, zoneMtaType === ZoneMTAType.BUILTIN);
+            
             const zoneMtaType = Number.parseInt(data.zoneMtaType);
             data.mailer_settings.zoneMtaType = zoneMtaType;
             if (zoneMtaType === ZoneMTAType.WITH_HTTP_CONF || zoneMtaType === ZoneMTAType.WITH_MAILTRAIN_HEADER_CONF) {
diff --git a/setup/install-centos7.sh b/setup/install-centos7.sh
index 4dd0b60c..b5520a83 100644
--- a/setup/install-centos7.sh
+++ b/setup/install-centos7.sh
@@ -105,11 +105,14 @@ mysql:
 EOT
 
 # Install required node packages
-(cd
-npm install --no-progress --production
+for idx in client shared server zone-mta; do
+    (cd $idx && npm install)
+done
+
+(cd client && npm run build)
 
 chown -R mailtrain:mailtrain .
-chmod o-rwx config
+chmod o-rwx server/config
 
 # Setup log rotation to not spend up entire storage on logs
 cat <<EOM > /etc/logrotate.d/mailtrain