From 92eb3946ab45e9737e09a4ffeecf0891f5756868 Mon Sep 17 00:00:00 2001
From: Lapotor <sickert39@gmail.com>
Date: Sun, 9 Apr 2017 20:48:36 +0200
Subject: [PATCH 01/15] Create requirements-ubuntu-xenial.apt

Made a list of pakages which arent't avaibled in Ubuntu 16.04
---
 installer/lib/requirements-ubuntu-xenial.apt | 84 ++++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 installer/lib/requirements-ubuntu-xenial.apt

diff --git a/installer/lib/requirements-ubuntu-xenial.apt b/installer/lib/requirements-ubuntu-xenial.apt
new file mode 100644
index 000000000..fc4f1fa98
--- /dev/null
+++ b/installer/lib/requirements-ubuntu-xenial.apt
@@ -0,0 +1,84 @@
+apache2
+-libapache2-mod-php5
++libapache2-mod-php7.0
+-php5
++php7.0
+php-pear
+-php5-gd
++php7.0-gd
+
+lsb-release
+
+rabbitmq-server
+
+postgresql
+postgresql-client
+-php5-pgsql
++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
+
+patch
+
+-php5-curl
++php7.0-curl
+mpg123
+
+icecast2
+
+libcamomile-ocaml-data
+libpulse0
+vorbis-tools
+-lsb-release
+lsof
+~mp3gain
+vorbisgain
+flac
+vorbis-tools
+pwgen
+libfaad2
+-php-apc
++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

From 9160ffaf20c5a8ee4781f7f55a0ac3dd9aa3e1e4 Mon Sep 17 00:00:00 2001
From: Lapotor <sickert39@gmail.com>
Date: Sun, 9 Apr 2017 21:43:02 +0200
Subject: [PATCH 02/15] Delete requirements-ubuntu-xenial.apt

---
 installer/lib/requirements-ubuntu-xenial.apt | 84 --------------------
 1 file changed, 84 deletions(-)
 delete mode 100644 installer/lib/requirements-ubuntu-xenial.apt

diff --git a/installer/lib/requirements-ubuntu-xenial.apt b/installer/lib/requirements-ubuntu-xenial.apt
deleted file mode 100644
index fc4f1fa98..000000000
--- a/installer/lib/requirements-ubuntu-xenial.apt
+++ /dev/null
@@ -1,84 +0,0 @@
-apache2
--libapache2-mod-php5
-+libapache2-mod-php7.0
--php5
-+php7.0
-php-pear
--php5-gd
-+php7.0-gd
-
-lsb-release
-
-rabbitmq-server
-
-postgresql
-postgresql-client
--php5-pgsql
-+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
-
-patch
-
--php5-curl
-+php7.0-curl
-mpg123
-
-icecast2
-
-libcamomile-ocaml-data
-libpulse0
-vorbis-tools
--lsb-release
-lsof
-~mp3gain
-vorbisgain
-flac
-vorbis-tools
-pwgen
-libfaad2
--php-apc
-+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

From fe92fd00ccc98da393cc7a196236da845a51bdb0 Mon Sep 17 00:00:00 2001
From: Lapotor <sickert39@gmail.com>
Date: Sun, 9 Apr 2017 21:51:17 +0200
Subject: [PATCH 03/15] Create requirements-ubuntu-xenial.apt

---
 installer/lib/requirements-ubuntu-xenial.apt | 78 ++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 installer/lib/requirements-ubuntu-xenial.apt

diff --git a/installer/lib/requirements-ubuntu-xenial.apt b/installer/lib/requirements-ubuntu-xenial.apt
new file mode 100644
index 000000000..b1cdb1664
--- /dev/null
+++ b/installer/lib/requirements-ubuntu-xenial.apt
@@ -0,0 +1,78 @@
+apache2
+libapache2-mod-php7.0
+php7.0
+php-pear
+php7.0-gd
+
+lsb-release
+
+rabbitmq-server
+
+postgresql
+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
+
+patch
+
+php7.0-curl
+mpg123
+
+icecast2
+
+libcamomile-ocaml-data
+libpulse0
+vorbis-tools
+lsof
+# mp3gain need to be installed over an external ppa or the use of easymp3gain
+easymp3gain
+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

