From 2bfaf344e7c86857f84f20b9eb05b3342966b428 Mon Sep 17 00:00:00 2001
From: root <root@mailtrain.mt>
Date: Tue, 25 Dec 2018 10:11:47 +0100
Subject: [PATCH] Updates in install scripts

---
 README.md       | 10 ++--------
 setup/functions |  2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 1732ef54..628a5d58 100644
--- a/README.md
+++ b/README.md
@@ -49,15 +49,9 @@ Thus, by running this script below, you agree with the Let's Encrypt's Terms of
 
 
 
-<<<<<<< HEAD
 1. Login as root. (I had some problems running npm as root on CentOS 7 on AWS. This seems to be fixed by the seemingly extraneous `su` within `sudo`.)
     ```
     sudo su -
-=======
-1. Login as root
-    ```
-    sudo -i
->>>>>>> c3f5e6a6282e6fae51392b9a9f89edade3d614a1
     ```
 
 2. Install git
@@ -104,9 +98,9 @@ All endpoints (trusted, sandbox, public) will provide only HTTP as follows:
 - http://localhost:3003 - sandbox endpoint
 - http://localhost:3004 - public endpoint
 
-1. Login as root
+1. Login as root. (I had some problems running npm as root on CentOS 7 on AWS. This seems to be fixed by the seemingly extraneous `su` within `sudo`.)
     ```
-    sudo -i
+    sudo su -
     ```
 
 2. Install git
diff --git a/setup/functions b/setup/functions
index 89858159..821b315d 100644
--- a/setup/functions
+++ b/setup/functions
@@ -229,7 +229,7 @@ EOT
 </VirtualHost>
 
 <VirtualHost *:${portPublic}>
-    ServerName *:${portPublic}
+    ServerName ${hostPublic}:${portPublic}
 
     ErrorLog logs/${hostPublic}_ssl_error.log
     TransferLog logs/${hostPublic}_ssl_access.log