Remove dummy touchscreen; fix supervisord & defaults
Remove non-portable dummy_touchscreen InputDevice from Xorg config and adjust dummy_mouse entry. Hardcode supervisord environment/user/display to 'neko' and :99.0 for X, PulseAudio, Firefox, Openbox and the Neko server to simplify runtime on bare-metal. Update /etc/neko/neko.yaml to disable session cookies, enable WebRTC icelite, add nat1to1 mapping with ${LOCAL_IP}, set EPR port range 59000-59100, and disable desktop input. Update json/neko.json to clear the default username (null) and clarify the password-only login note. These changes make the packaged runtime compatible without the custom Xorg driver and streamline defaults for deployment.
This commit is contained in:
@@ -79,6 +79,10 @@ chown neko /tmp/.X11-unix /var/log/neko /tmp/runtime-neko
|
|||||||
chown -R neko:neko /home/neko
|
chown -R neko:neko /home/neko
|
||||||
|
|
||||||
cp /opt/neko/runtime/xorg.conf /etc/neko/xorg.conf
|
cp /opt/neko/runtime/xorg.conf /etc/neko/xorg.conf
|
||||||
|
# Remove the dummy_touchscreen InputDevice section (requires custom "neko" Xorg driver not available bare-metal)
|
||||||
|
sed -i '/Section "InputDevice"/{N;/dummy_touchscreen/{:l;N;/EndSection/!bl;d}}' /etc/neko/xorg.conf
|
||||||
|
sed -i '/dummy_touchscreen/d' /etc/neko/xorg.conf
|
||||||
|
sed -i 's/InputDevice "dummy_mouse"/InputDevice "dummy_mouse" "CorePointer"/' /etc/neko/xorg.conf
|
||||||
cp /opt/neko/runtime/default.pa /etc/pulse/default.pa
|
cp /opt/neko/runtime/default.pa /etc/pulse/default.pa
|
||||||
|
|
||||||
cat <<EOF >/etc/neko/supervisord.conf
|
cat <<EOF >/etc/neko/supervisord.conf
|
||||||
@@ -94,35 +98,35 @@ loglevel=debug
|
|||||||
files=/etc/neko/supervisord/*.conf
|
files=/etc/neko/supervisord/*.conf
|
||||||
|
|
||||||
[program:x-server]
|
[program:x-server]
|
||||||
environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s"
|
environment=HOME="/home/neko",USER="neko"
|
||||||
command=/usr/bin/X %(ENV_DISPLAY)s -config /etc/neko/xorg.conf -noreset -nolisten tcp
|
command=/usr/bin/X :99.0 -config /etc/neko/xorg.conf -noreset -nolisten tcp
|
||||||
autorestart=true
|
autorestart=true
|
||||||
priority=300
|
priority=300
|
||||||
user=%(ENV_USER)s
|
user=neko
|
||||||
stdout_logfile=/var/log/neko/xorg.log
|
stdout_logfile=/var/log/neko/xorg.log
|
||||||
stdout_logfile_maxbytes=100MB
|
stdout_logfile_maxbytes=100MB
|
||||||
stdout_logfile_backups=10
|
stdout_logfile_backups=10
|
||||||
redirect_stderr=true
|
redirect_stderr=true
|
||||||
|
|
||||||
[program:pulseaudio]
|
[program:pulseaudio]
|
||||||
environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
|
environment=HOME="/home/neko",USER="neko",DISPLAY=":99.0"
|
||||||
command=/usr/bin/pulseaudio --log-level=error --disallow-module-loading --disallow-exit --exit-idle-time=-1
|
command=/usr/bin/pulseaudio --log-level=error --disallow-module-loading --disallow-exit --exit-idle-time=-1
|
||||||
autorestart=true
|
autorestart=true
|
||||||
priority=300
|
priority=300
|
||||||
user=%(ENV_USER)s
|
user=neko
|
||||||
stdout_logfile=/var/log/neko/pulseaudio.log
|
stdout_logfile=/var/log/neko/pulseaudio.log
|
||||||
stdout_logfile_maxbytes=100MB
|
stdout_logfile_maxbytes=100MB
|
||||||
stdout_logfile_backups=10
|
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/neko",USER="neko",DISPLAY=":99.0"
|
||||||
command=/usr/bin/neko serve --server.static "/var/www"
|
command=/usr/bin/neko serve --server.static "/var/www"
|
||||||
stopsignal=INT
|
stopsignal=INT
|
||||||
stopwaitsecs=3
|
stopwaitsecs=3
|
||||||
autorestart=true
|
autorestart=true
|
||||||
priority=800
|
priority=800
|
||||||
user=%(ENV_USER)s
|
user=neko
|
||||||
stdout_logfile=/var/log/neko/neko.log
|
stdout_logfile=/var/log/neko/neko.log
|
||||||
stdout_logfile_maxbytes=100MB
|
stdout_logfile_maxbytes=100MB
|
||||||
stdout_logfile_backups=10
|
stdout_logfile_backups=10
|
||||||
@@ -142,23 +146,23 @@ EOF
|
|||||||
|
|
||||||
cat <<EOF >/etc/neko/supervisord/firefox.conf
|
cat <<EOF >/etc/neko/supervisord/firefox.conf
|
||||||
[program:firefox]
|
[program:firefox]
|
||||||
environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
|
environment=HOME="/home/neko",USER="neko",DISPLAY=":99.0"
|
||||||
command=/usr/bin/firefox-esr --no-remote --display=%(ENV_DISPLAY)s -width 1280 -height 720
|
command=/usr/bin/firefox-esr --no-remote --display=:99.0 -width 1280 -height 720
|
||||||
stopsignal=INT
|
stopsignal=INT
|
||||||
autorestart=true
|
autorestart=true
|
||||||
priority=800
|
priority=800
|
||||||
user=%(ENV_USER)s
|
user=neko
|
||||||
stdout_logfile=/var/log/neko/firefox.log
|
stdout_logfile=/var/log/neko/firefox.log
|
||||||
stdout_logfile_maxbytes=100MB
|
stdout_logfile_maxbytes=100MB
|
||||||
stdout_logfile_backups=10
|
stdout_logfile_backups=10
|
||||||
redirect_stderr=true
|
redirect_stderr=true
|
||||||
|
|
||||||
[program:openbox]
|
[program:openbox]
|
||||||
environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
|
environment=HOME="/home/neko",USER="neko",DISPLAY=":99.0"
|
||||||
command=/usr/bin/openbox --config-file /etc/neko/openbox.xml
|
command=/usr/bin/openbox --config-file /etc/neko/openbox.xml
|
||||||
autorestart=true
|
autorestart=true
|
||||||
priority=300
|
priority=300
|
||||||
user=%(ENV_USER)s
|
user=neko
|
||||||
stdout_logfile=/var/log/neko/openbox.log
|
stdout_logfile=/var/log/neko/openbox.log
|
||||||
stdout_logfile_maxbytes=100MB
|
stdout_logfile_maxbytes=100MB
|
||||||
stdout_logfile_backups=10
|
stdout_logfile_backups=10
|
||||||
@@ -200,6 +204,17 @@ cat <<EOF >/etc/neko/neko.yaml
|
|||||||
server:
|
server:
|
||||||
bind: "0.0.0.0:8080"
|
bind: "0.0.0.0:8080"
|
||||||
static: "/var/www"
|
static: "/var/www"
|
||||||
|
session:
|
||||||
|
cookie:
|
||||||
|
enabled: false
|
||||||
|
webrtc:
|
||||||
|
icelite: true
|
||||||
|
nat1to1:
|
||||||
|
- "${LOCAL_IP}"
|
||||||
|
epr: "59000-59100"
|
||||||
|
desktop:
|
||||||
|
input:
|
||||||
|
enabled: false
|
||||||
member:
|
member:
|
||||||
provider: "multiuser"
|
provider: "multiuser"
|
||||||
multiuser:
|
multiuser:
|
||||||
|
|||||||
@@ -28,12 +28,12 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"default_credentials": {
|
"default_credentials": {
|
||||||
"username": "admin",
|
"username": null,
|
||||||
"password": "admin"
|
"password": "admin"
|
||||||
},
|
},
|
||||||
"notes": [
|
"notes": [
|
||||||
{
|
{
|
||||||
"text": "Regular user password is 'neko'. Change both passwords in /etc/neko/neko.yaml after first login.",
|
"text": "Login is password-only: 'admin' for admin, 'neko' for regular user. Change both in /etc/neko/neko.yaml.",
|
||||||
"type": "warning"
|
"type": "warning"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user