From 230aea468e0e7c554cee9f0c1378169eb9909edd Mon Sep 17 00:00:00 2001
From: Lapotor <sickert39@gmail.com>
Date: Tue, 11 Apr 2017 00:37:23 +0200
Subject: [PATCH 04/15] changed --force-yes to --allow if ubuntu xenial

---
 install | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/install b/install
index c46589e51..f542aa511 100755
--- a/install
+++ b/install
@@ -328,7 +328,11 @@ if [ "$ignore_dependencies" = "f" ]; then
     verbose "\n * Reading requirements-${dist,,}-${code,,}.apt..."
     loudCmd "apt-get update"
     if [ -f ${SCRIPT_DIR}/installer/lib/requirements-${dist,,}-${code,,}.apt ]; then
-        loudCmd "DEBIAN_FRONTEND=noninteractive apt-get -y -m --force-yes install $(grep -vE '^\s*#' ${SCRIPT_DIR}/installer/lib/requirements-${dist,,}-${code,,}.apt | tr '\n' ' ')"
+        if [ ${dist,,} == "Ubuntu" ] && [ ${code,,} == "xenial" ]; then
+            loudCmd "DEBIAN_FRONTEND=noninteractive apt-get -y -m --allow install $(grep -vE '^\s*#' ${SCRIPT_DIR}/installer/lib/requirements-${dist,,}-${code,,}.apt | tr '\n' ' ')"
+        else
+            loudCmd "DEBIAN_FRONTEND=noninteractive apt-get -y -m --force-yes install $(grep -vE '^\s*#' ${SCRIPT_DIR}/installer/lib/requirements-${dist,,}-${code,,}.apt | tr '\n' ' ')"
+        fi
     else
         loudCmd "DEBIAN_FRONTEND=noninteractive apt-get -y -m --force-yes install $(grep -vE '^\s*#' ${SCRIPT_DIR}/installer/lib/requirements-ubuntu-trusty.apt | tr '\n' ' ')"
     fi

From 585ea7f82ef2d743803801173d6b239dfda74848 Mon Sep 17 00:00:00 2001
From: Lapotor <sickert39@gmail.com>
Date: Tue, 11 Apr 2017 03:11:23 +0200
Subject: [PATCH 05/15] Update for install on Ubuntu 16.04

Changed will have additional changes is backwards comaptible only if code is xenial the changes will happen
---
 install | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/install b/install
index f542aa511..20436d759 100755
--- a/install
+++ b/install
@@ -328,8 +328,8 @@ if [ "$ignore_dependencies" = "f" ]; then
     verbose "\n * Reading requirements-${dist,,}-${code,,}.apt..."
     loudCmd "apt-get update"
     if [ -f ${SCRIPT_DIR}/installer/lib/requirements-${dist,,}-${code,,}.apt ]; then
-        if [ ${dist,,} == "Ubuntu" ] && [ ${code,,} == "xenial" ]; then
-            loudCmd "DEBIAN_FRONTEND=noninteractive apt-get -y -m --allow install $(grep -vE '^\s*#' ${SCRIPT_DIR}/installer/lib/requirements-${dist,,}-${code,,}.apt | tr '\n' ' ')"
+        if [ ${dist,,} == "ubuntu" ] && [ ${code,,} == "xenial" ]; then
+            loudCmd "DEBIAN_FRONTEND=noninteractive apt-get -y -m --allow-downgrades --allow-remove-essential --allow-change-held-packages install $(grep -vE '^\s*#' ${SCRIPT_DIR}/installer/lib/requirements-${dist,,}-${code,,}.apt | tr '\n' ' ')"
         else
             loudCmd "DEBIAN_FRONTEND=noninteractive apt-get -y -m --force-yes install $(grep -vE '^\s*#' ${SCRIPT_DIR}/installer/lib/requirements-${dist,,}-${code,,}.apt | tr '\n' ' ')"
         fi
@@ -363,7 +363,6 @@ fi
 
 # Run composer (install PHP dependencies) and create a VERSION file
 loudCmd "./build.sh"
-
 if [ -f /etc/airtime/airtime.conf ]; then
     OLD_CONF=$(grep "[media-monitor]" /etc/airtime/airtime.conf)
     
