From f2d27d543d77d290b551df03086efb54db990956 Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Fri, 19 Feb 2016 20:43:28 -0500
Subject: Added sendmail installation to .homeinstall script so that hub can
 send email notifications

---
 .homeinstall/hubzilla-setup.sh | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to '.homeinstall/hubzilla-setup.sh')

diff --git a/.homeinstall/hubzilla-setup.sh b/.homeinstall/hubzilla-setup.sh
index 1a584b49c..caa46950c 100755
--- a/.homeinstall/hubzilla-setup.sh
+++ b/.homeinstall/hubzilla-setup.sh
@@ -225,6 +225,11 @@ function install_curl {
     nocheck_install "curl"
 }
 
+function install_sendmail {
+    print_info "installing sendmail..."
+    nocheck_install "sendmail"
+}
+
 function install_php {
     # openssl and mbstring are included in libapache2-mod-php5
     # to_to:  php5-suhosin
@@ -823,6 +828,7 @@ sslconf=/etc/apache2/sites-available/default-ssl.conf
 check_config
 update_upgrade
 install_curl
+install_sendmail
 install_apache
 install_php
 install_mysql
-- 
cgit v1.2.3


From 272ffe6983b19cd000e775f443f9e77406a657a9 Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Sat, 20 Feb 2016 14:04:11 -0500
Subject: Renamed homeinstall config file and added check for required config
 parameters. Spelling corrections.

---
 .homeinstall/hubzilla-setup.sh | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to '.homeinstall/hubzilla-setup.sh')

diff --git a/.homeinstall/hubzilla-setup.sh b/.homeinstall/hubzilla-setup.sh
index caa46950c..670844b83 100755
--- a/.homeinstall/hubzilla-setup.sh
+++ b/.homeinstall/hubzilla-setup.sh
@@ -5,7 +5,7 @@
 # 
 # This file automates the installation of hubzilla under Debian Linux
 #
-# 1) Edit the file "hubzilla-config.txt"
+# 1) Copy the file "hubzilla-config.txt.template" to "hubzilla-config.txt"
 #       Follow the instuctions there
 # 
 # 2) Switch to user "root" by typing "su -"
@@ -92,12 +92,12 @@
 # Credits
 # -------
 #
-# The srcipt is based on Thomas Willinghams script "debian-setup.sh"
+# The script is based on Thomas Willinghams script "debian-setup.sh"
 # which he used to install the red#matrix.
 #
 # The script uses another script from https://github.com/lukas2511/letsencrypt.sh
 #
-# The documentation of bash is here
+# The documentation for bash is here
 # https://www.gnu.org/software/bash/manual/bash.html
 #
 function check_sanity {
@@ -120,6 +120,15 @@ function check_sanity {
 
 function check_config {
     print_info "config check..."
+    # Check for required parameters
+    if [ -z "$db_pass" ]
+    then
+        die "db_pass not set in $configfile"
+    fi     
+    if [ -z "$le_domain" ]
+    then
+        die "le_domain not set in $configfile"
+    fi   
     # backup is important and should be checked
 	if [ -n "$backup_device_name" ]
 	then
@@ -814,6 +823,7 @@ check_sanity
 # Read config file edited by user
 configfile=hubzilla-config.txt
 source $configfile
+
 selfhostdir=/etc/selfhost
 selfhostscript=selfhost-updater.sh
 hubzilladaily=hubzilla-daily.sh
-- 
cgit v1.2.3