some slight changes
This commit is contained in:
Craig
parent
09def9667f
commit
821a2bbfa2
@ -164,5 +164,7 @@ RUN apt-get update \
|
||||
&& npm config -g set prefix /usr/local/share/npm-global \
|
||||
&& sudo -u ${USERNAME} npm config -g set prefix /usr/local/share/npm-global
|
||||
|
||||
ENV PATH=/usr/local/share/npm-global/bin:$PATH
|
||||
|
||||
# switch back to dialog for any ad-hoc use of apt-get
|
||||
ENV DEBIAN_FRONTEND=dialog
|
||||
@ -1,5 +1,6 @@
|
||||
[supervisord]
|
||||
nodaemon=true
|
||||
pidfile=/var/run/supervisord.pid
|
||||
logfile=/dev/null
|
||||
logfile_maxbytes=0
|
||||
loglevel=debug
|
||||
@ -7,18 +8,30 @@ loglevel=debug
|
||||
[program:dbus]
|
||||
environment=HOME="/root",USER="root"
|
||||
command=/usr/bin/dbus
|
||||
redirect_stderr=true
|
||||
autorestart=true
|
||||
priority=100
|
||||
user=root
|
||||
stdout_logfile=/home/%(ENV_USER)s/logs/dbus.log
|
||||
stdout_logfile_maxbytes=100MB
|
||||
stdout_logfile_backups=10
|
||||
redirect_stderr=true
|
||||
stderr_logfile=/home/%(ENV_USER)s/logs/dbus.err.log
|
||||
stderr_logfile_maxbytes=100MB
|
||||
stderr_logfile_backups=10
|
||||
|
||||
[program:xvfb]
|
||||
environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s"
|
||||
command=/usr/bin/Xvfb %(ENV_DISPLAY)s -screen 0 %(ENV_SCREEN_WIDTH)sx%(ENV_SCREEN_HEIGHT)sx%(ENV_SCREEN_DEPTH)s
|
||||
redirect_stderr=true
|
||||
autorestart=true
|
||||
priority=300
|
||||
user=%(ENV_USER)s
|
||||
stdout_logfile=/home/%(ENV_USER)s/.neko/logs/xvfb.log
|
||||
stdout_logfile_maxbytes=100MB
|
||||
stdout_logfile_backups=10
|
||||
redirect_stderr=true
|
||||
stderr_logfile=/home/%(ENV_USER)s/.neko/logs/xvfb.err.log
|
||||
stderr_logfile_maxbytes=100MB
|
||||
stderr_logfile_backups=10
|
||||
|
||||
[program:pulseaudio]
|
||||
environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
|
||||
@ -26,6 +39,13 @@ command=/usr/bin/pulseaudio --disallow-module-loading -vvvv --disallow-exit --ex
|
||||
autorestart=true
|
||||
priority=300
|
||||
user=%(ENV_USER)s
|
||||
stdout_logfile=/home/%(ENV_USER)s/.neko/logs/pulseaudio.log
|
||||
stdout_logfile_maxbytes=100MB
|
||||
stdout_logfile_backups=10
|
||||
redirect_stderr=true
|
||||
stderr_logfile=/home/%(ENV_USER)s/.neko/logs/pulseaudio.err.log
|
||||
stderr_logfile_maxbytes=100MB
|
||||
stderr_logfile_backups=10
|
||||
|
||||
[program:openbox]
|
||||
environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
|
||||
@ -33,6 +53,13 @@ command=/usr/bin/openbox --config-file /etc/neko/openbox.xml
|
||||
autorestart=true
|
||||
priority=300
|
||||
user=%(ENV_USER)s
|
||||
stdout_logfile=/home/%(ENV_USER)s/.neko/logs/openbox.log
|
||||
stdout_logfile_maxbytes=100MB
|
||||
stdout_logfile_backups=10
|
||||
redirect_stderr=true
|
||||
stderr_logfile=/home/%(ENV_USER)s/.neko/logs/openbox.err.log
|
||||
stderr_logfile_maxbytes=100MB
|
||||
stderr_logfile_backups=10
|
||||
|
||||
[program:firefox-esr]
|
||||
environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
|
||||
@ -40,6 +67,13 @@ command=/usr/lib/firefox-esr/firefox-esr --display=%(ENV_DISPLAY)s --setDefaultB
|
||||
autorestart=true
|
||||
priority=400
|
||||
user=%(ENV_USER)s
|
||||
stdout_logfile=/home/%(ENV_USER)s/.neko/logs/firefox-esr.log
|
||||
stdout_logfile_maxbytes=100MB
|
||||
stdout_logfile_backups=10
|
||||
redirect_stderr=true
|
||||
stderr_logfile=/home/%(ENV_USER)s/.neko/logs/firefox-esr.err.log
|
||||
stderr_logfile_maxbytes=100MB
|
||||
stderr_logfile_backups=10
|
||||
|
||||
[program:neko]
|
||||
environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
|
||||
@ -47,3 +81,10 @@ command=/usr/bin/neko serve -d --static "/var/www"
|
||||
autorestart=true
|
||||
priority=800
|
||||
user=%(ENV_USER)s
|
||||
stdout_logfile=/home/%(ENV_USER)s/.neko/logs/neko.log
|
||||
stdout_logfile_maxbytes=100MB
|
||||
stdout_logfile_backups=10
|
||||
redirect_stderr=true
|
||||
stderr_logfile=/home/%(ENV_USER)s/.neko/logs/neko.err.log
|
||||
stderr_logfile_maxbytes=100MB
|
||||
stderr_logfile_backups=10
|
||||
|
||||
@ -1,24 +1,37 @@
|
||||
[supervisord]
|
||||
nodaemon=true
|
||||
#logfile=/dev/null
|
||||
#logfile_maxbytes=0
|
||||
pidfile=/var/run/supervisord.pid
|
||||
logfile=/dev/null
|
||||
logfile_maxbytes=0
|
||||
loglevel=debug
|
||||
|
||||
[program:dbus]
|
||||
environment=HOME="/root",USER="root"
|
||||
command=/usr/bin/dbus
|
||||
redirect_stderr=true
|
||||
autorestart=true
|
||||
priority=100
|
||||
user=root
|
||||
stdout_logfile=./logs/dbus.log
|
||||
stdout_logfile_maxbytes=100MB
|
||||
stdout_logfile_backups=10
|
||||
redirect_stderr=true
|
||||
stderr_logfile=./logs/dbus.err.log
|
||||
stderr_logfile_maxbytes=100MB
|
||||
stderr_logfile_backups=10
|
||||
|
||||
[program:xvfb]
|
||||
environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s"
|
||||
command=/usr/bin/Xvfb %(ENV_DISPLAY)s -screen 0 %(ENV_SCREEN_WIDTH)sx%(ENV_SCREEN_HEIGHT)sx%(ENV_SCREEN_DEPTH)s
|
||||
redirect_stderr=true
|
||||
autorestart=true
|
||||
priority=300
|
||||
user=%(ENV_USER)s
|
||||
stdout_logfile=./logs/xvfb.log
|
||||
stdout_logfile_maxbytes=100MB
|
||||
stdout_logfile_backups=10
|
||||
redirect_stderr=true
|
||||
stderr_logfile=./logs/xvfb.err.log
|
||||
stderr_logfile_maxbytes=100MB
|
||||
stderr_logfile_backups=10
|
||||
|
||||
[program:pulseaudio]
|
||||
environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
|
||||
@ -26,6 +39,13 @@ command=/usr/bin/pulseaudio --disallow-module-loading -vvvv --disallow-exit --ex
|
||||
autorestart=true
|
||||
priority=300
|
||||
user=%(ENV_USER)s
|
||||
stdout_logfile=./logs/pulseaudio.log
|
||||
stdout_logfile_maxbytes=100MB
|
||||
stdout_logfile_backups=10
|
||||
redirect_stderr=true
|
||||
stderr_logfile=./logs/pulseaudio.err.log
|
||||
stderr_logfile_maxbytes=100MB
|
||||
stderr_logfile_backups=10
|
||||
|
||||
[program:openbox]
|
||||
environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
|
||||
@ -33,6 +53,13 @@ command=/usr/bin/openbox --config-file /etc/neko/openbox.xml
|
||||
autorestart=true
|
||||
priority=300
|
||||
user=%(ENV_USER)s
|
||||
stdout_logfile=./logs/openbox.log
|
||||
stdout_logfile_maxbytes=100MB
|
||||
stdout_logfile_backups=10
|
||||
redirect_stderr=true
|
||||
stderr_logfile=./logs/openbox.err.log
|
||||
stderr_logfile_maxbytes=100MB
|
||||
stderr_logfile_backups=10
|
||||
|
||||
[program:firefox-esr]
|
||||
environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
|
||||
@ -40,3 +67,10 @@ command=/usr/lib/firefox-esr/firefox-esr --display=%(ENV_DISPLAY)s --setDefaultB
|
||||
autorestart=true
|
||||
priority=400
|
||||
user=%(ENV_USER)s
|
||||
stdout_logfile=./logs/firefox-esr.log
|
||||
stdout_logfile_maxbytes=100MB
|
||||
stdout_logfile_backups=10
|
||||
redirect_stderr=true
|
||||
stderr_logfile=./logs/firefox-esr.err.log
|
||||
stderr_logfile_maxbytes=100MB
|
||||
stderr_logfile_backups=10
|
||||
|
||||
15
.docker/test
15
.docker/test
@ -20,13 +20,13 @@ fi
|
||||
sudo mkdir -p /var/run/dbus /etc/neko
|
||||
sudo rm -rf /var/run/dbus.pid
|
||||
|
||||
sudo cp files/firefox-esr/neko.js /usr/lib/firefox-esr/mozilla.cfg
|
||||
sudo cp files/firefox/neko.js /usr/lib/firefox-esr/mozilla.cfg
|
||||
#sudo rm -f /usr/lib/firefox-esr/mozilla.cfg
|
||||
|
||||
sudo cp files/firefox-esr/autoconfig.js /usr/lib/firefox-esr/defaults/pref/autoconfig.js
|
||||
sudo cp files/firefox/autoconfig.js /usr/lib/firefox-esr/defaults/pref/autoconfig.js
|
||||
#sudo rm -f /usr/lib/firefox-esr/defaults/pref/autoconfig.js
|
||||
|
||||
sudo cp files/firefox-esr/policies.json /usr/lib/firefox-esr/distribution/policies.json
|
||||
sudo cp files/firefox/policies.json /usr/lib/firefox-esr/distribution/policies.json
|
||||
#sudo rm -f /usr/lib/firefox-esr/distribution/policies.json
|
||||
|
||||
sudo cp files/dbus /usr/bin/dbus
|
||||
@ -63,12 +63,9 @@ export NEKO_BIND=:8080
|
||||
export NEKO_KEY=
|
||||
export NEKO_CERT=
|
||||
|
||||
if [ -f /var/run/supervisord.pid ]; then
|
||||
sudo rm -f /var/run/supervisord.pid
|
||||
fi
|
||||
|
||||
if [ -f supervisord.log ]; then
|
||||
sudo rm -f supervisord.log
|
||||
if [ -d logs ]; then
|
||||
sudo rm -rf logs
|
||||
fi
|
||||
mkdir logs
|
||||
|
||||
supervisord --configuration ./supervisord.conf
|
||||
BIN
.github/demo.gif
vendored
BIN
.github/demo.gif
vendored
Binary file not shown.
|
Before Width: | Height: | Size: 13 MiB |
@ -69,13 +69,13 @@ RUN set -eux \
|
||||
# setup pulseaudio
|
||||
&& mkdir -p /home/$USERNAME/.config/pulse/ \
|
||||
&& echo "default-server=unix:/tmp/pulseaudio.socket" > /home/$USERNAME/.config/pulse/client.conf \
|
||||
&& chown -R $USERNAME:$USERNAME /home/$USERNAME \
|
||||
#
|
||||
# workaround for an X11 problem: http://blog.tigerteufel.de/?p=476
|
||||
&& mkdir /tmp/.X11-unix && chmod 1777 /tmp/.X11-unix && chown $USERNAME /tmp/.X11-unix/ \
|
||||
#
|
||||
# make directories for neko
|
||||
&& mkdir -p /etc/neko /var/www \
|
||||
&& mkdir -p /etc/neko /var/www /home/$USERNAME/.neko/logs \
|
||||
&& chown -R $USERNAME:$USERNAME /home/$USERNAME \
|
||||
#
|
||||
# clean up
|
||||
&& apt-get autoremove -y \
|
||||
|
||||
Reference in New Issue
Block a user