@@ -637,7 +636,12 @@ chmod -R a+x /var/tmp/airtime
 chown -R ${web_user}:${web_user} /var/tmp/airtime/
 
 # PHP Config File for Apache
-libretime_phpini="/etc/php5/apache2/conf.d/airtime.ini"
+if [ ${dist,,} == "ubuntu" ] && [ ${code,,} == "xenial" ]; then
+    libretime_phpini="/etc/php/7.0/apache2/conf.d/airtime.ini"
+else
+    libretime_phpini="/etc/php5/apache2/conf.d/airtime.ini"
+fi
+
 if [ "$dist" = "centos" ]; then
     libretime_phpini="/etc/php.d/airtime.ini"
 fi
@@ -649,8 +653,10 @@ else
 fi
 
 # Enable Apache modules
-if [ "$dist" != "centos" ]; then
+if [ "$dist" != "centos" ] && [ "$code" != "xenial" ]; then
     loudCmd "a2enmod rewrite php5"
+elif [ "$dist" == "ubuntu" ] && [ "$code" == "xenial" ]; then
+	loudCmd "a2enmod rewrite php7.0"
 fi
 
 loud "\n-----------------------------------------------------"

From ad2435b2e6204791e94f6e8438fb208477b6312f Mon Sep 17 00:00:00 2001
From: Lapotor <sickert39@gmail.com>
Date: Tue, 11 Apr 2017 03:12:42 +0200
Subject: [PATCH 06/15] Added php-bcmath and php-mbstring which are needed

---
 installer/lib/requirements-ubuntu-xenial.apt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/installer/lib/requirements-ubuntu-xenial.apt b/installer/lib/requirements-ubuntu-xenial.apt
index b1cdb1664..20bfa352b 100644
--- a/installer/lib/requirements-ubuntu-xenial.apt
+++ b/installer/lib/requirements-ubuntu-xenial.apt
@@ -3,8 +3,11 @@ libapache2-mod-php7.0
 php7.0
 php-pear
 php7.0-gd
+php-bcmath
+php-mbstring
 
 lsb-release
+upstart-sysv
 
 rabbitmq-server
 
@@ -40,7 +43,7 @@ libpulse0
 vorbis-tools
 lsof
 # mp3gain need to be installed over an external ppa or the use of easymp3gain
-easymp3gain
+easymp3gain-gtk
 vorbisgain
 flac
 vorbis-tools

From 78e54eed0b18ebca3865dce859e2757136609733 Mon Sep 17 00:00:00 2001
From: Lapotor <sickert39@gmail.com>
Date: Tue, 11 Apr 2017 05:24:45 +0200
Subject: [PATCH 07/15] added curl

---
 installer/lib/requirements-ubuntu-xenial.apt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/installer/lib/requirements-ubuntu-xenial.apt b/installer/lib/requirements-ubuntu-xenial.apt
index 20bfa352b..b2d491805 100644
--- a/installer/lib/requirements-ubuntu-xenial.apt
+++ b/installer/lib/requirements-ubuntu-xenial.apt
@@ -35,6 +35,7 @@ patch
 
 php7.0-curl
 mpg123
+curl
 
 icecast2
 

From 6a088c56035f65603f86917c5304066fbbbaf1a6 Mon Sep 17 00:00:00 2001
From: Lapotor <sickert39@gmail.com>
Date: Tue, 11 Apr 2017 05:47:43 +0200
Subject: [PATCH 08/15] auto reboot added

after installing upstart it will automaticly restart
---
 install | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/install b/install
index 20436d759..b597dc624 100755
--- a/install
+++ b/install
@@ -349,6 +349,23 @@ else
     fi
 fi
 
+set +e
+    command="initctl"
+    eval hash ${command} 2>/dev/null
+    commandFound=$?
+    if [[ ! ${commandFound} -eq 0 ]] && [ "$dist" == "ubuntu" ] && [ "$code" == "xenial" ]; then
+		verbose "\n * Reset Systemd with Upstart"
+		loudCmd "update-initramfs -u"
+		echo
+		echo "We detect Ubuntu Xenial on your system so we need to change systemd to Upstart to complete this we need to restart your system!"
+		echo "After the restart just restart the instalation."
+		echo -e "To reboot press any key to reboot. \c"
+		read IN
+		loudCmd "reboot"
+    fi
+set -e
+echo "Got it "
+exit
 # Check if composer exists and install if it doesn't
 set +e
 eval hash "composer" 2>/dev/null
