Merge branch '2.0' into develop

etc/postinst.in

@@ -50,6 +50,11 @@ then
         systemctl daemon-reload
     fi
 else
+    if [ -d "/etc/init/" ]
+    then
+        cp @CMAKE_INSTALL_PREFIX@/@MAXSCALE_SHAREDIR@/upstart/maxscale.conf /etc/init/
+    fi
+
     # If systemd is not present, use init.d scripts
     if [ -f "@CMAKE_INSTALL_PREFIX@/@MAXSCALE_SHAREDIR@/maxscale" ]
     then

etc/upstart/maxscale.conf.in

@@ -0,0 +1,26 @@
+# MaxScale service
+
+description "MariaDB MaxScale"
+
+start on stopped rc RUNLEVEL=[2345]
+stop on starting rc runlevel [!2345]
+
+# Respawn the process on abnormal exits
+respawn
+
+# Uncomment this to limit respawns to two every five minutes
+# respawn limit 2 5
+
+# Unlimited open files
+limit nofile unlimited unlimited
+
+# Make sure /var/run/maxscale exists
+pre-start exec /usr/bin/install -d -o maxscale -g maxscale @MAXSCALE_VARDIR@/run/maxscale
+
+# Change the user to maxscale:maxscale
+setuid maxscale
+setgid maxscale
+
+# Start MaxScale
+expect fork
+exec /usr/bin/maxscale