base: move files to resources.

server/runtime/intel/add-render-group.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# if no hwenc required, noop
+[[ -z "$NEKO_HWENC" ]] && exit 0
+
+if [[ -z "$RENDER_GID" ]]; then
+  RENDER_GID=$(stat -c "%g" /dev/dri/render* | tail -n 1)
+  # is /dev/dri passed to the container?
+  [[ -z "$RENDER_GID" ]] && exit 1
+fi
+
+# note that this could conceivably be a security risk...
+cnt_group=$(getent group "$RENDER_GID" | cut -d: -f1)
+if [[ -z "$cnt_group" ]]; then
+  groupadd -g "$RENDER_GID" nekorender
+  cnt_group=nekorender
+fi
+usermod -a -G "$cnt_group" "$USER"

server/runtime/intel/supervisord.rendergroup.conf

@@ -0,0 +1,12 @@
+[program:rendergroup-init]
+environment=RENDER_GID="%(ENV_RENDER_GID)s",USER="%(ENV_USER)s"
+command=/usr/bin/add-render-group.sh
+startsecs=0
+startretries=0
+autorestart=false
+priority=10
+user=root
+stdout_logfile=/var/log/neko/rendergroup.log
+stdout_logfile_maxbytes=1MB
+stdout_logfile_backups=10
+redirect_stderr=true

server/runtime/nvidia/entrypoint.sh

@@ -0,0 +1,12 @@
+#!/bin/bash -e
+
+# Add VirtualGL directories to path
+export PATH="${PATH}:/opt/VirtualGL/bin"
+
+# Use VirtualGL to run wine with OpenGL if the GPU is available, otherwise use barebone wine
+if [ -n "$(nvidia-smi --query-gpu=uuid --format=csv | sed -n 2p)" ]; then
+    exec vglrun "$@"
+else
+    echo "No GPU detected"
+    exec "$@"
+fi

server/runtime/supervisord.conf

@@ -2,8 +2,9 @@
 nodaemon=true
 user=root
 pidfile=/var/run/supervisord.pid
-logfile=/dev/stderr
+logfile=/dev/null
 logfile_maxbytes=0
+loglevel=debug
 
 [include]
 files=/etc/neko/supervisord/*.conf
@@ -14,8 +15,9 @@ command=/usr/bin/X %(ENV_DISPLAY)s -config /etc/neko/xorg.conf -noreset -noliste
 autorestart=true
 priority=300
 user=%(ENV_USER)s
-stdout_logfile=/dev/stderr
-stdout_logfile_maxbytes=0
+stdout_logfile=/var/log/neko/xorg.log
+stdout_logfile_maxbytes=100MB
+stdout_logfile_backups=10
 redirect_stderr=true
 
 [program:pulseaudio]
@@ -24,20 +26,22 @@ command=/usr/bin/pulseaudio --log-level=error --disallow-module-loading --disall
 autorestart=true
 priority=300
 user=%(ENV_USER)s
-stdout_logfile=/dev/stderr
-stdout_logfile_maxbytes=0
+stdout_logfile=/var/log/neko/pulseaudio.log
+stdout_logfile_maxbytes=100MB
+stdout_logfile_backups=10
 redirect_stderr=true
 
 [program:neko]
 environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
-command=/usr/bin/neko serve
+command=/usr/bin/neko serve --static "/var/www"
 stopsignal=INT
 stopwaitsecs=3
 autorestart=true
 priority=800
 user=%(ENV_USER)s
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
+stdout_logfile=/var/log/neko/neko.log
+stdout_logfile_maxbytes=100MB
+stdout_logfile_backups=10
 redirect_stderr=true
 
 [unix_http_server]

server/runtime/supervisord.dbus.conf

@@ -4,6 +4,7 @@ command=/usr/bin/dbus
 autorestart=true
 priority=100
 user=root
-stdout_logfile=/dev/stderr
-stdout_logfile_maxbytes=0
+stdout_logfile=/var/log/neko/dbus.log
+stdout_logfile_maxbytes=100MB
+stdout_logfile_backups=10
 redirect_stderr=true