@@ -372,7 +389,7 @@ if [ -f /etc/airtime/airtime.conf ]; then
         set +e
         verbose "Stopping airtime services..."
         loudCmd "service airtime-playout stop"
-        loudCmd "service airtime-media-monitor stop"
+        loudCmd "service airtime-celery stop"
         loudCmd "service airtime_analyzer stop"
         loudCmd "service airtime-liquidsoap stop"
         verbose "...Done"
@@ -568,14 +585,14 @@ fi
 # Add celery to the www-data group
 loudCmd "usermod -G ${web_user} -a celery"
 
-if [ "$dist" = "ubuntu" ]; then
+if [ "$dist" = "ubuntu" ] && [ "$code" != "xenial" ] ; then
     loudCmd "initctl reload-configuration"
 fi
 verbose "...Done"
 
 verbose "\n * Installing airtime_analyzer..."
 loudCmd "python ${AIRTIMEROOT}/python_apps/airtime_analyzer/setup.py install --install-scripts=/usr/bin"
-if [ "$dist" = "ubuntu" ]; then
+if [ "$dist" = "ubuntu" ] && [ "$code" != "xenial" ] ; then
     loudCmd "initctl reload-configuration"
 fi
 verbose "...Done"
@@ -587,8 +604,10 @@ for i in /etc/init/airtime*.template; do
 done
 
 set +e
-if [ "$dist" = "ubuntu" ]; then
+if [ "$dist" = "ubuntu" ] && [ "$code" != "xenial" ] ; then
     loudCmd "initctl reload-configuration"
+elif [ "$dist" = "ubuntu" ] && [ "$code" = "xenial" ]; then
+	loudCmd "systemctl restart celery"
 fi
 
 # airtime-celery only has an init.d startup script
@@ -655,10 +674,11 @@ fi
 # Enable Apache modules
 if [ "$dist" != "centos" ] && [ "$code" != "xenial" ]; then
     loudCmd "a2enmod rewrite php5"
-elif [ "$dist" == "ubuntu" ] && [ "$code" == "xenial" ]; then
-	loudCmd "a2enmod rewrite php7.0"
+elif [ "$dist" = "ubuntu" ] && [ "$code" = "xenial" ]; then
+	loudCmd "a2enmod rewrite"
+	loudCmd "a2enmod php7.0"
 fi
-
+exit
 loud "\n-----------------------------------------------------"
 loud "              * Configuring PostgreSQL *              "
 loud "-----------------------------------------------------"

From 1132f79115dd24a1e5ab5dbea6b7ef5d2296a1d7 Mon Sep 17 00:00:00 2001
From: Lapotor <sickert39@gmail.com>
Date: Tue, 11 Apr 2017 05:55:42 +0200
Subject: [PATCH 09/15] Delete develop things

---
 install | 2 --
 1 file changed, 2 deletions(-)

diff --git a/install b/install
index b597dc624..e3cf85699 100755
--- a/install
+++ b/install
@@ -364,8 +364,6 @@ set +e
 		loudCmd "reboot"
     fi
 set -e
-echo "Got it "
-exit
 # Check if composer exists and install if it doesn't
 set +e
 eval hash "composer" 2>/dev/null

From 9c06be3b994557366d052a5e823d430efe9e7268 Mon Sep 17 00:00:00 2001
From: Lapotor <sickert39@gmail.com>
Date: Tue, 11 Apr 2017 06:03:45 +0200
Subject: [PATCH 10/15] Deletet Auto install of Upstart

---
 install | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/install b/install
index e3cf85699..9ae8396d2 100755
--- a/install
+++ b/install
@@ -349,21 +349,21 @@ else
     fi
 fi
 
