First pass in moving to debian

[discourse_docker.git] / discourse-setup

diff --git a/discourse-setup b/discourse-setup
index b5f89f218785c0ce4b8ce57253b06d6e49a64a72..c4f263b9ee808ae06659e9085ceebd28dbde49cb 100755 (executable)
--- a/discourse-setup
+++ b/discourse-setup
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
 #!/usr/bin/env bash

+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd $DIR

 
 ##
 ## Make sure only root can run our script
 
 ##
 ## Make sure only root can run our script


@@ -10,49 +12,55 @@ check_root() {
   fi
 }
 
   fi
 }
 

-

 ##
 ##

-## Does the current IP match the domain name?
+## Check whether a connection to HOSTNAME ($1) on PORT ($2) is possible

 ##
 ##

-check_IP_match () {
-  echo
-  echo Checking your domain name . . .
-  sleep 1
-  local IFACE=none
-  local IFCONFIG=`which ifconfig`
-  /sbin/route |grep default > /tmp/route$PPID
-
-  if grep default /tmp/route$PPID > /dev/null
+connect_to_port () {
+  HOST="$1"
+  PORT="$2"
+  VERIFY=`date +%s | sha256sum | base64 | head -c 20`
+  echo -e "HTTP/1.1 200 OK\n\n $VERIFY" | nc -w 4 -l -p $PORT >/dev/null 2>&1 &
+  if curl --proto =http -s $HOST:$PORT --connect-timeout 3 | grep $VERIFY >/dev/null 2>&1

   then
   then

-      local IFACE=`cut -c 73-100 /tmp/route$PPID |head -1`
+      return 0

   else
   else

-    echo WARNING: Cannot check your IP number.
+    curl --proto =http -s localhost:$PORT >/dev/null 2>&1
+    return 1

   fi
   fi

-  local IP=`$IFCONFIG $IFACE|grep  "inet addr:" |cut -d":" -f 2|cut -d" " -f1|head -1`
-  local RESOLVED_IP=`dig +short $1`
+}

 
 

-  IP_LOOKS_GOOD=0
-  if [[ ! -z $RESOLVED_IP ]]
-  then
-      if [ $IP == $RESOLVED_IP ]
-      then
-         echo $1 resolves to $IP. Looks good!
-         echo
-         local IP_LOOKS_GOOD=1
-      fi
-  fi
-  if [ $IP_LOOKS_GOOD == 0 ]
+check_IP_match () {
+  HOST="$1"
+  echo
+  echo Checking your domain name . . .
+  if connect_to_port $HOST 443

   then
   then

-      echo "-----------------------------------------"
-      echo $1 does not resolve to $IP.
-      echo IT IS ALMOST CERTAINLY A BAD IDEA TO TURN ON LET\'S ENCRYPT!!
-      echo Unless you know why this check failed, DO NOT USE Let\'s Encrypt.

       echo
       echo

-      echo You should answer \"n\" at the next prompt and disable Let\'s Encrypt.
-      echo You have been warned.
-      echo "-----------------------------------------"
+      echo "Connection to $HOST succeeded."
+  else
+    echo WARNING:: This server does not appear to be accessible at $HOST:443.
+    echo
+    if connect_to_port $HOST 80
+    then
+       echo A connection to port 80 succeeds, however.
+       echo This suggests that your DNS settings are correct,
+       echo but something is keeping traffic to port 443 from getting to your server.
+       echo Check your networking configuration to see that connections to port 443 are allowed.
+    else
+      echo "A connection to http://$HOST (port 80) also fails."
+      echo
+      echo This suggests that $HOST resolves to the wrong IP address
+      echo or that traffic is not being routed to your server.
+    fi
+    echo
+    echo Google: \"open ports YOUR CLOUD SERVICE\" for information for resolving this problem.
+    echo
+    echo You should probably answer \"n\" at the next prompt and disable Let\'s Encrypt.
+    echo
+    echo This test might not work for all situations,
+    echo so if you can access Discourse at http://$HOST, you might try anyway.
+    sleep 3

   fi
   fi

-  sleep 1

 }
 
 ##
 }
 
 ##


