Merge branch '2.5.x-installer' of https://github.com/sourcefabric/Airtime into 2.5.x-installer

This commit is contained in:
Duncan Sommerville 2015-03-18 10:12:58 -04:00
commit 0a3d8ea515
10 changed files with 469 additions and 844 deletions

View file

@ -466,7 +466,10 @@ for i in /etc/init/airtime*.template; do
mv $i ${i%.template}
done
#loudCmd "initctl reload-configuration"
set +e
loudCmd "initctl reload-configuration"
loudCmd "systemctl daemon-reload" #systemd hipsters
set -e
if [ ! -d /var/log/airtime ]; then
loud "\n-----------------------------------------------------"
@ -504,6 +507,9 @@ loud "\n-----------------------------------------------------"
loud " * Configuring PostgreSQL * "
loud "-----------------------------------------------------"
# Ensure postgres is running - It isn't after you install the postgres package on Ubuntu 15.04
loudCmd "service postgresql start"
setupAirtimePostgresUser() {
# here-doc to execute this block as postgres user
su postgres <<'EOF'