-set +e
-    command="initctl"
-    eval hash ${command} 2>/dev/null
-    commandFound=$?
-    if [[ ! ${commandFound} -eq 0 ]] && [ "$dist" == "ubuntu" ] && [ "$code" == "xenial" ]; then
-		verbose "\n * Reset Systemd with Upstart"
-		loudCmd "update-initramfs -u"
-		echo
-		echo "We detect Ubuntu Xenial on your system so we need to change systemd to Upstart to complete this we need to restart your system!"
-		echo "After the restart just restart the instalation."
-		echo -e "To reboot press any key to reboot. \c"
-		read IN
-		loudCmd "reboot"
-    fi
-set -e
+#set +e
+#    command="initctl"
+#    eval hash ${command} 2>/dev/null
+#    commandFound=$?
+#    if [[ ! ${commandFound} -eq 0 ]] && [ "$dist" == "ubuntu" ] && [ "$code" == "xenial" ]; then#
+#		verbose "\n * Reset Systemd with Upstart"
+#		loudCmd "update-initramfs -u"
+#		echo
+#		echo "We detect Ubuntu Xenial on your system so we need to change systemd to Upstart to complete this we need to restart your system!"
+#		echo "After the restart just restart the instalation."
+#		echo -e "To reboot press any key to reboot. \c"
+#		read IN
+#		loudCmd "reboot"
+#    fi
+#set -e
 # Check if composer exists and install if it doesn't
 set +e
 eval hash "composer" 2>/dev/null

From a6d6b8a06cf5346b8e425edc330753f8f2d5afcc Mon Sep 17 00:00:00 2001
From: Lapotor <sickert39@gmail.com>
Date: Tue, 11 Apr 2017 06:04:29 +0200
Subject: [PATCH 11/15] Deleted upstart from auto install

---
 installer/lib/requirements-ubuntu-xenial.apt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installer/lib/requirements-ubuntu-xenial.apt b/installer/lib/requirements-ubuntu-xenial.apt
index b2d491805..20634c407 100644
--- a/installer/lib/requirements-ubuntu-xenial.apt
+++ b/installer/lib/requirements-ubuntu-xenial.apt
@@ -7,7 +7,7 @@ php-bcmath
 php-mbstring
 
 lsb-release
-upstart-sysv
+# upstart-sysv
 
 rabbitmq-server
 

From c8a474e1fedb2a155122090b392de1fccc28f7bd Mon Sep 17 00:00:00 2001
From: Lapotor <sickert39@gmail.com>
Date: Tue, 11 Apr 2017 14:36:34 +0200
Subject: [PATCH 12/15] Delete debug things, changed if for initctl

---
 install | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/install b/install
index 9ae8396d2..63d9a6376 100755
--- a/install
+++ b/install
@@ -583,14 +583,14 @@ fi
 # Add celery to the www-data group
 loudCmd "usermod -G ${web_user} -a celery"
 
-if [ "$dist" = "ubuntu" ] && [ "$code" != "xenial" ] ; then
+if [ "$dist" = "ubuntu" ]; then
     loudCmd "initctl reload-configuration"
 fi
 verbose "...Done"
 
 verbose "\n * Installing airtime_analyzer..."
 loudCmd "python ${AIRTIMEROOT}/python_apps/airtime_analyzer/setup.py install --install-scripts=/usr/bin"
-if [ "$dist" = "ubuntu" ] && [ "$code" != "xenial" ] ; then
+if [ "$dist" = "ubuntu" ]; then
     loudCmd "initctl reload-configuration"
 fi
 verbose "...Done"
@@ -676,7 +676,6 @@ elif [ "$dist" = "ubuntu" ] && [ "$code" = "xenial" ]; then
 	loudCmd "a2enmod rewrite"
 	loudCmd "a2enmod php7.0"
 fi
-exit
 loud "\n-----------------------------------------------------"
 loud "              * Configuring PostgreSQL *              "
 loud "-----------------------------------------------------"

From 28fb7fca721031181b9783d88c18da3ef9c1e5c8 Mon Sep 17 00:00:00 2001
From: Lapotor <sickert39@gmail.com>
Date: Wed, 19 Apr 2017 20:35:47 +0200
Subject: [PATCH 13/15] Changed on Xenial Upstart to Systemd

---
 install | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/install b/install
index 63d9a6376..48f27270b 100755
--- a/install
+++ b/install
@@ -349,21 +349,6 @@ else
     fi
 fi
 
