Migrations/neko
1
0
Fork 0
mirror of https://github.com/m1k1o/neko.git synced 2026-11-03 08:21:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

base: move files to resources.

Browse Source
This commit is contained in:
Miroslav Šedivý
2024-09-08 11:11:32 +02:00
parent bba8fce895
commit 0c1d7ef229
14 changed files with 50 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.docker/base/Dockerfile
+5 -4
View File
@@ -110,10 +110,11 @@ RUN set -eux; \
# #
# copy config files # copy config files
COPY .docker/base/dbus /usr/bin/dbus COPY server/runtime/dbus /usr/bin/dbus
COPY .docker/base/default.pa /etc/pulse/default.pa COPY server/runtime/default.pa /etc/pulse/default.pa
COPY .docker/base/supervisord.conf /etc/neko/supervisord.conf COPY server/runtime/supervisord.conf /etc/neko/supervisord.conf
COPY .docker/base/xorg.conf /etc/neko/xorg.conf COPY server/runtime/supervisord.dbus.conf /etc/neko/supervisord.dbus.conf
COPY server/runtime/xorg.conf /etc/neko/xorg.conf
# #
# set default envs # set default envs
.docker/base/Dockerfile.arm
+5 -4
View File
@@ -119,10 +119,11 @@ RUN set -eux; \
# #
# copy config files # copy config files
COPY .docker/base/dbus /usr/bin/dbus COPY server/runtime/dbus /usr/bin/dbus
COPY .docker/base/default.pa /etc/pulse/default.pa COPY server/runtime/default.pa /etc/pulse/default.pa
COPY .docker/base/supervisord.conf /etc/neko/supervisord.conf COPY server/runtime/supervisord.conf /etc/neko/supervisord.conf
COPY .docker/base/xorg.conf /etc/neko/xorg.conf COPY server/runtime/supervisord.dbus.conf /etc/neko/supervisord.dbus.conf
COPY server/runtime/xorg.conf /etc/neko/xorg.conf
# #
# set default envs # set default envs
.docker/base/Dockerfile.intel
+7 -5
View File
@@ -119,11 +119,13 @@ RUN set -eux; \
# #
# copy config files # copy config files
COPY .docker/base/dbus /usr/bin/dbus COPY server/runtime/dbus /usr/bin/dbus
COPY .docker/base/default.pa /etc/pulse/default.pa COPY server/runtime/default.pa /etc/pulse/default.pa
COPY .docker/base/intel/supervisord.conf /etc/neko/supervisord.conf COPY server/runtime/supervisord.conf /etc/neko/supervisord.conf
COPY .docker/base/xorg.conf /etc/neko/xorg.conf COPY server/runtime/supervisord.dbus.conf /etc/neko/supervisord.dbus.conf
COPY .docker/base/intel/add-render-group.sh /usr/bin/add-render-group.sh COPY server/runtime/xorg.conf /etc/neko/xorg.conf
COPY server/runtime/intel/add-render-group.sh /usr/bin/add-render-group.sh
COPY server/runtime/intel/supervisord.rendergroup.conf /etc/neko/supervisord/supervisord.rendergroup.conf
# #
# set default envs # set default envs
.docker/base/Dockerfile.nvidia
+6 -5
View File
@@ -255,11 +255,12 @@ RUN set -eux; \
# #
# copy config files # copy config files
COPY .docker/base/dbus /usr/bin/dbus COPY server/runtime/dbus /usr/bin/dbus
COPY .docker/base/default.pa /etc/pulse/default.pa COPY server/runtime/default.pa /etc/pulse/default.pa
COPY .docker/base/supervisord.conf /etc/neko/supervisord.conf COPY server/runtime/supervisord.conf /etc/neko/supervisord.conf
COPY .docker/base/xorg.conf /etc/neko/xorg.conf COPY server/runtime/supervisord.dbus.conf /etc/neko/supervisord.dbus.conf
COPY .docker/base/nvidia/entrypoint.sh /bin/entrypoint.sh COPY server/runtime/xorg.conf /etc/neko/xorg.conf
COPY server/runtime/nvidia/entrypoint.sh /bin/entrypoint.sh
# #
# set default envs # set default envs
.docker/base/dbus
-11
View File
@@ -1,11 +0,0 @@
#!/bin/sh
if [ ! -d /var/run/dbus ]; then
mkdir -p /var/run/dbus
fi
if [ -f /var/run/dbus/pid ]; then
rm -f /var/run/dbus/pid
fi
/usr/bin/dbus-daemon --nofork --print-pid --config-file=/usr/share/dbus-1/system.conf
.docker/base/default.pa
-10
View File
@@ -1,10 +0,0 @@
#!/usr/bin/pulseaudio -nF
### Create virtual output device sink
load-module module-null-sink sink_name=audio_output sink_properties=device.description="Virtual\ Audio\ Output"
# Allow pulse audio to be accessed via TCP (from localhost only), to allow other users to access the virtual devices
load-module module-native-protocol-unix socket=/tmp/pulseaudio.socket auth-anonymous=1
### Make sure we always have a sink around, even if it is a null sink.
load-module module-always-sink
.docker/base/intel/supervisord.conf
-69
View File
@@ -1,69 +0,0 @@
[supervisord]
nodaemon=true
user=root
pidfile=/var/run/supervisord.pid
logfile=/dev/null
logfile_maxbytes=0
loglevel=debug
[include]
files=/etc/neko/supervisord/*.conf
[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
[program:dbus]
environment=HOME="/root",USER="root"
command=/usr/bin/dbus
autorestart=true
priority=100
user=root
stdout_logfile=/var/log/neko/dbus.log
stdout_logfile_maxbytes=100MB
stdout_logfile_backups=10
redirect_stderr=true
[program:x-server]
environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s"
command=/usr/bin/X -config /etc/neko/xorg.conf %(ENV_DISPLAY)s
autorestart=true
priority=300
user=%(ENV_USER)s
stdout_logfile=/var/log/neko/xorg.log
stdout_logfile_maxbytes=100MB
stdout_logfile_backups=10
redirect_stderr=true
[program:pulseaudio]
environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
command=/usr/bin/pulseaudio --log-level=info --disallow-module-loading --disallow-exit --exit-idle-time=-1
autorestart=true
priority=300
user=%(ENV_USER)s
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 --static "/var/www"
stopsignal=INT
stopwaitsecs=5
autorestart=true
priority=800
user=%(ENV_USER)s
stdout_logfile=/var/log/neko/neko.log
stdout_logfile_maxbytes=100MB
stdout_logfile_backups=10
redirect_stderr=true
.docker/base/supervisord.conf
-67
View File
@@ -1,67 +0,0 @@
[supervisord]
nodaemon=true
user=root
pidfile=/var/run/supervisord.pid
logfile=/dev/null
logfile_maxbytes=0
loglevel=debug
[include]
files=/etc/neko/supervisord/*.conf
[program:dbus]
environment=HOME="/root",USER="root"
command=/usr/bin/dbus
autorestart=true
priority=100
user=root
stdout_logfile=/var/log/neko/dbus.log
stdout_logfile_maxbytes=100MB
stdout_logfile_backups=10
redirect_stderr=true
[program:x-server]
environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s"
command=/usr/bin/X -config /etc/neko/xorg.conf %(ENV_DISPLAY)s
autorestart=true
priority=300
user=%(ENV_USER)s
stdout_logfile=/var/log/neko/xorg.log
stdout_logfile_maxbytes=100MB
stdout_logfile_backups=10
redirect_stderr=true
[program:pulseaudio]
environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
command=/usr/bin/pulseaudio --log-level=info --disallow-module-loading --disallow-exit --exit-idle-time=-1
autorestart=true
priority=300
user=%(ENV_USER)s
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 --static "/var/www"
stopsignal=INT
stopwaitsecs=5
autorestart=true
priority=800
user=%(ENV_USER)s
stdout_logfile=/var/log/neko/neko.log
stdout_logfile_maxbytes=100MB
stdout_logfile_backups=10
redirect_stderr=true
[unix_http_server]
file=/var/run/supervisor.sock
chmod=0700
chown=root:root
[supervisorctl]
serverurl=unix:///var/run/supervisor.sock
[rpcinterface:supervisor]
supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
.docker/base/xorg.conf
-88
View File
@@ -1,88 +0,0 @@
# This xorg configuration file is meant to be used by xpra
# to start a dummy X11 server.
# For details, please see:
# https://xpra.org/trac/wiki/Xdummy
Section "ServerFlags"
Option "DontVTSwitch" "true"
Option "AllowMouseOpenFail" "true"
Option "PciForceNone" "true"
Option "AutoEnableDevices" "false"
Option "AutoAddDevices" "false"
EndSection
Section "InputDevice"
Identifier "dummy_mouse"
Option "CorePointer" "true"
Driver "void"
EndSection
Section "InputDevice"
Identifier "dummy_keyboard"
Option "CoreKeyboard" "true"
Driver "void"
EndSection
Section "Device"
Identifier "dummy_videocard"
Driver "dummy"
Option "ConstantDPI" "true"
#VideoRam 4096000
#VideoRam 256000
VideoRam 192000
EndSection
Section "Monitor"
Identifier "dummy_monitor"
HorizSync 5.0 - 1000.0
VertRefresh 5.0 - 200.0
#This can be used to get a specific DPI, but only for the default resolution:
#DisplaySize 508 317
#NOTE: the highest modes will not work without increasing the VideoRam
# for the dummy video card.
# https://arachnoid.com/modelines/
# 1280x720 @ 30.00 Hz (GTF) hsync: 21.99 kHz; pclk: 33.78 MHz
Modeline "1280x720_30.00" 33.78 1280 1288 1408 1536 720 721 724 733 -HSync +Vsync
# 1280x720 @ 60.00 Hz (GTF) hsync: 44.76 kHz; pclk: 74.48 MHz
Modeline "1280x720_60.00" 74.48 1280 1336 1472 1664 720 721 724 746 -HSync +Vsync
# 1152x648 @ 60.00 Hz (GTF) hsync: 40.26 kHz; pclk: 59.91 MHz
Modeline "1152x648_60.00" 59.91 1152 1200 1320 1488 648 649 652 671 -HSync +Vsync
# 1024x576 @ 60.00 Hz (GTF) hsync: 35.82 kHz; pclk: 47.00 MHz
Modeline "1024x576_60.00" 47.00 1024 1064 1168 1312 576 577 580 597 -HSync +Vsync
# 960x720 @ 60.00 Hz (GTF) hsync: 44.76 kHz; pclk: 55.86 MHz
Modeline "960x720_60.00" 55.86 960 1008 1104 1248 720 721 724 746 -HSync +Vsync
# 800x600 @ 60.00 Hz (GTF) hsync: 37.32 kHz; pclk: 38.22 MHz
Modeline "800x600_60.00" 38.22 800 832 912 1024 600 601 604 622 -HSync +Vsync
# 1920x1080 @ 30.00 Hz (GTF) hsync: 32.97 kHz; pclk: 80.18 MHz
Modeline "1920x1080_30.00" 80.18 1920 1984 2176 2432 1080 1081 1084 1099 -HSync +Vsync
# 1152x648 @ 30.00 Hz (GTF) hsync: 19.80 kHz; pclk: 26.93 MHz
Modeline "1152x648_30.00" 26.93 1152 1144 1256 1360 648 649 652 660 -HSync +Vsync
# 1024x576 @ 30.00 Hz (GTF) hsync: 17.61 kHz; pclk: 20.85 MHz
Modeline "1024x576_30.00" 20.85 1024 1008 1104 1184 576 577 580 587 -HSync +Vsync
# 960x720 @ 30.00 Hz (GTF) hsync: 21.99 kHz; pclk: 25.33 MHz
Modeline "960x720_30.00" 25.33 960 960 1056 1152 720 721 724 733 -HSync +Vsync
# 800x600 @ 30.00 Hz (GTF) hsync: 18.33 kHz; pclk: 17.01 MHz
Modeline "800x600_30.00" 17.01 800 792 864 928 600 601 604 611 -HSync +Vsync
EndSection
Section "Screen"
Identifier "dummy_screen"
Device "dummy_videocard"
Monitor "dummy_monitor"
DefaultDepth 24
SubSectionSub "Display"
Viewport 0 0
Depth 24
Modes "1280x720_30.00" "1920x1080_60.00" "1280x720_60.00" "1152x648_60.00" "1024x576_60.00" "960x720_60.00" "800x600_60.00" "1920x1080_30.00" "1152x648_30.00" "1024x576_30.00" "960x720_30.00" "800x600_30.00"
EndSubSection
EndSection
Section "ServerLayout"
Identifier "dummy_layout"
Screen "dummy_screen"
InputDevice "dummy_mouse"
InputDevice "dummy_keyboard"
EndSection
.docker/base/intel/add-render-group.sh → server/runtime/intel/add-render-group.sh
View File
server/runtime/intel/supervisord.rendergroup.conf
+12
View File
@@ -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
.docker/base/nvidia/entrypoint.sh → server/runtime/nvidia/entrypoint.sh
View File
server/runtime/supervisord.conf
+12 -8
View File
@@ -2,8 +2,9 @@
nodaemon=true nodaemon=true
user=root user=root
pidfile=/var/run/supervisord.pid pidfile=/var/run/supervisord.pid
logfile=/dev/stderr logfile=/dev/null
logfile_maxbytes=0 logfile_maxbytes=0
loglevel=debug
[include] [include]
files=/etc/neko/supervisord/*.conf 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 autorestart=true
priority=300 priority=300
user=%(ENV_USER)s user=%(ENV_USER)s
stdout_logfile=/dev/stderr stdout_logfile=/var/log/neko/xorg.log
stdout_logfile_maxbytes=0 stdout_logfile_maxbytes=100MB
stdout_logfile_backups=10
redirect_stderr=true redirect_stderr=true
[program:pulseaudio] [program:pulseaudio]
@@ -24,20 +26,22 @@ command=/usr/bin/pulseaudio --log-level=error --disallow-module-loading --disall
autorestart=true autorestart=true
priority=300 priority=300
user=%(ENV_USER)s user=%(ENV_USER)s
stdout_logfile=/dev/stderr stdout_logfile=/var/log/neko/pulseaudio.log
stdout_logfile_maxbytes=0 stdout_logfile_maxbytes=100MB
stdout_logfile_backups=10
redirect_stderr=true redirect_stderr=true
[program:neko] [program:neko]
environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s" 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 stopsignal=INT
stopwaitsecs=3 stopwaitsecs=3
autorestart=true autorestart=true
priority=800 priority=800
user=%(ENV_USER)s user=%(ENV_USER)s
stdout_logfile=/dev/stdout stdout_logfile=/var/log/neko/neko.log
stdout_logfile_maxbytes=0 stdout_logfile_maxbytes=100MB
stdout_logfile_backups=10
redirect_stderr=true redirect_stderr=true
[unix_http_server] [unix_http_server]
server/runtime/supervisord.dbus.conf
+3 -2
View File
@@ -4,6 +4,7 @@ command=/usr/bin/dbus
autorestart=true autorestart=true
priority=100 priority=100
user=root user=root
stdout_logfile=/dev/stderr stdout_logfile=/var/log/neko/dbus.log
stdout_logfile_maxbytes=0 stdout_logfile_maxbytes=100MB
stdout_logfile_backups=10
redirect_stderr=true redirect_stderr=true