diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-02-20 14:04:11 -0500 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-02-20 14:04:11 -0500 |
| commit | 272ffe6983b19cd000e775f443f9e77406a657a9 (patch) | |
| tree | 600ec4aefe074a276ed5c1300f0c20aaa89febdf | |
| parent | 368bb189352bfe2b13b2af35763ed68b1885bb98 (diff) | |
| download | volse-hubzilla-272ffe6983b19cd000e775f443f9e77406a657a9.tar.gz volse-hubzilla-272ffe6983b19cd000e775f443f9e77406a657a9.tar.bz2 volse-hubzilla-272ffe6983b19cd000e775f443f9e77406a657a9.zip | |
Renamed homeinstall config file and added check for required config parameters. Spelling corrections.
| -rw-r--r-- | .homeinstall/hubzilla-config.txt.template (renamed from .homeinstall/hubzilla-config.txt) | 12 | ||||
| -rwxr-xr-x | .homeinstall/hubzilla-setup.sh | 16 |
2 files changed, 20 insertions, 8 deletions
diff --git a/.homeinstall/hubzilla-config.txt b/.homeinstall/hubzilla-config.txt.template index 23d188945..040b0f2f4 100644 --- a/.homeinstall/hubzilla-config.txt +++ b/.homeinstall/hubzilla-config.txt.template @@ -9,7 +9,9 @@ db_pass= ############################################### ### MANDATORY - let's encrypt ################# # -# Hubilla does not allow ecrypted communication, httpS. +# Hubilla requires encrypted communication via secure HTTP (HTTPS). +# This script automates installation of an SSL certificate from +# Let's Encrypt (https://letsencrypt.org) # # Please give the domain name of your hub # @@ -136,12 +138,12 @@ backup_device_pass= ### OPTIONAL - do not mess with things below ## # (...if you are not certain) # -# Usally you are done here -# All what comes below is OPTIONAL +# Usually you are done here +# Everything below is OPTIONAL # ############################################### # -# Database for huzilla +# Database for hubzilla hubzilla_db_name=hubzilla hubzilla_db_user=hubzilla hubzilla_db_pass=$db_pass @@ -168,7 +170,7 @@ phpmyadminpass=$db_pass # * in eclipse: switch php debugger from zend to xdebug # * in eclipse: add local hubzilla github repository # -# Wich user will use eclipse? +# Which user will use eclipse? # Leave this empty if you do not want to prepare hubzilla for debugging # #developer_name= 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 |