back to debian, better firefox support

This commit is contained in:
Craig
2020-01-28 07:07:35 +00:00
parent e4a554830d
commit 56464778f2
13 changed files with 251 additions and 210 deletions

View File

@ -1,17 +1,15 @@
#!/bin/bash
cd ../server
go get && ./build
cd ../client
npm install && npm run build
cd ../
sudo docker build -f Dockerfile -t nurdism/neko .
cd ../server \
&& go get \
&& ./build \
&& cd ../client \
&& npm install && npm run build \
&& cd ../ \
&& sudo docker build -f Dockerfile -t nurdism/neko . \
&& sudo docker images nurdism/neko
# sudo docker images nurdism/neko
# sudo docker push nurdism/neko:latest
# sudo docker run -e NEKO_BIND='0.0.0.0:9000' --network host --shm-size=1gb nurdism/neko:latest
# sudo docker run -p 9000:8080 -p 59000-59100:59000-59100/udp --shm-size=2gb nurdism/neko:latest
# sudo docker run -p 8080:8080 --shm-size=1gb nurdism/neko:latest
# sudo docker run --network host --shm-size=1gb nurdism/neko:latest
# sudo docker run -p 80:8080 -p 59000-59100:59000-59100/udp --shm-size=1gb nurdism/neko:latest
# sudo docker run --network host --shm-size=1gb -it nurdism/neko:latest /bin/bash

View File

@ -1,4 +1,11 @@
#!/bin/sh
rm -rf /var/run/dbus.pid
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

View File

@ -1,6 +1,6 @@
{
"policies": {
"BlockAboutAddons": true,
"BlockAboutAddons": false,
"BlockAboutConfig": true,
"BlockAboutProfiles": true,
"BlockAboutSupport": true,
@ -28,7 +28,7 @@
},
{
"Title": "9Anime",
"URL": "https://9anime.xyz/",
"URL": "https://9anime.to/",
"Favicon": "https://staticf.akacdn.ru/assets/favicons/favicon.png",
"Folder": "Media",
"Placement": "toolbar"
@ -93,7 +93,7 @@
"CaptivePortal": false,
"DisableAppUpdate": true,
"DisableBuiltinPDFViewer": true,
"DisableDeveloperTools": true,
"DisableDeveloperTools": false,
"DisableFeedbackCommands": true,
"DisableFirefoxAccounts": true,
"DisableFirefoxScreenshots": true,
@ -119,6 +119,10 @@
"*": {
"installation_mode": "blocked"
},
"nordvpnproxy@nordvpn.com": {
"install_url": "https://addons.mozilla.org/firefox/downloads/latest/nordvpn-proxy-extension/latest.xpi",
"installation_mode": "force_installed"
},
"uBlock0@raymondhill.net": {
"install_url": "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi",
"installation_mode": "force_installed"

View File

@ -36,7 +36,7 @@ user=%(ENV_USER)s
[program:firefox-esr]
environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s"
command=/usr/lib/firefox/firefox --display=%(ENV_DISPLAY)s --setDefaultBrowser -width %(ENV_SCREEN_WIDTH)s -height %(ENV_SCREEN_HEIGHT)s
command=/usr/lib/firefox-esr/firefox-esr --display=%(ENV_DISPLAY)s --setDefaultBrowser -width %(ENV_SCREEN_WIDTH)s -height %(ENV_SCREEN_HEIGHT)s
autorestart=true
priority=400
user=%(ENV_USER)s

View File

@ -36,7 +36,7 @@ user=%(ENV_USER)s
[program:firefox-esr]
environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s"
command=/usr/lib/firefox/firefox --display=%(ENV_DISPLAY)s --setDefaultBrowser -width %(ENV_SCREEN_WIDTH)s -height %(ENV_SCREEN_HEIGHT)s
command=/usr/lib/firefox-esr/firefox-esr --display=%(ENV_DISPLAY)s --setDefaultBrowser -width %(ENV_SCREEN_WIDTH)s -height %(ENV_SCREEN_HEIGHT)s
autorestart=true
priority=400
user=%(ENV_USER)s

View File

@ -2,6 +2,11 @@
# usefull debugging tools pavucontrol htop x11vnc
if [[ $EUID -ne 0 ]]; then
echo "This script must be run as root"
exit 1
fi
# if [ ! -f ../server/bin/neko ]; then
# echo "build server before testing"
# exit 1
@ -15,30 +20,39 @@
sudo mkdir -p /var/run/dbus /etc/neko
sudo rm -rf /var/run/dbus.pid
sudo cp files/firefox/neko.js /usr/lib/firefox/mozilla.cfg
sudo cp files/firefox/autoconfig.js /usr/lib/firefox/defaults/pref/autoconfig.js
sudo cp files/firefox/policies.json /usr/lib/firefox/distribution/policies.json
sudo cp files/firefox-esr/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 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 rm -f /usr/lib/firefox-esr/distribution/policies.json
sudo cp files/dbus /usr/bin/dbus
sudo cp files/default.pa /etc/pulse/default.pa
sudo cp files/supervisord.conf /etc/neko/supervisord.conf
sudo cp files/openbox.xml /etc/neko/openbox.xml
sudo mkdir -p /usr/lib/firefox/distribution/extensions
if [ ! -f /usr/lib/firefox/distribution/extensions/uBlock0@raymondhill.net.xpi ]; then
sudo mkdir -p /usr/lib/firefox/distribution/extensions
sudo curl -o /usr/lib/firefox/distribution/extensions/uBlock0@raymondhill.net.xpi https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/addon-607454-latest.xpi
fi
if [ ! -f /usr/lib/firefox/distribution/extensions/nordvpnproxy@nordvpn.com.xpi ]; then
sudo curl -o /usr/lib/firefox/distribution/extensions/nordvpnproxy@nordvpn.com.xpi https://addons.mozilla.org/firefox/downloads/latest/nordvpn-proxy-extension/latest.xpi
fi
sudo cp ../server/bin/neko /usr/bin/neko
sudo cp -R ../client/dist /var/www/
sudo rm -rf $HOME/.mozilla
sudo rm -rf /var/run/supervisord.pid
mkdir -p $HOME/.config/pulse
echo "default-server=unix:/tmp/pulseaudio.socket" > $HOME/.config/pulse/client.conf
export USER=vscode
export USER=neko
export SCREEN_WIDTH=1280
export SCREEN_HEIGHT=720
export SCREEN_DEPTH=24
@ -49,4 +63,12 @@ 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
fi
supervisord --configuration ./supervisord.conf