@@ -82,7 +90,7 @@ check_OS() {
 ## OS X available memory
 ##
 check_osx_memory() {
 ## OS X available memory
 ##
 check_osx_memory() {

-  echo `top -l 1 | awk '/PhysMem:/ {print $2}' | sed s/G//`
+  echo `free -m | awk '/Mem:/ {print $2}'`

 }
 
 ##
 }
 
 ##


@@ -99,7 +107,7 @@ check_disk_and_memory() {
 
   os_type=$(check_OS)
   avail_mem=0
 
   os_type=$(check_OS)
   avail_mem=0

-  if [ $os_type == "Darwin" ]; then
+  if [ "$os_type" == "Darwin" ]; then

     avail_mem=$(check_osx_memory)
   else
     avail_mem=$(check_linux_memory)
     avail_mem=$(check_osx_memory)
   else
     avail_mem=$(check_linux_memory)


@@ -116,6 +124,7 @@ check_disk_and_memory() {
 
   if [ "$avail_mem" -le 2 ]; then
     total_swap=`free -g --si | awk ' /Swap:/  {print $2} '`
 
   if [ "$avail_mem" -le 2 ]; then
     total_swap=`free -g --si | awk ' /Swap:/  {print $2} '`

+

     if [ "$total_swap" -lt 2 ]; then
       echo "WARNING: Discourse requires at least 2GB of swap when running with 2GB of RAM"
       echo "or less. This system does not appear to have sufficient swap space."
     if [ "$total_swap" -lt 2 ]; then
       echo "WARNING: Discourse requires at least 2GB of swap when running with 2GB of RAM"
       echo "or less. This system does not appear to have sufficient swap space."


@@ -123,7 +132,8 @@ check_disk_and_memory() {
       echo "Without sufficient swap space, your site may not work properly, and future"
       echo "upgrades of Discourse may not complete successfully."
       echo
       echo "Without sufficient swap space, your site may not work properly, and future"
       echo "upgrades of Discourse may not complete successfully."
       echo

-      read -p "ENTER to create a 2GB swapfile now, or Ctrl+C to exit"
+      echo "Ctrl+C to exit or wait 5 seconds to have a 2GB swapfile created."
+      sleep 5

 
       ##
       ## derived from https://meta.discourse.org/t/13880
 
       ##
       ## derived from https://meta.discourse.org/t/13880


@@ -134,11 +144,11 @@ check_disk_and_memory() {
       swapon /swapfile
       echo "/swapfile       swap    swap    auto      0       0" | tee -a /etc/fstab
       sysctl -w vm.swappiness=10
       swapon /swapfile
       echo "/swapfile       swap    swap    auto      0       0" | tee -a /etc/fstab
       sysctl -w vm.swappiness=10

-      echo vm.swappiness = 10 | tee -a /etc/sysctl.conf
+      echo 'vm.swappiness = 10' > /etc/sysctl.d/30-discourse-swap.conf

 
       total_swap=`free -g --si | awk ' /Swap:/ {print $2} '`
       if [ "$total_swap" -lt 2 ]; then
 
       total_swap=`free -g --si | awk ' /Swap:/ {print $2} '`
       if [ "$total_swap" -lt 2 ]; then

-        echo "Failed to create swap, sorry!"
+        echo "Failed to create swap: are you root? Are you running on real hardware, or a fully virtualized server?"

         exit 1
       fi
 
         exit 1
       fi
 


@@ -174,7 +184,7 @@ scale_ram_and_cpu() {
   avail_gb=0
   avail_cores=0
   os_type=$(check_OS)
   avail_gb=0
   avail_cores=0
   os_type=$(check_OS)

-  if [ $os_type == "Darwin" ]; then
+  if [ "$os_type" == "Darwin" ]; then

     avail_gb=$(check_osx_memory)
     avail_cores=`sysctl hw.ncpu | awk '/hw.ncpu:/ {print $2}'`
   else
     avail_gb=$(check_osx_memory)
     avail_cores=`sysctl hw.ncpu | awk '/hw.ncpu:/ {print $2}'`
   else


@@ -197,7 +207,7 @@ scale_ram_and_cpu() {
   fi
   db_shared_buffers=$(( db_shared_buffers < 4096 ? db_shared_buffers : 4096 ))
 
   fi
   db_shared_buffers=$(( db_shared_buffers < 4096 ? db_shared_buffers : 4096 ))
 

-  sed -i -e "s/^  #\?db_shared_buffers:.*/  db_shared_buffers: \"${db_shared_buffers}MB\"/w $changelog" $config_file
+  sed -i -e "s/^  #\?db_shared_buffers:.*/  db_shared_buffers: \"${db_shared_buffers}MB\"/w $changelog" $data_file

   if [ -s $changelog ]
   then
     echo "setting db_shared_buffers = ${db_shared_buffers}MB"
   if [ -s $changelog ]
   then
     echo "setting db_shared_buffers = ${db_shared_buffers}MB"


@@ -213,13 +223,14 @@ scale_ram_and_cpu() {
   fi
   unicorn_workers=$(( unicorn_workers < 8 ? unicorn_workers : 8 ))
 
   fi
   unicorn_workers=$(( unicorn_workers < 8 ? unicorn_workers : 8 ))
 

-  sed -i -e "s/^  #\?UNICORN_WORKERS:.*/  UNICORN_WORKERS: ${unicorn_workers}/w $changelog" $config_file
+  sed -i -e "s/^  #\?UNICORN_WORKERS:.*/  UNICORN_WORKERS: ${unicorn_workers}/w $changelog" $web_file

   if [ -s $changelog ]
   then
       echo "setting UNICORN_WORKERS = ${unicorn_workers}"
       rm $changelog
   fi
 
   if [ -s $changelog ]
   then
       echo "setting UNICORN_WORKERS = ${unicorn_workers}"
       rm $changelog
   fi
 

+  echo $data_file memory parameters updated.

 }
 
 
 }
 
 


@@ -243,6 +254,9 @@ check_port() {
   if [ -n "$valid" ]; then
     echo "Port ${1} appears to already be in use."
     echo
   if [ -n "$valid" ]; then
     echo "Port ${1} appears to already be in use."
     echo

+    echo "This will show you what command is using port ${1}"
+    lsof -i tcp:${1} -s tcp:listen
+    echo

     echo "If you are trying to run Discourse simultaneously with another web"
     echo "server like Apache or nginx, you will need to bind to a different port"
     echo
     echo "If you are trying to run Discourse simultaneously with another web"
     echo "server like Apache or nginx, you will need to bind to a different port"
     echo


@@ -261,13 +275,16 @@ check_port() {
 ## read a variable from the config file
 ##
 read_config() {
 ## read a variable from the config file
 ##
 read_config() {

-
-  config_line=`egrep "^  #?$1:" $config_file`
-  read_config_result=`echo $config_line | awk '{print $2}'`
+  config_line=`egrep "^  #?$1:" $web_file`
+  read_config_result=`echo $config_line | awk  -F":" '{print $2}'`

   read_config_result=`echo $read_config_result | sed "s/^\([\"']\)\(.*\)\1\$/\2/g"`
 }
 
   read_config_result=`echo $read_config_result | sed "s/^\([\"']\)\(.*\)\1\$/\2/g"`
 }
 

-
+read_default() {
+  config_line=`egrep "^  #?$1:" samples/standalone.yml`
+  read_default_result=`echo $config_line | awk  -F":" '{print $2}'`
+  read_default_result=`echo $read_config_result | sed "s/^\([\"']\)\(.*\)\1\$/\2/g"`
+}

 
 ##
 ## prompt user for typical Discourse config file values
 
 ##
 ## prompt user for typical Discourse config file values


@@ -294,7 +311,11 @@ ask_user_for_config() {
   fi
   read_config "LETSENCRYPT_ACCOUNT_EMAIL"
   local letsencrypt_account_email=$read_config_result
   fi
   read_config "LETSENCRYPT_ACCOUNT_EMAIL"
   local letsencrypt_account_email=$read_config_result

-  if [ $letsencrypt_account_email = "me@example.com" ]
+  if [ -z $letsencrypt_account_email ]
+  then
+      letsencrypt_account_email="me@example.com"
+  fi
+  if [ "$letsencrypt_account_email" = "me@example.com" ]

   then
       local letsencrypt_status="ENTER to skip"
   else
   then
       local letsencrypt_status="ENTER to skip"
   else


@@ -312,79 +333,89 @@ ask_user_for_config() {
 
   while [[ "$config_ok" == "n" ]]
   do
 
   while [[ "$config_ok" == "n" ]]
   do

-    if [ ! -z $hostname ]
+    if [ ! -z "$hostname" ]

     then
       read -p "Hostname for your Discourse? [$hostname]: " new_value
     then
       read -p "Hostname for your Discourse? [$hostname]: " new_value

-      if [ ! -z $new_value ]
+      if [ ! -z "$new_value" ]

       then
       then

-          hostname=$new_value
+          hostname="$new_value"
+      fi
+      if [[ $hostname =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]
+      then
+        echo
+        echo "Discourse requires a DNS hostname. IP addresses are unsupported and will not work."
+        echo
+        hostname="discourse.example.com"

       fi
     fi
 
       fi
     fi
 

-    if [ ! -z $developer_emails ]
+    if [ ! -z "$developer_emails" ]

     then
       read -p "Email address for admin account(s)? [$developer_emails]: " new_value
     then
       read -p "Email address for admin account(s)? [$developer_emails]: " new_value

-      if [ ! -z $new_value ]
+      if [ ! -z "$new_value" ]

       then
       then

-          developer_emails=$new_value
+          developer_emails="$new_value"

       fi
     fi
 
       fi
     fi
 

-    if [ ! -z $smtp_address ]
+    if [ ! -z "$smtp_address" ]

     then
       read -p "SMTP server address? [$smtp_address]: " new_value
     then
       read -p "SMTP server address? [$smtp_address]: " new_value

-      if [ ! -z $new_value ]
+      if [ ! -z "$new_value" ]

       then
       then

-        smtp_address=$new_value
+        smtp_address="$new_value"

       fi
     fi
 
       fi
     fi
 

-    if [ ! -z $smtp_port ]
+    if [ ! -z "$smtp_port" ]

     then
       read -p "SMTP port? [$smtp_port]: " new_value
     then
       read -p "SMTP port? [$smtp_port]: " new_value

-      if [ ! -z $new_value ]
+      if [ ! -z "$new_value" ]

       then
       then

-        smtp_port=$new_value
+        smtp_port="$new_value"

       fi
     fi
 
     ##
       fi
     fi
 
     ##

-    ## automatically set correct user name based on common mail providers
+    ## automatically set correct user name based on common mail providers unless it's been set

     ##
     ##

-    if [ "$smtp_address" == "smtp.sparkpostmail.com" ]
-    then
-       smtp_user_name="SMTP_Injection"
-    fi
-    if [ "$smtp_address" == "smtp.sendgrid.net" ]
+    if [ "$smtp_user_name" == "user@example.com" ]

     then
     then

-           smtp_user_name="apikey"
-    fi
-    if [ "$smtp_address" == "smtp.mailgun.org" ]
-    then
-           smtp_user_name="postmaster@$hostname"
+      if [ "$smtp_address" == "smtp.sparkpostmail.com" ]
+      then
+       smtp_user_name="SMTP_Injection"
+      fi
+      if [ "$smtp_address" == "smtp.sendgrid.net" ]
+      then
+           smtp_user_name="apikey"
+      fi
+      if [ "$smtp_address" == "smtp.mailgun.org" ]
+      then
+           smtp_user_name="postmaster@$hostname"
+      fi

     fi
 
     fi
 

-    if [ ! -z $smtp_user_name ]
+    if [ ! -z "$smtp_user_name" ]

     then
       read -p "SMTP user name? [$smtp_user_name]: " new_value
     then
       read -p "SMTP user name? [$smtp_user_name]: " new_value

-      if [ ! -z $new_value ]
+      if [ ! -z "$new_value" ]

       then
       then

-          smtp_user_name=$new_value
+          smtp_user_name="$new_value"

       fi
     fi
 
     read -p "SMTP password? [$smtp_password]: " new_value
       fi
     fi
 
     read -p "SMTP password? [$smtp_password]: " new_value

-    if [ ! -z $new_value ]
+    if [ ! -z "$new_value" ]

     then
     then

-        smtp_password=$new_value
+        smtp_password="$new_value"

     fi
 
     if [ ! -z $letsencrypt_account_email ]
     then
     fi
 
     if [ ! -z $letsencrypt_account_email ]
     then

-      read -p "Let's Encrypt account email? ($letsencrypt_status) [$letsencrypt_account_email]: " new_value
-      if [ ! -z $new_value ]
+      read -p "Optional email address for setting up Let's Encrypt? ($letsencrypt_status) [$letsencrypt_account_email]: " new_value
+      if [ ! -z "$new_value" ]

       then
       then

-          letsencrypt_account_email=$new_value
+          letsencrypt_account_email="$new_value"

           if [ "${new_value,,}" = "off" ]
           then
             letsencrypt_status="ENTER to skip"
           if [ "${new_value,,}" = "off" ]
           then
             letsencrypt_status="ENTER to skip"


@@ -417,7 +448,7 @@ ask_user_for_config() {
     read -p "ENTER to continue, 'n' to try again, Ctrl+C to exit: " config_ok
   done
 
     read -p "ENTER to continue, 'n' to try again, Ctrl+C to exit: " config_ok
   done
 

-  sed -i -e "s/^  DISCOURSE_HOSTNAME:.*/  DISCOURSE_HOSTNAME: $hostname/w $changelog" $config_file
+  sed -i -e "s/^  DISCOURSE_HOSTNAME:.*/  DISCOURSE_HOSTNAME: $hostname/w $changelog" $web_file

   if [ -s $changelog ]
   then
     rm $changelog
   if [ -s $changelog ]
   then
     rm $changelog


@@ -426,7 +457,7 @@ ask_user_for_config() {
     update_ok="n"
   fi
 
     update_ok="n"
   fi
 

-  sed -i -e "s/^  DISCOURSE_DEVELOPER_EMAILS:.*/  DISCOURSE_DEVELOPER_EMAILS: \'$developer_emails\'/w $changelog" $config_file
+  sed -i -e "s/^  DISCOURSE_DEVELOPER_EMAILS:.*/  DISCOURSE_DEVELOPER_EMAILS: \'$developer_emails\'/w $changelog" $web_file

   if [ -s $changelog ]
   then
     rm $changelog
   if [ -s $changelog ]
   then
     rm $changelog


@@ -435,7 +466,7 @@ ask_user_for_config() {
     update_ok="n"
   fi
 
     update_ok="n"
   fi
 

-  sed -i -e "s/^  DISCOURSE_SMTP_ADDRESS:.*/  DISCOURSE_SMTP_ADDRESS: $smtp_address/w $changelog" $config_file
+  sed -i -e "s/^  DISCOURSE_SMTP_ADDRESS:.*/  DISCOURSE_SMTP_ADDRESS: $smtp_address/w $changelog" $web_file

   if [ -s $changelog ]
   then
     rm $changelog
   if [ -s $changelog ]
   then
     rm $changelog


@@ -444,7 +475,7 @@ ask_user_for_config() {
     update_ok="n"
   fi
 
     update_ok="n"
   fi
 

-  sed -i -e "s/^  #\?DISCOURSE_SMTP_PORT:.*/  DISCOURSE_SMTP_PORT: $smtp_port/w $changelog" $config_file
+  sed -i -e "s/^  #\?DISCOURSE_SMTP_PORT:.*/  DISCOURSE_SMTP_PORT: $smtp_port/w $changelog" $web_file

   if [ -s $changelog ]
   then
     rm $changelog
   if [ -s $changelog ]
   then
     rm $changelog


@@ -453,7 +484,7 @@ ask_user_for_config() {
     update_ok="n"
   fi
 
     update_ok="n"
   fi
 

-  sed -i -e "s/^  #\?DISCOURSE_SMTP_USER_NAME:.*/  DISCOURSE_SMTP_USER_NAME: $smtp_user_name/w $changelog" $config_file
+  sed -i -e "s/^  #\?DISCOURSE_SMTP_USER_NAME:.*/  DISCOURSE_SMTP_USER_NAME: $smtp_user_name/w $changelog" $web_file

   if [ -s $changelog ]
   then
     rm $changelog
   if [ -s $changelog ]
   then
     rm $changelog


@@ -462,20 +493,52 @@ ask_user_for_config() {
     update_ok="n"
   fi
 
     update_ok="n"
   fi
 

-  sed -i -e "s/^  #\?DISCOURSE_SMTP_PASSWORD:.*/  DISCOURSE_SMTP_PASSWORD: \"${smtp_password/\//\\/}\"/w $changelog" $config_file
-  if [ -s $changelog ]
+  if [[ "$smtp_password" == *"\""* ]]

   then
   then

-      rm $changelog
-  else
-    echo "DISCOURSE_SMTP_PASSWORD change failed."
+    SLASH="BROKEN"
+    echo "========================================"
+    echo "WARNING!!!"
+    echo "Your password contains a quote (\")"
+    echo "Your SMTP Password will not be set. You will need to edit app.yml to enter it."
+    echo "========================================"

     update_ok="n"
     update_ok="n"

+  else
+    SLASH="|"
+    if [[ "$smtp_password" == *"$SLASH"* ]]
+    then SLASH="+"
+      if [[ "$smtp_password" == *"$SLASH"* ]]
+      then
+        SLASH="Q"
+        if [[ "$smtp_password" == *"$SLASH"* ]]
+       then
+         SLASH="BROKEN"
+          echo "========================================"
+          echo "WARNING!!!"
+          echo "Your password contains all available delimiters (+, |, and Q). "
+          echo "Your SMTP Password will not be set. You will need to edit app.yml to enter it."
+          echo "========================================"
+          update_ok="n"
+         fi
+       fi
+    fi

   fi
   fi

+  if [[ "$SLASH" != "BROKEN" ]]
+  then
+    sed -i -e "s${SLASH}^  #\?DISCOURSE_SMTP_PASSWORD:.*${SLASH}  DISCOURSE_SMTP_PASSWORD: \"${smtp_password}\"${SLASH}w $changelog" $web_file

 
 

+    if [ -s $changelog ]
+    then
+      rm $changelog
+    else
+      echo "DISCOURSE_SMTP_PASSWORD change failed."
+      update_ok="n"
+    fi
+  fi

   if [ "$letsencrypt_status" = "ENTER to skip" ]
   then
       local src='^  #\?- "templates\/web.ssl.template.yml"'
       local dst='  #\- "templates\/web.ssl.template.yml"'
   if [ "$letsencrypt_status" = "ENTER to skip" ]
   then
       local src='^  #\?- "templates\/web.ssl.template.yml"'
       local dst='  #\- "templates\/web.ssl.template.yml"'

-      sed -i -e "s/$src/$dst/w $changelog" $config_file
+      sed -i -e "s/$src/$dst/w $changelog" $web_file

       if [ ! -s $changelog ]
       then
         update_ok="n"
       if [ ! -s $changelog ]
       then
         update_ok="n"


@@ -484,7 +547,7 @@ ask_user_for_config() {
       local src='^  #\?- "templates\/web.letsencrypt.ssl.template.yml"'
       local dst='  #- "templates\/web.letsencrypt.ssl.template.yml"'
 
       local src='^  #\?- "templates\/web.letsencrypt.ssl.template.yml"'
       local dst='  #- "templates\/web.letsencrypt.ssl.template.yml"'
 

-      sed -i -e "s/$src/$dst/w $changelog" $config_file
+      sed -i -e "s/$src/$dst/w $changelog" $web_file

       if [ ! -s $changelog ]
       then
         update_ok="n"
       if [ ! -s $changelog ]
       then
         update_ok="n"


@@ -492,7 +555,7 @@ ask_user_for_config() {
       fi
   else # enable let's encrypt
     echo "Let's Encrypt will be enabled for $letsencrypt_account_email"
       fi
   else # enable let's encrypt
     echo "Let's Encrypt will be enabled for $letsencrypt_account_email"

-      sed -i -e "s/^  #\?LETSENCRYPT_ACCOUNT_EMAIL:.*/  LETSENCRYPT_ACCOUNT_EMAIL: $letsencrypt_account_email/w $changelog" $config_file
+      sed -i -e "s/^  #\?LETSENCRYPT_ACCOUNT_EMAIL:.*/  LETSENCRYPT_ACCOUNT_EMAIL: $letsencrypt_account_email/w $changelog" $web_file

       if [ -s $changelog ]
       then
         rm $changelog
       if [ -s $changelog ]
       then
         rm $changelog


@@ -502,7 +565,7 @@ ask_user_for_config() {
       fi
       local src='^  #\?- "templates\/web.ssl.template.yml"'
       local dst='  \- "templates\/web.ssl.template.yml"'
       fi
       local src='^  #\?- "templates\/web.ssl.template.yml"'
       local dst='  \- "templates\/web.ssl.template.yml"'

-      sed -i -e "s/$src/$dst/w $changelog" $config_file
+      sed -i -e "s/$src/$dst/w $changelog" $web_file

       if [ -s $changelog ]
       then
          echo "web.ssl.template.yml enabled"
       if [ -s $changelog ]
       then
          echo "web.ssl.template.yml enabled"


@@ -513,7 +576,7 @@ ask_user_for_config() {
       local src='^  #\?- "templates\/web.letsencrypt.ssl.template.yml"'
       local dst='  - "templates\/web.letsencrypt.ssl.template.yml"'
 
       local src='^  #\?- "templates\/web.letsencrypt.ssl.template.yml"'
       local dst='  - "templates\/web.letsencrypt.ssl.template.yml"'
 

-      sed -i -e "s/$src/$dst/w $changelog" $config_file
+      sed -i -e "s/$src/$dst/w $changelog" $web_file

       if [ -s $changelog ]
       then
              echo "letsencrypt.ssl.template.yml enabled"
       if [ -s $changelog ]
       then
              echo "letsencrypt.ssl.template.yml enabled"


@@ -528,6 +591,7 @@ ask_user_for_config() {
     echo -e "\nConfiguration file at $config_file updated successfully!\n"
   else
     echo -e "\nUnfortunately, there was an error changing $config_file\n"
     echo -e "\nConfiguration file at $config_file updated successfully!\n"
   else
     echo -e "\nUnfortunately, there was an error changing $config_file\n"

+    echo -d "This may happen if you have made unexpected changes."

     exit 1
   fi
 }
     exit 1
   fi
 }


@@ -542,21 +606,22 @@ validate_config() {
   for x in DISCOURSE_SMTP_ADDRESS DISCOURSE_SMTP_USER_NAME DISCOURSE_SMTP_PASSWORD \
            DISCOURSE_DEVELOPER_EMAILS DISCOURSE_HOSTNAME
   do
   for x in DISCOURSE_SMTP_ADDRESS DISCOURSE_SMTP_USER_NAME DISCOURSE_SMTP_PASSWORD \
            DISCOURSE_DEVELOPER_EMAILS DISCOURSE_HOSTNAME
   do

-    config_line=`grep "^  $x:" $config_file`
-    local result=$?
-    local default="example.com"
+    read_config $x
+    local result=$read_config_result
+    read_default $x
+    local default=$read_default_result

 
 

-    if (( result == 0 ))
+    if [ ! -z "$result" ]

     then
     then

-      if [[ $config_line = *"$default"* ]]
+      if [[ "$config_line" = *"$default"* ]]

       then
       then

-        echo "$x left at incorrect default of example.com"
+        echo "$x left at incorrect default of $default"

         valid_config="n"
       fi
       config_val=`echo $config_line | awk '{print $2}'`
       if [ -z $config_val ]
       then
         valid_config="n"
       fi
       config_val=`echo $config_line | awk '{print $2}'`
       if [ -z $config_val ]
       then

-        echo "$x was left blank"
+        echo "$x was not configured"

         valid_config="n"
       fi
     else
         valid_config="n"
       fi
     else


@@ -566,8 +631,8 @@ validate_config() {
   done
 
   if [ "$valid_config" != "y" ]; then
   done
 
   if [ "$valid_config" != "y" ]; then

-    echo -e "\nSorry, these $config_file settings aren't valid -- can't continue!"
-    echo "If you have unusual requirements, edit $config_file and then: "
+    echo -e "\nSorry, these $web_file settings aren't valid -- can't continue!"
+    echo "If you have unusual requirements, edit $web_file and then: "

     echo "./launcher bootstrap $app_name"
     exit 1
   fi
     echo "./launcher bootstrap $app_name"
     exit 1
   fi


@@ -577,10 +642,24 @@ validate_config() {
 ##
 ## template file names
 ##
 ##
 ## template file names
 ##

-app_name=app
-template_path=samples/standalone.yml
-config_file=containers/$app_name.yml
-changelog=/tmp/changelog
+
+if [ "$1" == "2container" ]
+then
+    app_name=web_only
+    data_name=data
+    web_template=samples/web_only.yml
+    data_template=samples/data.yml
+    web_file=containers/$app_name.yml
+    data_file=containers/$data_name.yml
+else
+  app_name=app
+  data_name=app
+  web_template=samples/standalone.yml
+  data_template=""
+  web_file=containers/$app_name.yml
+  data_file=containers/$app_name.yml
+fi
+    changelog=/tmp/changelog

 
 ##
 ## Check requirements before creating a copy of a config file we won't edit
 
 ##
 ## Check requirements before creating a copy of a config file we won't edit


@@ -588,19 +667,50 @@ changelog=/tmp/changelog
 check_root
 check_and_install_docker
 check_disk_and_memory
 check_root
 check_and_install_docker
 check_disk_and_memory

-check_ports

 
 

-##
-## make a copy of the simple standalone config file
-##
-if [ -a $config_file ]
+if [ -a "$web_file" ]

 then
 then

-  echo "The configuration file $config_file already exists!"
+  echo "The configuration file $web_file already exists!"

   echo
   echo ". . . reconfiguring . . ."
   echo
   echo
   echo ". . . reconfiguring . . ."
   echo

+  echo
+  DATE=`date +"%Y-%m-%d-%H%M%S"`
+  BACKUP=$app_name.yml.$DATE.bak
+  echo Saving old file as $BACKUP
+  cp $web_file containers/$BACKUP
+  echo "Stopping existing container in 5 seconds or Control-C to cancel."
+  sleep 5
+  ./launcher stop app
+  echo

 else
 else

-  cp $template_path $config_file
+  check_ports
+  cp -v $web_template $web_file
+  if [ "$data_name" == "data" ]
+  then
+      echo "--------------------------------------------------"
+      echo "This two container setup is currently unsupported. Use at your own risk!"
+      echo "--------------------------------------------------"
+      DISCOURSE_DB_PASSWORD=`date +%s | sha256sum | base64 | head -c 20`
+
+     sed -i -e "s/DISCOURSE_DB_PASSWORD: SOME_SECRET/DISCOURSE_DB_PASSWORD: $DISCOURSE_DB_PASSWORD/w $changelog" $web_file
+     if  [ -s $changelog ]
+     then
+        rm $changelog
+     else
+       echo "Problem changing DISCOURSE_DB_PASSWORD" in $web_file
+     fi
+
+     cp -v $data_template $data_file
+     quote=\'
+     sed -i -e "s/password ${quote}SOME_SECRET${quote}/password '$DISCOURSE_DB_PASSWORD'/w $changelog" $data_file
+     if  [ -s $changelog ]
+     then
+        rm $changelog
+     else
+       echo "Problem changing DISCOURSE_DB_PASSWORD" in $data_file
+     fi
+  fi

 fi
 
 scale_ram_and_cpu
 fi
 
 scale_ram_and_cpu


@@ -611,5 +721,15 @@ validate_config
 ## if we reach this point without exiting, OK to proceed
 ## rebuild won't fail if there's nothing to rebuild and does the restart
 ##
 ## if we reach this point without exiting, OK to proceed
 ## rebuild won't fail if there's nothing to rebuild and does the restart
 ##

+echo "Updates successful. Rebuilding in 5 seconds."

 sleep 5 # Just a chance to ^C in case they were too fast on the draw
 sleep 5 # Just a chance to ^C in case they were too fast on the draw

-time ./launcher rebuild $app_name
+if [ "$data_name" == "$app_name" ]
+then
+    echo Building $app_name
+    ./launcher rebuild $app_name
+else
+    echo Building $data_name now . . .
+    ./launcher rebuild $data_name
+    echo Building $app_name now . . .
+    ./launcher rebuild $app_name
+fi