use supervisord in image

nix/image/bootstrap.sh

@@ -28,8 +28,6 @@ echo "{}" > /var/www/html/build/integration/composer.lock
 
 echo "Starting server using $SQL database…"
 
-# tail --follow --retry /var/log/nginx/*.log /var/log/cron/owncloud.log &
-
 chmod +sx /sbin/sudo
 
 mkdir -p /var/log/nginx /tmp /var/run/blackfire
@@ -57,23 +55,15 @@ fi
 
 if [ -n "${REDIS_TLS:-}" ]
 then
-  redis-server --protected-mode no \
+  cp /etc/supervisor/redis-tls.conf /etc/supervisor/enabled/
-    --tls-port 6379 --port 0 \
-    --tls-cert-file /certificates/redis/server.crt \
-    --tls-key-file /certificates/redis/server.key \
-    --tls-ca-cert-file /certificates/redis/ca.crt &
 else
-  redis-server --protected-mode no &
+  cp /etc/supervisor/redis-plain.conf /etc/supervisor/enabled/
 fi
 
 if [ -n "${BLACKFIRE_SERVER_ID:-}" ]
 then
-  sh -c '
+  blackfire agent:config --server-id="$BLACKFIRE_SERVER_ID" --server-token="$BLACKFIRE_SERVER_TOKEN"
-    yes | blackfire agent:config --server-id=$BLACKFIRE_SERVER_ID --server-token=$BLACKFIRE_SERVER_TOKEN
+  cp /etc/supervisor/blackfire.conf /etc/supervisor/enabled/
-    BLACKFIRE_LOG_LEVEL=4 BLACKFIRE_LOG_FILE=/var/log/agent.log blackfire agent &
-  '&
 fi
 
-php-fpm --fpm-config /etc/php-fpm.conf&
+exec supervisord -c /etc/supervisor/supervisord.conf
-
-nginx -c /etc/nginx.conf

nix/image/configs.nix

@@ -7,6 +7,9 @@ runCommand "configs" {} ''
   cp ${./configs/nginx-app.conf} $out/conf/nginx-app.conf
   cp ${./configs/sudoers} $out/etc/sudoers.d/haze
   cp -r ${./configs/nc} $out/etc/nc
-  cp ${./php-fpm.conf} $out/etc/php-fpm.conf
+  cp ${./configs/php-fpm.conf} $out/etc/php-fpm.conf
-  cp ${./nginx.conf} $out/etc/nginx.conf
+  cp ${./configs/nginx.conf} $out/etc/nginx.conf
+  cp -r ${./configs/supervisor} $out/etc/supervisor
+  chmod +w $out/etc/supervisor
+  mkdir $out/etc/supervisor/enabled/
 ''

nix/image/configs/supervisor/blackfire.conf

@@ -0,0 +1,2 @@
+[program:blackfire]
+command = blackfire agent

nix/image/configs/supervisor/redis-plain.conf

@@ -0,0 +1,2 @@
+[program:redis]
+command = /bin/redis-server --protected-mode no

nix/image/configs/supervisor/redis-tls.conf

@@ -0,0 +1,6 @@
+[program:redis-tls]
+command = /bin/redis-server --protected-mode no \
+  --tls-port 6379 --port 0 \
+  --tls-cert-file /certificates/redis/server.crt \
+  --tls-key-file /certificates/redis/server.key \
+  --tls-ca-cert-file /certificates/redis/ca.crt

nix/image/configs/supervisor/supervisord.conf

@@ -0,0 +1,25 @@
+[supervisord]
+logfile = /dev/stdout
+logfile_maxbytes = 0
+nodaemon = true
+pidfile = /var/run/supervisord.pid
+
+[unix_http_server]
+file = /var/run/supervisor.sock
+chmod = 0777
+
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl = unix:///var/run/supervisor.sock
+
+[program:nginx]
+command = /bin/nginx -c /etc/nginx.conf
+
+[program:php-fpm]
+command = /bin/php-fpm --fpm-config /etc/php-fpm.conf
+
+[include]
+files = enabled/*

nix/image/haze.nix

@@ -33,6 +33,7 @@
   writeShellApplication,
   vim,
   helix,
+  python3Packages,
 }: let
   inherit (builtins) toString;
   inherit (lib) readFile getExe concatStringsSep splitString take;
@@ -145,6 +146,7 @@
       oracle-instantclient
       vim
       helix
+      python3Packages.supervisor
     ];
   };