Merge branch '2.5.x-installer' of https://github.com/sourcefabric/Air…

…time into 2.5.x-installer

install

@@ -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'

installer/lib/requirements-ubuntu-vivid.apt

@@ -0,0 +1,69 @@
+apache2
+libapache2-mod-php5
+php5
+libzend-framework-php
+php-pear
+php5-gd
+
+lsb-release
+
+rabbitmq-server
+
+postgresql
+postgresql-client
+php5-pgsql
+
+python
+python-virtualenv
+python-pip
+
+libsoundtouch-ocaml
+libtaglib-ocaml
+libao-ocaml
+libmad-ocaml
+ecasound
+libportaudio2
+libsamplerate0
+
+patch
+
+php5-curl
+mpg123
+
+icecast2
+
+libcamomile-ocaml-data
+libpulse0
+vorbis-tools
+lsb-release
+lsof
+vorbisgain
+flac
+vorbis-tools
+pwgen
+libfaad2
+php-apc
+
+lame
+
+coreutils
+
+liquidsoap
+liquidsoap-plugin-alsa
+liquidsoap-plugin-ao
+liquidsoap-plugin-faad
+liquidsoap-plugin-flac
+liquidsoap-plugin-icecast
+liquidsoap-plugin-lame
+liquidsoap-plugin-mad
+liquidsoap-plugin-ogg
+liquidsoap-plugin-portaudio
+liquidsoap-plugin-pulseaudio
+liquidsoap-plugin-taglib
+liquidsoap-plugin-voaacenc
+liquidsoap-plugin-vorbis
+
+silan
+libopus0
+
+sysvinit-utils