harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed homeinstall config file and added check for required config parameters. Spelling corrections.

Browse Source
This commit is contained in:
Andrew Manning 2016-02-20 14:04:11 -05:00
parent 368bb18935
commit 272ffe6983
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.homeinstall/hubzilla-config.txt → .homeinstall/hubzilla-config.txt.template
View File

@ -9,7 +9,9 @@ db_pass=
############################################### ###############################################
### MANDATORY - let's encrypt ################# ### 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 # Please give the domain name of your hub
# #
@ -136,12 +138,12 @@ backup_device_pass=
### OPTIONAL - do not mess with things below ## ### OPTIONAL - do not mess with things below ##
# (...if you are not certain) # (...if you are not certain)
# #
# Usally you are done here # Usually you are done here
# All what comes below is OPTIONAL # Everything below is OPTIONAL
# #
############################################### ###############################################
# #
# Database for huzilla # Database for hubzilla
hubzilla_db_name=hubzilla hubzilla_db_name=hubzilla
hubzilla_db_user=hubzilla hubzilla_db_user=hubzilla
hubzilla_db_pass=$db_pass hubzilla_db_pass=$db_pass
@ -168,7 +170,7 @@ phpmyadminpass=$db_pass
# * in eclipse: switch php debugger from zend to xdebug # * in eclipse: switch php debugger from zend to xdebug
# * in eclipse: add local hubzilla github repository # * 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 # Leave this empty if you do not want to prepare hubzilla for debugging
# #
#developer_name= #developer_name=

16
.homeinstall/hubzilla-setup.sh
View File

@ -5,7 +5,7 @@
# #
# This file automates the installation of hubzilla under Debian Linux # 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 # Follow the instuctions there
# #
# 2) Switch to user "root" by typing "su -" # 2) Switch to user "root" by typing "su -"
@ -92,12 +92,12 @@
# Credits # 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. # which he used to install the red#matrix.
# #
# The script uses another script from https://github.com/lukas2511/letsencrypt.sh # 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 # https://www.gnu.org/software/bash/manual/bash.html
# #
function check_sanity { function check_sanity {
@ -120,6 +120,15 @@ function check_sanity {
function check_config { function check_config {
print_info "config check..." 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 # backup is important and should be checked
if [ -n "$backup_device_name" ] if [ -n "$backup_device_name" ]
then then
@ -814,6 +823,7 @@ check_sanity
# Read config file edited by user # Read config file edited by user
configfile=hubzilla-config.txt configfile=hubzilla-config.txt
source $configfile source $configfile
selfhostdir=/etc/selfhost selfhostdir=/etc/selfhost
selfhostscript=selfhost-updater.sh selfhostscript=selfhost-updater.sh
hubzilladaily=hubzilla-daily.sh hubzilladaily=hubzilla-daily.sh