From 2dc2b073e418ebd9c1edbff2144a54d8609f8c49 Mon Sep 17 00:00:00 2001
From: Alvaro Aleman <alv2412@googlemail.com>
Date: Mon, 29 Aug 2016 22:07:53 +0200
Subject: [PATCH] Use exec in wrapper scripts

---
 lutim/run.sh           | 2 +-
 lychee/run.sh          | 2 +-
 nextcloud/10.0/run.sh  | 2 +-
 nextcloud/9.0/run.sh   | 2 +-
 nextcloud/daily/run.sh | 2 +-
 piwik/run.sh           | 2 +-
 privatebin/run.sh      | 2 +-
 rainloop/run.sh        | 2 +-
 searx/run.sh           | 2 +-
 subsonic/run.sh        | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lutim/run.sh b/lutim/run.sh
index e4275f1..b369ea1 100644
--- a/lutim/run.sh
+++ b/lutim/run.sh
@@ -8,4 +8,4 @@ sed -i -e 's/<contact>/'$CONTACT'/g' \
        -e 's/<domain>/'$DOMAIN'/g' \
        -e 's|<webroot>|'$WEBROOT'|g' /lutim/lutim.conf
 chown -R lutim:lutim /lutim /data
-cd /lutim && su lutim -c "carton exec hypnotoad -f /lutim/script/lutim"
+cd /lutim && exec su lutim -c "carton exec hypnotoad -f /lutim/script/lutim"
diff --git a/lychee/run.sh b/lychee/run.sh
index b5d7808..6417909 100644
--- a/lychee/run.sh
+++ b/lychee/run.sh
@@ -2,4 +2,4 @@
 addgroup -g ${GID} lychee && adduser -h /lychee -s /bin/sh -D -G lychee -u ${UID} lychee
 mkdir /lychee/uploads/big /lychee/uploads/import /lychee/uploads/medium /lychee/uploads/thumb
 chown -R lychee:lychee /lychee /var/run/php-fpm.sock /var/lib/nginx /tmp
-supervisord -c /usr/local/etc/supervisord.conf
+exec supervisord -c /usr/local/etc/supervisord.conf
diff --git a/nextcloud/10.0/run.sh b/nextcloud/10.0/run.sh
index 1bf4d50..3c61faa 100644
--- a/nextcloud/10.0/run.sh
+++ b/nextcloud/10.0/run.sh
@@ -12,4 +12,4 @@ chown -R nextcloud:nextcloud /nextcloud /data /config /apps2 /var/run/php-fpm.so
 ln -s /config/config.php /nextcloud/config/config.php
 ln -s /apps2 /nextcloud
 
-supervisord -c /etc/supervisor/supervisord.conf
+exec supervisord -c /etc/supervisor/supervisord.conf
diff --git a/nextcloud/9.0/run.sh b/nextcloud/9.0/run.sh
index 1bf4d50..3c61faa 100644
--- a/nextcloud/9.0/run.sh
+++ b/nextcloud/9.0/run.sh
@@ -12,4 +12,4 @@ chown -R nextcloud:nextcloud /nextcloud /data /config /apps2 /var/run/php-fpm.so
 ln -s /config/config.php /nextcloud/config/config.php
 ln -s /apps2 /nextcloud
 
-supervisord -c /etc/supervisor/supervisord.conf
+exec supervisord -c /etc/supervisor/supervisord.conf
diff --git a/nextcloud/daily/run.sh b/nextcloud/daily/run.sh
index 1bf4d50..3c61faa 100644
--- a/nextcloud/daily/run.sh
+++ b/nextcloud/daily/run.sh
@@ -12,4 +12,4 @@ chown -R nextcloud:nextcloud /nextcloud /data /config /apps2 /var/run/php-fpm.so
 ln -s /config/config.php /nextcloud/config/config.php
 ln -s /apps2 /nextcloud
 
-supervisord -c /etc/supervisor/supervisord.conf
+exec supervisord -c /etc/supervisor/supervisord.conf
diff --git a/piwik/run.sh b/piwik/run.sh
index fd02d24..09478a9 100644
--- a/piwik/run.sh
+++ b/piwik/run.sh
@@ -9,4 +9,4 @@ elif [ -f /config/config.ini.php ]; then
 fi
 
 chown -R piwik:piwik /piwik /config /var/run/php-fpm.sock /var/lib/nginx /tmp
-supervisord -c /usr/local/etc/supervisord.conf
+exec supervisord -c /usr/local/etc/supervisord.conf
diff --git a/privatebin/run.sh b/privatebin/run.sh
index bdf8880..43a41bd 100644
--- a/privatebin/run.sh
+++ b/privatebin/run.sh
@@ -2,4 +2,4 @@
 addgroup -g ${GID} zerobin && adduser -h /zerobin -s /bin/sh -D -G zerobin -u ${UID} zerobin
 touch /var/run/php-fpm.sock
 chown -R zerobin:zerobin /zerobin /var/run/php-fpm.sock /var/lib/nginx /tmp
-supervisord -c /usr/local/etc/supervisord.conf
+exec supervisord -c /usr/local/etc/supervisord.conf
diff --git a/rainloop/run.sh b/rainloop/run.sh
index fe8d54e..1a1c0db 100644
--- a/rainloop/run.sh
+++ b/rainloop/run.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -g ${GID} rainloop && adduser -h /rainloop -s /bin/sh -D -G rainloop -u ${UID} rainloop
 chown -R rainloop:rainloop /rainloop /var/run/php-fpm.sock /var/lib/nginx /tmp
-supervisord -c /usr/local/etc/supervisord.conf
+exec supervisord -c /usr/local/etc/supervisord.conf
diff --git a/searx/run.sh b/searx/run.sh
index 32864c0..0c7d4c5 100644
--- a/searx/run.sh
+++ b/searx/run.sh
@@ -4,4 +4,4 @@ sed -i -e "s|base_url : False|base_url : ${BASE_URL}|g" \
        -e "s/ultrasecretkey/$(openssl rand -hex 16)/g" \
        /usr/local/searx/searx/settings.yml
 
-python /usr/local/searx/searx/webapp.py
+exec python /usr/local/searx/searx/webapp.py
diff --git a/subsonic/run.sh b/subsonic/run.sh
index eb2a2d3..1b18ebc 100644
--- a/subsonic/run.sh
+++ b/subsonic/run.sh
@@ -9,7 +9,7 @@ chown -R subsonic:subsonic /data /playlists /subsonic
 
 sleep 7 # avoid 503
 
-su subsonic << EOF
+exec su subsonic << EOF
 java -Xmx200m \
   -Dsubsonic.home=/data \
   -Dsubsonic.host=0.0.0.0 \