Merge pull request #532 from radiorabe/ned-kelly/install-updates

Installer Updates from #517

.gitignore

@@ -14,3 +14,4 @@ composer.phar
 VERSION
 airtime_mvc/tests/log/*.log
 .vagrant/
+.DS_Store

install

@@ -52,7 +52,13 @@ showhelp () {
                 Install Icecast 2 and deploy a basic configuration for Airtime
     --selinux
                 Run restorecon on directories and files that need tagging to
-                allow the WEB_USER access."
+                allow the WEB_USER access
+    --no-postgres
+                Skips all postgres related install tasks (Useful if you configure
+                postgresql as part of another script / docker builds)
+    --no-rabbitmq
+                Skips all rabbitmq related install tasks.
+                "
     exit 0
 }
 
@@ -85,6 +91,8 @@ upgrade="f"
 dist=""
 code=""
 apache_bin=""
+skip_postgres=0
+skip_rabbitmq=0
 
 
 function verbose() {
@@ -449,6 +457,12 @@ while :; do
         --selinux)
             selinux="t"
             ;;
+        --no-postgres)
+            skip_postgres=1
+            ;;
+        --no-rabbitmq)
+            skip_rabbitmq=1
+            ;;            
         --)
             shift
             break
@@ -584,7 +598,7 @@ code="${code:-$VERSION_ID}"
 code="${code,,}"
 verbose "Validating dist-code: ${dist}-${code}"
 case "${dist}-${code}" in
-    ubuntu-16.04|ubuntu-xenial)
+    ubuntu-16.04|ubuntu-xenial|ubuntu-xenial_docker_minimal)
         code="xenial"
         is_ubuntu_dist=true
         is_ubuntu_xenial=true
@@ -986,6 +1000,7 @@ else
     loudCmd "a2enmod rewrite php5"
 fi
 
+if [ $skip_postgres -eq 0 ]; then
     loud "\n-----------------------------------------------------"
     loud "              * Configuring PostgreSQL *              "
     loud "-----------------------------------------------------"
@@ -1020,6 +1035,9 @@ elif [ ${_i} -eq 1 ]; then
             setupAirtimePostgresUser
         fi
     fi
+fi
+
+if [ $skip_rabbitmq -eq 0 ]; then
 
     loud "\n-----------------------------------------------------"
     loud "               * Configuring RabbitMQ *               "
@@ -1049,6 +1067,7 @@ fi
     verbose "\n * Setting RabbitMQ user permissions..."
     #loudCmd "rabbitmqctl set_permissions -p ${RABBITMQ_VHOST} ${RABBITMQ_USER} \"$EXCHANGES\" \"$EXCHANGES\" \"$EXCHANGES\""
     loudCmd "rabbitmqctl set_permissions -p ${RABBITMQ_VHOST} ${RABBITMQ_USER} .\* .\* .\*"
+fi
 
 if [ ! -d "/etc/airtime" ]; then
     loud "\n-----------------------------------------------------"

installer/lib/requirements-ubuntu-xenial_docker_minimal.apt

@@ -0,0 +1,80 @@
+apache2
+libapache2-mod-php7.0
+php7.0
+php-pear
+php7.0-gd
+php-bcmath
+php-mbstring
+
+lsb-release
+
+zip
+unzip
+
+postgresql-client
+php7.0-pgsql
+
+python
+python-virtualenv
+python-pip
+
+libsoundtouch-ocaml
+libtaglib-ocaml
+libao-ocaml
+libmad-ocaml
+ecasound
+libportaudio2
+libsamplerate0
+
+python-rgain
+python-gst-1.0
+gstreamer1.0-plugins-ugly
+python-pika
+
+patch
+
+php7.0-curl
+mpg123
+curl
+
+libcamomile-ocaml-data
+libpulse0
+vorbis-tools
+lsof
+# mp3gain need to be installed over an external ppa or the use of easymp3gain
+easymp3gain-gtk
+vorbisgain
+flac
+vorbis-tools
+pwgen
+libfaad2
+php-apcu
+
+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
+
+build-essential
+libssl-dev
+libffi-dev
+python-dev