Merge pull request #233 from turb/master

Support systemd on Debian

builder/bamboo.default

@@ -0,0 +1,4 @@
+# Bamboo default parameters
+BAMBOO_CONFIG=/opt/bamboo/config/development.json
+BAMBOO_LOG=/var/bamboo/log/bamboo.log
+

builder/bamboo.service

@@ -0,0 +1,21 @@
+[Unit]
+Description=MESOS Marathon Bamboo
+Requires=network-online.target
+
+[Install]
+WantedBy=multi-user.target
+
+[Service]
+EnvironmentFile=/etc/default/bamboo
+Type=simple
+Restart=on-failure
+RestartSec=15s
+TimeoutSec=5min
+IgnoreSIGPIPE=no
+KillMode=process
+PIDFile=/run/bamboo.pid
+RemainAfterExit=no
+User=bamboo
+Group=bamboo
+ExecStart=/opt/bamboo/bamboo -config $BAMBOO_CONFIG -log $BAMBOO_LOG
+

builder/build.after-install

@@ -8,7 +8,7 @@ GROUP="bamboo"
 SHELL="/bin/false"
 
 case "$1" in
-	configure)
+	""|configure) # Work around https://github.com/jordansissel/fpm/issues/1272
         if [ ! -d "${DATADIR}/log" ]; then
 			mkdir -p ${DATADIR}/log
 		fi
@@ -36,4 +36,4 @@ case "$1" in
 		echo "postinst called with unknown argument \`$1'" >&2
 		exit 1
 	;;
-esac
+esac

builder/build.after-remove

@@ -7,10 +7,10 @@ SHELL="/bin/false"
 
 set -e
 
-if getent passwd | grep -q ${USER}; then
+if getent passwd | grep -q "^${USER}:"; then
 	userdel ${USER}
 fi
 
-if getent group | grep -q ${GROUP}; then
+if getent group | grep -q "^${GROUP}:"; then
 	groupdel ${GROUP}
-fi
+fi

builder/build.sh

@@ -36,7 +36,7 @@ function build() {
     cp ${origdir}/bamboo ${name}/${installdir}/bamboo/bamboo
     chmod 755 ${name}/${installdir}/bamboo/bamboo
 
-    # Link default confiugration
+    # Link default configuration
     cp -rp ${origdir}/config/* ${name}/${installdir}/bamboo/config/.
 
     # Distribute UI webapp
@@ -65,6 +65,8 @@ function mkdeb() {
     --before-remove ../../build.before-remove \
     -m "${USER}@${HOSTNAME}" \
     --deb-upstart ../../bamboo-server \
+    --deb-systemd ../../bamboo.service \
+    --deb-default ../../bamboo.default \
     --license "${license}" \
     --prefix=/ \
     -s dir \