-#set +e
-#    command="initctl"
-#    eval hash ${command} 2>/dev/null
-#    commandFound=$?
-#    if [[ ! ${commandFound} -eq 0 ]] && [ "$dist" == "ubuntu" ] && [ "$code" == "xenial" ]; then#
-#		verbose "\n * Reset Systemd with Upstart"
-#		loudCmd "update-initramfs -u"
-#		echo
-#		echo "We detect Ubuntu Xenial on your system so we need to change systemd to Upstart to complete this we need to restart your system!"
-#		echo "After the restart just restart the instalation."
-#		echo -e "To reboot press any key to reboot. \c"
-#		read IN
-#		loudCmd "reboot"
-#    fi
-#set -e
 # Check if composer exists and install if it doesn't
 set +e
 eval hash "composer" 2>/dev/null
@@ -583,15 +568,19 @@ fi
 # Add celery to the www-data group
 loudCmd "usermod -G ${web_user} -a celery"
 
-if [ "$dist" = "ubuntu" ]; then
+if [ "$dist" = "ubuntu" ] && [ "$code" != "xenial" ]; then
     loudCmd "initctl reload-configuration"
+elif [ "$dist" = "ubuntu" ] && [ "$code" = "xenial" ]; then
+	loudCmd "systemctl daemon-reload"
 fi
 verbose "...Done"
 
 verbose "\n * Installing airtime_analyzer..."
 loudCmd "python ${AIRTIMEROOT}/python_apps/airtime_analyzer/setup.py install --install-scripts=/usr/bin"
-if [ "$dist" = "ubuntu" ]; then
+if [ "$dist" = "ubuntu" ] && [ "$code" != "xenial" ]; then
     loudCmd "initctl reload-configuration"
+elif [ "$dist" = "ubuntu" ] && [ "$code" = "xenial" ]; then
+	loudCmd "systemctl daemon-reload"
 fi
 verbose "...Done"
 
@@ -605,7 +594,7 @@ set +e
 if [ "$dist" = "ubuntu" ] && [ "$code" != "xenial" ] ; then
     loudCmd "initctl reload-configuration"
 elif [ "$dist" = "ubuntu" ] && [ "$code" = "xenial" ]; then
-	loudCmd "systemctl restart celery"
+	loudCmd "systemctl daemon-reload"
 fi
 
 # airtime-celery only has an init.d startup script

From 0766b91cde4bce4ad9a2d4d4d7706d646bb38a86 Mon Sep 17 00:00:00 2001
From: Lapotor <sickert39@gmail.com>
Date: Wed, 19 Apr 2017 20:36:48 +0200
Subject: [PATCH 14/15] Added remind to reload systemctl for Xenail

---
 python_apps/airtime_analyzer/setup.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/python_apps/airtime_analyzer/setup.py b/python_apps/airtime_analyzer/setup.py
index 1d1ff773a..42d1921cc 100644
--- a/python_apps/airtime_analyzer/setup.py
+++ b/python_apps/airtime_analyzer/setup.py
@@ -53,3 +53,6 @@ setup(name='airtime_analyzer',
 if data_files:
     print "Remember to reload the initctl configuration"
     print "Run \"sudo initctl reload-configuration; sudo service airtime_analyzer restart\" now."
+    print "Or on Ubuntu Xenial (16.04)"
+    print "Remember to reload the systemd configuration"
+    print "Run \"sudo systemctl daemon-reload; sudo service airtime_analyzer restart\" now."

From 74d58b7555d39165ef349fc284a0b33fb25f54bd Mon Sep 17 00:00:00 2001
From: Lapotor <sickert39@gmail.com>
Date: Wed, 19 Apr 2017 20:45:17 +0200
Subject: [PATCH 15/15] Removed upstart-sysv comment

---
 installer/lib/requirements-ubuntu-xenial.apt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/installer/lib/requirements-ubuntu-xenial.apt b/installer/lib/requirements-ubuntu-xenial.apt
index 20634c407..17f09a24f 100644
--- a/installer/lib/requirements-ubuntu-xenial.apt
+++ b/installer/lib/requirements-ubuntu-xenial.apt
@@ -7,7 +7,6 @@ php-bcmath
 php-mbstring
 
 lsb-release
-# upstart-sysv
 
 rabbitmq-server