From f5da5d152f46848f03d6fdd7ae99a8d196f652f2 Mon Sep 17 00:00:00 2001 From: Doro Wu Date: Tue, 13 Mar 2018 16:42:22 +0800 Subject: [PATCH] refactor: code structure 1. move folders from /usr/* to /usr/local/* 2. supervisord controls everything --- Dockerfile | 6 +- image/etc/supervisor/conf.d/supervisord.conf | 55 ++++++++---------- image/startup.sh | 6 +- image/usr/local/bin/xvfb.sh | 3 + .../noVNC => local/lib/novnc}/.gitlastcommit | 0 .../{lib/noVNC => local/lib/novnc}/.npmignore | 0 .../noVNC => local/lib/novnc}/.travis.yml | 0 .../noVNC => local/lib/novnc}/CONTRIBUTING.md | 0 .../noVNC => local/lib/novnc}/LICENSE.txt | 0 .../{lib/noVNC => local/lib/novnc}/README.md | 0 .../lib/novnc}/app/images/alt.svg | 0 .../lib/novnc}/app/images/clipboard.svg | 0 .../lib/novnc}/app/images/connect.svg | 0 .../lib/novnc}/app/images/ctrl.svg | 0 .../lib/novnc}/app/images/ctrlaltdel.svg | 0 .../lib/novnc}/app/images/disconnect.svg | 0 .../lib/novnc}/app/images/drag.svg | 0 .../lib/novnc}/app/images/error.svg | 0 .../lib/novnc}/app/images/esc.svg | 0 .../lib/novnc}/app/images/expander.svg | 0 .../lib/novnc}/app/images/fullscreen.svg | 0 .../lib/novnc}/app/images/handle.svg | 0 .../lib/novnc}/app/images/handle_bg.svg | 0 .../lib/novnc}/app/images/icons/Makefile | 0 .../novnc}/app/images/icons/novnc-120x120.png | Bin .../novnc}/app/images/icons/novnc-144x144.png | Bin .../novnc}/app/images/icons/novnc-152x152.png | Bin .../novnc}/app/images/icons/novnc-16x16.png | Bin .../novnc}/app/images/icons/novnc-192x192.png | Bin .../novnc}/app/images/icons/novnc-24x24.png | Bin .../novnc}/app/images/icons/novnc-32x32.png | Bin .../novnc}/app/images/icons/novnc-48x48.png | Bin .../novnc}/app/images/icons/novnc-60x60.png | Bin .../novnc}/app/images/icons/novnc-64x64.png | Bin .../novnc}/app/images/icons/novnc-72x72.png | Bin .../novnc}/app/images/icons/novnc-76x76.png | Bin .../novnc}/app/images/icons/novnc-96x96.png | Bin .../novnc}/app/images/icons/novnc-icon-sm.svg | 0 .../novnc}/app/images/icons/novnc-icon.svg | 0 .../lib/novnc}/app/images/info.svg | 0 .../lib/novnc}/app/images/keyboard.svg | 0 .../lib/novnc}/app/images/mouse_left.svg | 0 .../lib/novnc}/app/images/mouse_middle.svg | 0 .../lib/novnc}/app/images/mouse_none.svg | 0 .../lib/novnc}/app/images/mouse_right.svg | 0 .../lib/novnc}/app/images/power.svg | 0 .../lib/novnc}/app/images/settings.svg | 0 .../lib/novnc}/app/images/tab.svg | 0 .../lib/novnc}/app/images/toggleextrakeys.svg | 0 .../lib/novnc}/app/images/warning.svg | 0 .../lib/novnc}/app/jquery-3.3.1.min.js | 0 .../lib/novnc}/app/locale/de.js | 0 .../lib/novnc}/app/locale/el.js | 0 .../lib/novnc}/app/locale/nl.js | 0 .../lib/novnc}/app/locale/sv.js | 0 .../lib/novnc}/app/sounds/CREDITS | 0 .../lib/novnc}/app/sounds/bell.mp3 | Bin .../lib/novnc}/app/sounds/bell.oga | Bin .../lib/novnc}/app/styles/Orbitron700.ttf | Bin .../lib/novnc}/app/styles/Orbitron700.woff | Bin .../lib/novnc}/app/styles/auto.css | 0 .../lib/novnc}/app/styles/base.css | 0 .../{lib/noVNC => local/lib/novnc}/app/ui.js | 0 .../noVNC => local/lib/novnc}/app/webutil.js | 0 .../noVNC => local/lib/novnc}/core/base64.js | 0 .../noVNC => local/lib/novnc}/core/des.js | 0 .../noVNC => local/lib/novnc}/core/display.js | 0 .../lib/novnc}/core/inflator.js | 0 .../lib/novnc}/core/inflator.mod.js | 0 .../lib/novnc}/core/input/devices.js | 0 .../lib/novnc}/core/input/keysym.js | 0 .../lib/novnc}/core/input/keysymdef.js | 0 .../lib/novnc}/core/input/util.js | 0 .../lib/novnc}/core/input/xtscancodes.js | 0 .../noVNC => local/lib/novnc}/core/rfb.js | 0 .../noVNC => local/lib/novnc}/core/util.js | 0 .../noVNC => local/lib/novnc}/core/websock.js | 0 .../lib/novnc}/docs/LICENSE.Apache-2.0 | 0 .../lib/novnc}/docs/LICENSE.BSD-2-Clause | 0 .../lib/novnc}/docs/LICENSE.BSD-3-Clause | 0 .../lib/novnc}/docs/LICENSE.GPL-3 | 0 .../lib/novnc}/docs/LICENSE.LGPL-3 | 0 .../lib/novnc}/docs/LICENSE.MPL-2.0 | 0 .../lib/novnc}/docs/LICENSE.OFL-1.1 | 0 .../lib/novnc}/docs/LICENSE.pako | 0 .../lib/novnc}/docs/LICENSE.zlib | 0 .../noVNC => local/lib/novnc}/docs/VERSION | 0 .../lib/novnc}/docs/flash_policy.txt | 0 .../{lib/noVNC => local/lib/novnc}/docs/links | 0 .../{lib/noVNC => local/lib/novnc}/docs/notes | 0 .../lib/novnc}/docs/release.txt | 0 .../noVNC => local/lib/novnc}/docs/rfb_notes | 0 .../lib/novnc}/docs/rfbproto-3.3.pdf | Bin .../lib/novnc}/docs/rfbproto-3.7.pdf | Bin .../lib/novnc}/docs/rfbproto-3.8.pdf | Bin .../noVNC => local/lib/novnc}/karma.conf.js | 0 .../noVNC => local/lib/novnc}/package.json | 0 .../noVNC => local/lib/novnc}/po/Makefile | 0 .../{lib/noVNC => local/lib/novnc}/po/de.po | 0 .../{lib/noVNC => local/lib/novnc}/po/el.po | 0 .../{lib/noVNC => local/lib/novnc}/po/nl.po | 0 .../noVNC => local/lib/novnc}/po/noVNC.pot | 0 .../{lib/noVNC => local/lib/novnc}/po/po2js | 0 .../{lib/noVNC => local/lib/novnc}/po/sv.po | 0 .../lib/novnc}/po/xgettext-html | 0 .../lib/novnc}/tests/assertions.js | 0 .../lib/novnc}/tests/fake.websocket.js | 0 .../lib/novnc}/tests/input.html | 0 .../lib/novnc}/tests/playback.js | 0 .../novnc}/tests/run_from_console.casper.js | 0 .../lib/novnc}/tests/run_from_console.js | 0 .../novnc}/tests/run_from_console.zombie.js | 0 .../lib/novnc}/tests/test.base64.js | 0 .../lib/novnc}/tests/test.display.js | 0 .../lib/novnc}/tests/test.helper.js | 0 .../lib/novnc}/tests/test.keyboard.js | 0 .../lib/novnc}/tests/test.rfb.js | 0 .../lib/novnc}/tests/test.util.js | 0 .../lib/novnc}/tests/test.websock.js | 0 .../lib/novnc}/tests/vnc_perf.html | 0 .../lib/novnc}/tests/vnc_playback.html | 0 .../noVNC => local/lib/novnc}/utils/README.md | 0 .../lib/novnc}/utils/b64-to-binary.pl | 0 .../noVNC => local/lib/novnc}/utils/img2js.py | 0 .../lib/novnc}/utils/json2graph.py | 0 .../noVNC => local/lib/novnc}/utils/launch.sh | 0 .../lib/novnc}/utils/make-module-transform.js | 0 .../noVNC => local/lib/novnc}/utils/parse.js | 0 .../noVNC => local/lib/novnc}/utils/u2x11 | 0 .../lib/novnc}/utils/use_require.js | 0 .../lib/novnc}/utils/websockify/.travis.yml | 0 .../lib/novnc}/utils/websockify/CHANGES.txt | 0 .../lib/novnc}/utils/websockify/LICENSE.txt | 0 .../lib/novnc}/utils/websockify/MANIFEST.in | 0 .../lib/novnc}/utils/websockify/Makefile | 0 .../lib/novnc}/utils/websockify/README.md | 0 .../Windows/Windows Service Readme.txt | 0 .../Program.cs | 0 .../ProjectInstaller.Designer.cs | 0 .../ProjectInstaller.cs | 0 .../ProjectInstaller.resx | 0 .../Properties/AssemblyInfo.cs | 0 .../Service1.Designer.cs | 0 .../Service1.cs | 0 .../noVNC Websocket.csproj | 0 .../noVNC Websocket.sln | 0 .../utils/websockify/docs/LICENSE.GPL-3 | 0 .../utils/websockify/docs/LICENSE.LGPL-3 | 0 .../utils/websockify/docs/LICENSE.MPL-2.0 | 0 .../lib/novnc}/utils/websockify/docs/TODO | 0 .../utils/websockify/docs/flash_policy.txt | 0 .../utils/websockify/docs/latency_results.txt | 0 .../lib/novnc}/utils/websockify/docs/notes | 0 .../novnc}/utils/websockify/docs/release.txt | 0 .../novnc}/utils/websockify/docs/websockify.1 | 0 .../novnc}/utils/websockify/include/VT100.js | 0 .../novnc}/utils/websockify/include/keysym.js | 0 .../novnc}/utils/websockify/include/util.js | 0 .../utils/websockify/include/websock.js | 0 .../utils/websockify/include/webutil.js | 0 .../novnc}/utils/websockify/include/wsirc.js | 0 .../utils/websockify/include/wstelnet.js | 0 .../novnc}/utils/websockify/other/Makefile | 0 .../novnc}/utils/websockify/other/README.md | 0 .../utils/websockify/other/js/README.md | 0 .../utils/websockify/other/js/package.json | 0 .../utils/websockify/other/js/websockify.js | 0 .../novnc}/utils/websockify/other/launch.sh | 0 .../novnc}/utils/websockify/other/project.clj | 0 .../novnc}/utils/websockify/other/websocket.c | 0 .../novnc}/utils/websockify/other/websocket.h | 0 .../utils/websockify/other/websocket.rb | 0 .../utils/websockify/other/websockify.c | 0 .../utils/websockify/other/websockify.clj | 0 .../utils/websockify/other/websockify.rb | 0 .../lib/novnc}/utils/websockify/other/wswrap | 0 .../lib/novnc}/utils/websockify/rebind | 0 .../lib/novnc}/utils/websockify/rebind.c | 0 .../lib/novnc}/utils/websockify/run | 0 .../lib/novnc}/utils/websockify/setup.py | 0 .../utils/websockify/test-requirements.txt | 0 .../novnc}/utils/websockify/tests/echo.html | 0 .../lib/novnc}/utils/websockify/tests/echo.py | 0 .../lib/novnc}/utils/websockify/tests/echo.rb | 0 .../utils/websockify/tests/echo_client.py | 0 .../lib/novnc}/utils/websockify/tests/include | 0 .../utils/websockify/tests/latency.html | 0 .../novnc}/utils/websockify/tests/latency.py | 0 .../novnc}/utils/websockify/tests/load.html | 0 .../lib/novnc}/utils/websockify/tests/load.py | 0 .../utils/websockify/tests/plain_echo.html | 0 .../novnc}/utils/websockify/tests/simple.html | 0 .../websockify/tests/test_auth_plugins.py | 0 .../utils/websockify/tests/test_websocket.py | 0 .../websockify/tests/test_websocketproxy.py | 0 .../websockify/tests/test_websockifyserver.py | 0 .../lib/novnc}/utils/websockify/tox.ini | 0 .../lib/novnc}/utils/websockify/websockify.py | 0 .../utils/websockify/websockify/__init__.py | 0 .../websockify/websockify/auth_plugins.py | 0 .../websockify/websockify/token_plugins.py | 0 .../utils/websockify/websockify/websocket.py | 0 .../websockify/websockify/websocketproxy.py | 0 .../websockify/websockify/websocketserver.py | 0 .../websockify/websockify/websockifyserver.py | 0 .../lib/novnc}/utils/websockify/wsirc.html | 0 .../lib/novnc}/utils/websockify/wstelnet.html | 0 .../{lib/noVNC => local/lib/novnc}/vnc.html | 0 .../noVNC => local/lib/novnc}/vnc_auto.html | 0 .../{ => local}/lib/web/config/__init__.py | 0 .../{ => local}/lib/web/lightop/__init__.py | 8 +-- image/usr/{ => local}/lib/web/log/__init__.py | 0 image/usr/{ => local}/lib/web/log/config.py | 0 .../usr/{ => local}/lib/web/requirements.txt | 0 image/usr/{ => local}/lib/web/run.py | 0 .../lib/web/static/6df2b309.favicon.ico | Bin .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../usr/{ => local}/lib/web/static/index.html | 0 .../usr/{ => local}/lib/web/static/robots.txt | 0 .../lib/web/static/scripts/046bbd30.main.js | 0 .../web/static/scripts/2c80432f.plugins.js | 0 .../lib/web/static/scripts/9cd97fdd.vendor.js | 0 .../lib/web/static/styles/536b3e9f.main.css | 0 .../lib/web/static/styles/57fdc80f.vendor.css | 0 .../share/doro-lxde-wallpapers/bg1.jpg | Bin .../share/doro-lxde-wallpapers/bg2.jpg | Bin .../share/doro-lxde-wallpapers/bg3.jpg | Bin .../share/doro-lxde-wallpapers/bg4.jpg | Bin .../doro-lxde-wallpapers/desktop-items-0.conf | 8 +-- 232 files changed, 41 insertions(+), 45 deletions(-) create mode 100755 image/usr/local/bin/xvfb.sh rename image/usr/{lib/noVNC => local/lib/novnc}/.gitlastcommit (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/.npmignore (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/.travis.yml (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/CONTRIBUTING.md (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/LICENSE.txt (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/README.md (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/alt.svg (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/clipboard.svg (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/connect.svg (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/ctrl.svg (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/ctrlaltdel.svg (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/disconnect.svg (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/drag.svg (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/error.svg (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/esc.svg (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/expander.svg (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/fullscreen.svg (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/handle.svg (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/handle_bg.svg (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/icons/Makefile (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/icons/novnc-120x120.png (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/icons/novnc-144x144.png (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/icons/novnc-152x152.png (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/icons/novnc-16x16.png (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/icons/novnc-192x192.png (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/icons/novnc-24x24.png (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/icons/novnc-32x32.png (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/icons/novnc-48x48.png (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/icons/novnc-60x60.png (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/icons/novnc-64x64.png (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/icons/novnc-72x72.png (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/icons/novnc-76x76.png (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/icons/novnc-96x96.png (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/icons/novnc-icon-sm.svg (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/icons/novnc-icon.svg (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/info.svg (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/keyboard.svg (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/mouse_left.svg (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/mouse_middle.svg (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/mouse_none.svg (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/mouse_right.svg (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/power.svg (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/settings.svg (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/tab.svg (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/toggleextrakeys.svg (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/images/warning.svg (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/jquery-3.3.1.min.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/locale/de.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/locale/el.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/locale/nl.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/locale/sv.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/sounds/CREDITS (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/sounds/bell.mp3 (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/sounds/bell.oga (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/styles/Orbitron700.ttf (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/styles/Orbitron700.woff (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/styles/auto.css (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/styles/base.css (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/ui.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/app/webutil.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/core/base64.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/core/des.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/core/display.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/core/inflator.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/core/inflator.mod.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/core/input/devices.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/core/input/keysym.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/core/input/keysymdef.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/core/input/util.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/core/input/xtscancodes.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/core/rfb.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/core/util.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/core/websock.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/docs/LICENSE.Apache-2.0 (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/docs/LICENSE.BSD-2-Clause (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/docs/LICENSE.BSD-3-Clause (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/docs/LICENSE.GPL-3 (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/docs/LICENSE.LGPL-3 (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/docs/LICENSE.MPL-2.0 (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/docs/LICENSE.OFL-1.1 (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/docs/LICENSE.pako (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/docs/LICENSE.zlib (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/docs/VERSION (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/docs/flash_policy.txt (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/docs/links (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/docs/notes (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/docs/release.txt (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/docs/rfb_notes (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/docs/rfbproto-3.3.pdf (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/docs/rfbproto-3.7.pdf (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/docs/rfbproto-3.8.pdf (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/karma.conf.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/package.json (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/po/Makefile (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/po/de.po (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/po/el.po (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/po/nl.po (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/po/noVNC.pot (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/po/po2js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/po/sv.po (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/po/xgettext-html (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/tests/assertions.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/tests/fake.websocket.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/tests/input.html (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/tests/playback.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/tests/run_from_console.casper.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/tests/run_from_console.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/tests/run_from_console.zombie.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/tests/test.base64.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/tests/test.display.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/tests/test.helper.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/tests/test.keyboard.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/tests/test.rfb.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/tests/test.util.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/tests/test.websock.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/tests/vnc_perf.html (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/tests/vnc_playback.html (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/README.md (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/b64-to-binary.pl (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/img2js.py (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/json2graph.py (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/launch.sh (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/make-module-transform.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/parse.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/u2x11 (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/use_require.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/.travis.yml (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/CHANGES.txt (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/LICENSE.txt (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/MANIFEST.in (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/Makefile (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/README.md (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/Windows/Windows Service Readme.txt (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/Windows/noVNC Websocket Service Project/Program.cs (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/Windows/noVNC Websocket Service Project/ProjectInstaller.Designer.cs (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/Windows/noVNC Websocket Service Project/ProjectInstaller.cs (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/Windows/noVNC Websocket Service Project/ProjectInstaller.resx (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/Windows/noVNC Websocket Service Project/Properties/AssemblyInfo.cs (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/Windows/noVNC Websocket Service Project/Service1.Designer.cs (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/Windows/noVNC Websocket Service Project/Service1.cs (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/Windows/noVNC Websocket Service Project/noVNC Websocket.csproj (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/Windows/noVNC Websocket Service Project/noVNC Websocket.sln (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/docs/LICENSE.GPL-3 (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/docs/LICENSE.LGPL-3 (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/docs/LICENSE.MPL-2.0 (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/docs/TODO (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/docs/flash_policy.txt (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/docs/latency_results.txt (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/docs/notes (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/docs/release.txt (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/docs/websockify.1 (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/include/VT100.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/include/keysym.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/include/util.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/include/websock.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/include/webutil.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/include/wsirc.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/include/wstelnet.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/other/Makefile (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/other/README.md (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/other/js/README.md (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/other/js/package.json (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/other/js/websockify.js (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/other/launch.sh (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/other/project.clj (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/other/websocket.c (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/other/websocket.h (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/other/websocket.rb (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/other/websockify.c (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/other/websockify.clj (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/other/websockify.rb (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/other/wswrap (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/rebind (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/rebind.c (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/run (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/setup.py (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/test-requirements.txt (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/tests/echo.html (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/tests/echo.py (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/tests/echo.rb (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/tests/echo_client.py (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/tests/include (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/tests/latency.html (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/tests/latency.py (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/tests/load.html (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/tests/load.py (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/tests/plain_echo.html (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/tests/simple.html (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/tests/test_auth_plugins.py (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/tests/test_websocket.py (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/tests/test_websocketproxy.py (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/tests/test_websockifyserver.py (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/tox.ini (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/websockify.py (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/websockify/__init__.py (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/websockify/auth_plugins.py (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/websockify/token_plugins.py (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/websockify/websocket.py (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/websockify/websocketproxy.py (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/websockify/websocketserver.py (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/websockify/websockifyserver.py (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/wsirc.html (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/utils/websockify/wstelnet.html (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/vnc.html (100%) rename image/usr/{lib/noVNC => local/lib/novnc}/vnc_auto.html (100%) rename image/usr/{ => local}/lib/web/config/__init__.py (100%) rename image/usr/{ => local}/lib/web/lightop/__init__.py (94%) rename image/usr/{ => local}/lib/web/log/__init__.py (100%) rename image/usr/{ => local}/lib/web/log/config.py (100%) rename image/usr/{ => local}/lib/web/requirements.txt (100%) rename image/usr/{ => local}/lib/web/run.py (100%) rename image/usr/{ => local}/lib/web/static/6df2b309.favicon.ico (100%) rename image/usr/{ => local}/lib/web/static/fonts/glyphicons-halflings-regular.eot (100%) rename image/usr/{ => local}/lib/web/static/fonts/glyphicons-halflings-regular.svg (100%) rename image/usr/{ => local}/lib/web/static/fonts/glyphicons-halflings-regular.ttf (100%) rename image/usr/{ => local}/lib/web/static/fonts/glyphicons-halflings-regular.woff (100%) rename image/usr/{ => local}/lib/web/static/index.html (100%) rename image/usr/{ => local}/lib/web/static/robots.txt (100%) rename image/usr/{ => local}/lib/web/static/scripts/046bbd30.main.js (100%) rename image/usr/{ => local}/lib/web/static/scripts/2c80432f.plugins.js (100%) rename image/usr/{ => local}/lib/web/static/scripts/9cd97fdd.vendor.js (100%) rename image/usr/{ => local}/lib/web/static/styles/536b3e9f.main.css (100%) rename image/usr/{ => local}/lib/web/static/styles/57fdc80f.vendor.css (100%) rename image/usr/{ => local}/share/doro-lxde-wallpapers/bg1.jpg (100%) rename image/usr/{ => local}/share/doro-lxde-wallpapers/bg2.jpg (100%) rename image/usr/{ => local}/share/doro-lxde-wallpapers/bg3.jpg (100%) rename image/usr/{ => local}/share/doro-lxde-wallpapers/bg4.jpg (100%) rename image/usr/{ => local}/share/doro-lxde-wallpapers/desktop-items-0.conf (51%) diff --git a/Dockerfile b/Dockerfile index bb9ca69..c8808ce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,7 +34,11 @@ ARG TINI_VERSION=v0.9.0 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /bin/tini RUN chmod +x /bin/tini -ADD image/usr/lib/web/requirements.txt /tmp/ +# ffmpeg +RUN mkdir -p /usr/local/ffmpeg \ + && curl -sSL https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz | tar xJvf - -C /usr/local/ffmpeg/ --strip 1 + +ADD image/usr/local/lib/web/requirements.txt /tmp/ RUN pip install setuptools wheel && pip install -r /tmp/requirements.txt ADD image / diff --git a/image/etc/supervisor/conf.d/supervisord.conf b/image/etc/supervisor/conf.d/supervisord.conf index f9bb4b0..9d8ab54 100644 --- a/image/etc/supervisor/conf.d/supervisord.conf +++ b/image/etc/supervisor/conf.d/supervisord.conf @@ -1,68 +1,59 @@ +[supervisord] +redirect_stderr=true +stopsignal=QUIT +autorestart=true +directory=/root + +[program:nginx] +priority=10 +command=nginx -c /etc/nginx/nginx.conf -g 'daemon off;' +stdout_logfile=/var/log/nginx.log + +[program:web] +priority=10 +directory=/usr/local/lib/web +command=/usr/local/lib/web/run.py +stdout_logfile=/var/log/web.log + +[group:x] +programs=xvfb,wm,lxpanel,pcmanfm,x11vnc,novnc + [program:xvfb] priority=10 -directory=/ -command=/usr/bin/Xvfb :1 -screen 0 1024x768x16 -user=root -autostart=true -autorestart=true +command=/usr/local/bin/xvfb.sh stopsignal=KILL stdout_logfile=/var/log/xvfb.log -redirect_stderr=true [program:wm] priority=15 -directory=/root command=/usr/bin/openbox -user=root -autostart=true -autorestart=true -stopsignal=QUIT environment=DISPLAY=":1",HOME="/root",USER="root" stdout_logfile=/var/log/openbox.log -redirect_stderr=true [program:lxpanel] priority=15 directory=%HOME% command=/usr/bin/lxpanel --profile LXDE user=%USER% -autostart=true -autorestart=true -stopsignal=QUIT environment=DISPLAY=":1",HOME="%HOME%",USER="%USER%" stdout_logfile=/var/log/lxpanel.log -redirect_stderr=true [program:pcmanfm] priority=15 directory=%HOME% command=/usr/bin/pcmanfm --desktop --profile LXDE user=%USER% -autostart=true -autorestart=true -stopsignal=QUIT environment=DISPLAY=":1",HOME="%HOME%",USER="%USER%" stdout_logfile=/var/log/pcmanfm.log [program:x11vnc] priority=20 -directory=/ command=x11vnc -display :1 -xkb -forever -shared -repeat -user=root -autostart=true -autorestart=true -stopsignal=QUIT stdout_logfile=/var/log/x11vnc.log -redirect_stderr=true [program:novnc] priority=25 -directory=/usr/lib/noVNC/ -command=/usr/lib/noVNC/utils/launch.sh --listen 6081 -user=root -autostart=true -autorestart=true -stopsignal=QUIT +directory=/usr/local/lib/novnc/ +command=/usr/local/lib/novnc/utils/launch.sh --listen 6081 stdout_logfile=/var/log/novnc.log -redirect_stderr=true stopasgroup=true diff --git a/image/startup.sh b/image/startup.sh index 74e42e0..fcd176f 100755 --- a/image/startup.sh +++ b/image/startup.sh @@ -22,19 +22,17 @@ if [ "$USER" != "root" ]; then fi HOME=/home/$USER echo "$USER:$PASSWORD" | chpasswd - cp -r /root/.gtkrc-2.0 ${HOME} + cp -r /root/.* ${HOME} fi sed -i "s|%USER%|$USER|" /etc/supervisor/conf.d/supervisord.conf sed -i "s|%HOME%|$HOME|" /etc/supervisor/conf.d/supervisord.conf # home folder mkdir -p $HOME/.config/pcmanfm/LXDE/ -ln -sf /usr/share/doro-lxde-wallpapers/desktop-items-0.conf $HOME/.config/pcmanfm/LXDE/ +ln -sf /usr/local/share/doro-lxde-wallpapers/desktop-items-0.conf $HOME/.config/pcmanfm/LXDE/ chown -R $USER:$USER $HOME # clearup PASSWORD= -cd /usr/lib/web && ./run.py 2>&1 & -nginx -c /etc/nginx/nginx.conf exec /bin/tini -- /usr/bin/supervisord -n diff --git a/image/usr/local/bin/xvfb.sh b/image/usr/local/bin/xvfb.sh new file mode 100755 index 0000000..5c12d72 --- /dev/null +++ b/image/usr/local/bin/xvfb.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +exec /usr/bin/Xvfb :1 -screen 0 1024x768x16 diff --git a/image/usr/lib/noVNC/.gitlastcommit b/image/usr/local/lib/novnc/.gitlastcommit similarity index 100% rename from image/usr/lib/noVNC/.gitlastcommit rename to image/usr/local/lib/novnc/.gitlastcommit diff --git a/image/usr/lib/noVNC/.npmignore b/image/usr/local/lib/novnc/.npmignore similarity index 100% rename from image/usr/lib/noVNC/.npmignore rename to image/usr/local/lib/novnc/.npmignore diff --git a/image/usr/lib/noVNC/.travis.yml b/image/usr/local/lib/novnc/.travis.yml similarity index 100% rename from image/usr/lib/noVNC/.travis.yml rename to image/usr/local/lib/novnc/.travis.yml diff --git a/image/usr/lib/noVNC/CONTRIBUTING.md b/image/usr/local/lib/novnc/CONTRIBUTING.md similarity index 100% rename from image/usr/lib/noVNC/CONTRIBUTING.md rename to image/usr/local/lib/novnc/CONTRIBUTING.md diff --git a/image/usr/lib/noVNC/LICENSE.txt b/image/usr/local/lib/novnc/LICENSE.txt similarity index 100% rename from image/usr/lib/noVNC/LICENSE.txt rename to image/usr/local/lib/novnc/LICENSE.txt diff --git a/image/usr/lib/noVNC/README.md b/image/usr/local/lib/novnc/README.md similarity index 100% rename from image/usr/lib/noVNC/README.md rename to image/usr/local/lib/novnc/README.md diff --git a/image/usr/lib/noVNC/app/images/alt.svg b/image/usr/local/lib/novnc/app/images/alt.svg similarity index 100% rename from image/usr/lib/noVNC/app/images/alt.svg rename to image/usr/local/lib/novnc/app/images/alt.svg diff --git a/image/usr/lib/noVNC/app/images/clipboard.svg b/image/usr/local/lib/novnc/app/images/clipboard.svg similarity index 100% rename from image/usr/lib/noVNC/app/images/clipboard.svg rename to image/usr/local/lib/novnc/app/images/clipboard.svg diff --git a/image/usr/lib/noVNC/app/images/connect.svg b/image/usr/local/lib/novnc/app/images/connect.svg similarity index 100% rename from image/usr/lib/noVNC/app/images/connect.svg rename to image/usr/local/lib/novnc/app/images/connect.svg diff --git a/image/usr/lib/noVNC/app/images/ctrl.svg b/image/usr/local/lib/novnc/app/images/ctrl.svg similarity index 100% rename from image/usr/lib/noVNC/app/images/ctrl.svg rename to image/usr/local/lib/novnc/app/images/ctrl.svg diff --git a/image/usr/lib/noVNC/app/images/ctrlaltdel.svg b/image/usr/local/lib/novnc/app/images/ctrlaltdel.svg similarity index 100% rename from image/usr/lib/noVNC/app/images/ctrlaltdel.svg rename to image/usr/local/lib/novnc/app/images/ctrlaltdel.svg diff --git a/image/usr/lib/noVNC/app/images/disconnect.svg b/image/usr/local/lib/novnc/app/images/disconnect.svg similarity index 100% rename from image/usr/lib/noVNC/app/images/disconnect.svg rename to image/usr/local/lib/novnc/app/images/disconnect.svg diff --git a/image/usr/lib/noVNC/app/images/drag.svg b/image/usr/local/lib/novnc/app/images/drag.svg similarity index 100% rename from image/usr/lib/noVNC/app/images/drag.svg rename to image/usr/local/lib/novnc/app/images/drag.svg diff --git a/image/usr/lib/noVNC/app/images/error.svg b/image/usr/local/lib/novnc/app/images/error.svg similarity index 100% rename from image/usr/lib/noVNC/app/images/error.svg rename to image/usr/local/lib/novnc/app/images/error.svg diff --git a/image/usr/lib/noVNC/app/images/esc.svg b/image/usr/local/lib/novnc/app/images/esc.svg similarity index 100% rename from image/usr/lib/noVNC/app/images/esc.svg rename to image/usr/local/lib/novnc/app/images/esc.svg diff --git a/image/usr/lib/noVNC/app/images/expander.svg b/image/usr/local/lib/novnc/app/images/expander.svg similarity index 100% rename from image/usr/lib/noVNC/app/images/expander.svg rename to image/usr/local/lib/novnc/app/images/expander.svg diff --git a/image/usr/lib/noVNC/app/images/fullscreen.svg b/image/usr/local/lib/novnc/app/images/fullscreen.svg similarity index 100% rename from image/usr/lib/noVNC/app/images/fullscreen.svg rename to image/usr/local/lib/novnc/app/images/fullscreen.svg diff --git a/image/usr/lib/noVNC/app/images/handle.svg b/image/usr/local/lib/novnc/app/images/handle.svg similarity index 100% rename from image/usr/lib/noVNC/app/images/handle.svg rename to image/usr/local/lib/novnc/app/images/handle.svg diff --git a/image/usr/lib/noVNC/app/images/handle_bg.svg b/image/usr/local/lib/novnc/app/images/handle_bg.svg similarity index 100% rename from image/usr/lib/noVNC/app/images/handle_bg.svg rename to image/usr/local/lib/novnc/app/images/handle_bg.svg diff --git a/image/usr/lib/noVNC/app/images/icons/Makefile b/image/usr/local/lib/novnc/app/images/icons/Makefile similarity index 100% rename from image/usr/lib/noVNC/app/images/icons/Makefile rename to image/usr/local/lib/novnc/app/images/icons/Makefile diff --git a/image/usr/lib/noVNC/app/images/icons/novnc-120x120.png b/image/usr/local/lib/novnc/app/images/icons/novnc-120x120.png similarity index 100% rename from image/usr/lib/noVNC/app/images/icons/novnc-120x120.png rename to image/usr/local/lib/novnc/app/images/icons/novnc-120x120.png diff --git a/image/usr/lib/noVNC/app/images/icons/novnc-144x144.png b/image/usr/local/lib/novnc/app/images/icons/novnc-144x144.png similarity index 100% rename from image/usr/lib/noVNC/app/images/icons/novnc-144x144.png rename to image/usr/local/lib/novnc/app/images/icons/novnc-144x144.png diff --git a/image/usr/lib/noVNC/app/images/icons/novnc-152x152.png b/image/usr/local/lib/novnc/app/images/icons/novnc-152x152.png similarity index 100% rename from image/usr/lib/noVNC/app/images/icons/novnc-152x152.png rename to image/usr/local/lib/novnc/app/images/icons/novnc-152x152.png diff --git a/image/usr/lib/noVNC/app/images/icons/novnc-16x16.png b/image/usr/local/lib/novnc/app/images/icons/novnc-16x16.png similarity index 100% rename from image/usr/lib/noVNC/app/images/icons/novnc-16x16.png rename to image/usr/local/lib/novnc/app/images/icons/novnc-16x16.png diff --git a/image/usr/lib/noVNC/app/images/icons/novnc-192x192.png b/image/usr/local/lib/novnc/app/images/icons/novnc-192x192.png similarity index 100% rename from image/usr/lib/noVNC/app/images/icons/novnc-192x192.png rename to image/usr/local/lib/novnc/app/images/icons/novnc-192x192.png diff --git a/image/usr/lib/noVNC/app/images/icons/novnc-24x24.png b/image/usr/local/lib/novnc/app/images/icons/novnc-24x24.png similarity index 100% rename from image/usr/lib/noVNC/app/images/icons/novnc-24x24.png rename to image/usr/local/lib/novnc/app/images/icons/novnc-24x24.png diff --git a/image/usr/lib/noVNC/app/images/icons/novnc-32x32.png b/image/usr/local/lib/novnc/app/images/icons/novnc-32x32.png similarity index 100% rename from image/usr/lib/noVNC/app/images/icons/novnc-32x32.png rename to image/usr/local/lib/novnc/app/images/icons/novnc-32x32.png diff --git a/image/usr/lib/noVNC/app/images/icons/novnc-48x48.png b/image/usr/local/lib/novnc/app/images/icons/novnc-48x48.png similarity index 100% rename from image/usr/lib/noVNC/app/images/icons/novnc-48x48.png rename to image/usr/local/lib/novnc/app/images/icons/novnc-48x48.png diff --git a/image/usr/lib/noVNC/app/images/icons/novnc-60x60.png b/image/usr/local/lib/novnc/app/images/icons/novnc-60x60.png similarity index 100% rename from image/usr/lib/noVNC/app/images/icons/novnc-60x60.png rename to image/usr/local/lib/novnc/app/images/icons/novnc-60x60.png diff --git a/image/usr/lib/noVNC/app/images/icons/novnc-64x64.png b/image/usr/local/lib/novnc/app/images/icons/novnc-64x64.png similarity index 100% rename from image/usr/lib/noVNC/app/images/icons/novnc-64x64.png rename to image/usr/local/lib/novnc/app/images/icons/novnc-64x64.png diff --git a/image/usr/lib/noVNC/app/images/icons/novnc-72x72.png b/image/usr/local/lib/novnc/app/images/icons/novnc-72x72.png similarity index 100% rename from image/usr/lib/noVNC/app/images/icons/novnc-72x72.png rename to image/usr/local/lib/novnc/app/images/icons/novnc-72x72.png diff --git a/image/usr/lib/noVNC/app/images/icons/novnc-76x76.png b/image/usr/local/lib/novnc/app/images/icons/novnc-76x76.png similarity index 100% rename from image/usr/lib/noVNC/app/images/icons/novnc-76x76.png rename to image/usr/local/lib/novnc/app/images/icons/novnc-76x76.png diff --git a/image/usr/lib/noVNC/app/images/icons/novnc-96x96.png b/image/usr/local/lib/novnc/app/images/icons/novnc-96x96.png similarity index 100% rename from image/usr/lib/noVNC/app/images/icons/novnc-96x96.png rename to image/usr/local/lib/novnc/app/images/icons/novnc-96x96.png diff --git a/image/usr/lib/noVNC/app/images/icons/novnc-icon-sm.svg b/image/usr/local/lib/novnc/app/images/icons/novnc-icon-sm.svg similarity index 100% rename from image/usr/lib/noVNC/app/images/icons/novnc-icon-sm.svg rename to image/usr/local/lib/novnc/app/images/icons/novnc-icon-sm.svg diff --git a/image/usr/lib/noVNC/app/images/icons/novnc-icon.svg b/image/usr/local/lib/novnc/app/images/icons/novnc-icon.svg similarity index 100% rename from image/usr/lib/noVNC/app/images/icons/novnc-icon.svg rename to image/usr/local/lib/novnc/app/images/icons/novnc-icon.svg diff --git a/image/usr/lib/noVNC/app/images/info.svg b/image/usr/local/lib/novnc/app/images/info.svg similarity index 100% rename from image/usr/lib/noVNC/app/images/info.svg rename to image/usr/local/lib/novnc/app/images/info.svg diff --git a/image/usr/lib/noVNC/app/images/keyboard.svg b/image/usr/local/lib/novnc/app/images/keyboard.svg similarity index 100% rename from image/usr/lib/noVNC/app/images/keyboard.svg rename to image/usr/local/lib/novnc/app/images/keyboard.svg diff --git a/image/usr/lib/noVNC/app/images/mouse_left.svg b/image/usr/local/lib/novnc/app/images/mouse_left.svg similarity index 100% rename from image/usr/lib/noVNC/app/images/mouse_left.svg rename to image/usr/local/lib/novnc/app/images/mouse_left.svg diff --git a/image/usr/lib/noVNC/app/images/mouse_middle.svg b/image/usr/local/lib/novnc/app/images/mouse_middle.svg similarity index 100% rename from image/usr/lib/noVNC/app/images/mouse_middle.svg rename to image/usr/local/lib/novnc/app/images/mouse_middle.svg diff --git a/image/usr/lib/noVNC/app/images/mouse_none.svg b/image/usr/local/lib/novnc/app/images/mouse_none.svg similarity index 100% rename from image/usr/lib/noVNC/app/images/mouse_none.svg rename to image/usr/local/lib/novnc/app/images/mouse_none.svg diff --git a/image/usr/lib/noVNC/app/images/mouse_right.svg b/image/usr/local/lib/novnc/app/images/mouse_right.svg similarity index 100% rename from image/usr/lib/noVNC/app/images/mouse_right.svg rename to image/usr/local/lib/novnc/app/images/mouse_right.svg diff --git a/image/usr/lib/noVNC/app/images/power.svg b/image/usr/local/lib/novnc/app/images/power.svg similarity index 100% rename from image/usr/lib/noVNC/app/images/power.svg rename to image/usr/local/lib/novnc/app/images/power.svg diff --git a/image/usr/lib/noVNC/app/images/settings.svg b/image/usr/local/lib/novnc/app/images/settings.svg similarity index 100% rename from image/usr/lib/noVNC/app/images/settings.svg rename to image/usr/local/lib/novnc/app/images/settings.svg diff --git a/image/usr/lib/noVNC/app/images/tab.svg b/image/usr/local/lib/novnc/app/images/tab.svg similarity index 100% rename from image/usr/lib/noVNC/app/images/tab.svg rename to image/usr/local/lib/novnc/app/images/tab.svg diff --git a/image/usr/lib/noVNC/app/images/toggleextrakeys.svg b/image/usr/local/lib/novnc/app/images/toggleextrakeys.svg similarity index 100% rename from image/usr/lib/noVNC/app/images/toggleextrakeys.svg rename to image/usr/local/lib/novnc/app/images/toggleextrakeys.svg diff --git a/image/usr/lib/noVNC/app/images/warning.svg b/image/usr/local/lib/novnc/app/images/warning.svg similarity index 100% rename from image/usr/lib/noVNC/app/images/warning.svg rename to image/usr/local/lib/novnc/app/images/warning.svg diff --git a/image/usr/lib/noVNC/app/jquery-3.3.1.min.js b/image/usr/local/lib/novnc/app/jquery-3.3.1.min.js similarity index 100% rename from image/usr/lib/noVNC/app/jquery-3.3.1.min.js rename to image/usr/local/lib/novnc/app/jquery-3.3.1.min.js diff --git a/image/usr/lib/noVNC/app/locale/de.js b/image/usr/local/lib/novnc/app/locale/de.js similarity index 100% rename from image/usr/lib/noVNC/app/locale/de.js rename to image/usr/local/lib/novnc/app/locale/de.js diff --git a/image/usr/lib/noVNC/app/locale/el.js b/image/usr/local/lib/novnc/app/locale/el.js similarity index 100% rename from image/usr/lib/noVNC/app/locale/el.js rename to image/usr/local/lib/novnc/app/locale/el.js diff --git a/image/usr/lib/noVNC/app/locale/nl.js b/image/usr/local/lib/novnc/app/locale/nl.js similarity index 100% rename from image/usr/lib/noVNC/app/locale/nl.js rename to image/usr/local/lib/novnc/app/locale/nl.js diff --git a/image/usr/lib/noVNC/app/locale/sv.js b/image/usr/local/lib/novnc/app/locale/sv.js similarity index 100% rename from image/usr/lib/noVNC/app/locale/sv.js rename to image/usr/local/lib/novnc/app/locale/sv.js diff --git a/image/usr/lib/noVNC/app/sounds/CREDITS b/image/usr/local/lib/novnc/app/sounds/CREDITS similarity index 100% rename from image/usr/lib/noVNC/app/sounds/CREDITS rename to image/usr/local/lib/novnc/app/sounds/CREDITS diff --git a/image/usr/lib/noVNC/app/sounds/bell.mp3 b/image/usr/local/lib/novnc/app/sounds/bell.mp3 similarity index 100% rename from image/usr/lib/noVNC/app/sounds/bell.mp3 rename to image/usr/local/lib/novnc/app/sounds/bell.mp3 diff --git a/image/usr/lib/noVNC/app/sounds/bell.oga b/image/usr/local/lib/novnc/app/sounds/bell.oga similarity index 100% rename from image/usr/lib/noVNC/app/sounds/bell.oga rename to image/usr/local/lib/novnc/app/sounds/bell.oga diff --git a/image/usr/lib/noVNC/app/styles/Orbitron700.ttf b/image/usr/local/lib/novnc/app/styles/Orbitron700.ttf similarity index 100% rename from image/usr/lib/noVNC/app/styles/Orbitron700.ttf rename to image/usr/local/lib/novnc/app/styles/Orbitron700.ttf diff --git a/image/usr/lib/noVNC/app/styles/Orbitron700.woff b/image/usr/local/lib/novnc/app/styles/Orbitron700.woff similarity index 100% rename from image/usr/lib/noVNC/app/styles/Orbitron700.woff rename to image/usr/local/lib/novnc/app/styles/Orbitron700.woff diff --git a/image/usr/lib/noVNC/app/styles/auto.css b/image/usr/local/lib/novnc/app/styles/auto.css similarity index 100% rename from image/usr/lib/noVNC/app/styles/auto.css rename to image/usr/local/lib/novnc/app/styles/auto.css diff --git a/image/usr/lib/noVNC/app/styles/base.css b/image/usr/local/lib/novnc/app/styles/base.css similarity index 100% rename from image/usr/lib/noVNC/app/styles/base.css rename to image/usr/local/lib/novnc/app/styles/base.css diff --git a/image/usr/lib/noVNC/app/ui.js b/image/usr/local/lib/novnc/app/ui.js similarity index 100% rename from image/usr/lib/noVNC/app/ui.js rename to image/usr/local/lib/novnc/app/ui.js diff --git a/image/usr/lib/noVNC/app/webutil.js b/image/usr/local/lib/novnc/app/webutil.js similarity index 100% rename from image/usr/lib/noVNC/app/webutil.js rename to image/usr/local/lib/novnc/app/webutil.js diff --git a/image/usr/lib/noVNC/core/base64.js b/image/usr/local/lib/novnc/core/base64.js similarity index 100% rename from image/usr/lib/noVNC/core/base64.js rename to image/usr/local/lib/novnc/core/base64.js diff --git a/image/usr/lib/noVNC/core/des.js b/image/usr/local/lib/novnc/core/des.js similarity index 100% rename from image/usr/lib/noVNC/core/des.js rename to image/usr/local/lib/novnc/core/des.js diff --git a/image/usr/lib/noVNC/core/display.js b/image/usr/local/lib/novnc/core/display.js similarity index 100% rename from image/usr/lib/noVNC/core/display.js rename to image/usr/local/lib/novnc/core/display.js diff --git a/image/usr/lib/noVNC/core/inflator.js b/image/usr/local/lib/novnc/core/inflator.js similarity index 100% rename from image/usr/lib/noVNC/core/inflator.js rename to image/usr/local/lib/novnc/core/inflator.js diff --git a/image/usr/lib/noVNC/core/inflator.mod.js b/image/usr/local/lib/novnc/core/inflator.mod.js similarity index 100% rename from image/usr/lib/noVNC/core/inflator.mod.js rename to image/usr/local/lib/novnc/core/inflator.mod.js diff --git a/image/usr/lib/noVNC/core/input/devices.js b/image/usr/local/lib/novnc/core/input/devices.js similarity index 100% rename from image/usr/lib/noVNC/core/input/devices.js rename to image/usr/local/lib/novnc/core/input/devices.js diff --git a/image/usr/lib/noVNC/core/input/keysym.js b/image/usr/local/lib/novnc/core/input/keysym.js similarity index 100% rename from image/usr/lib/noVNC/core/input/keysym.js rename to image/usr/local/lib/novnc/core/input/keysym.js diff --git a/image/usr/lib/noVNC/core/input/keysymdef.js b/image/usr/local/lib/novnc/core/input/keysymdef.js similarity index 100% rename from image/usr/lib/noVNC/core/input/keysymdef.js rename to image/usr/local/lib/novnc/core/input/keysymdef.js diff --git a/image/usr/lib/noVNC/core/input/util.js b/image/usr/local/lib/novnc/core/input/util.js similarity index 100% rename from image/usr/lib/noVNC/core/input/util.js rename to image/usr/local/lib/novnc/core/input/util.js diff --git a/image/usr/lib/noVNC/core/input/xtscancodes.js b/image/usr/local/lib/novnc/core/input/xtscancodes.js similarity index 100% rename from image/usr/lib/noVNC/core/input/xtscancodes.js rename to image/usr/local/lib/novnc/core/input/xtscancodes.js diff --git a/image/usr/lib/noVNC/core/rfb.js b/image/usr/local/lib/novnc/core/rfb.js similarity index 100% rename from image/usr/lib/noVNC/core/rfb.js rename to image/usr/local/lib/novnc/core/rfb.js diff --git a/image/usr/lib/noVNC/core/util.js b/image/usr/local/lib/novnc/core/util.js similarity index 100% rename from image/usr/lib/noVNC/core/util.js rename to image/usr/local/lib/novnc/core/util.js diff --git a/image/usr/lib/noVNC/core/websock.js b/image/usr/local/lib/novnc/core/websock.js similarity index 100% rename from image/usr/lib/noVNC/core/websock.js rename to image/usr/local/lib/novnc/core/websock.js diff --git a/image/usr/lib/noVNC/docs/LICENSE.Apache-2.0 b/image/usr/local/lib/novnc/docs/LICENSE.Apache-2.0 similarity index 100% rename from image/usr/lib/noVNC/docs/LICENSE.Apache-2.0 rename to image/usr/local/lib/novnc/docs/LICENSE.Apache-2.0 diff --git a/image/usr/lib/noVNC/docs/LICENSE.BSD-2-Clause b/image/usr/local/lib/novnc/docs/LICENSE.BSD-2-Clause similarity index 100% rename from image/usr/lib/noVNC/docs/LICENSE.BSD-2-Clause rename to image/usr/local/lib/novnc/docs/LICENSE.BSD-2-Clause diff --git a/image/usr/lib/noVNC/docs/LICENSE.BSD-3-Clause b/image/usr/local/lib/novnc/docs/LICENSE.BSD-3-Clause similarity index 100% rename from image/usr/lib/noVNC/docs/LICENSE.BSD-3-Clause rename to image/usr/local/lib/novnc/docs/LICENSE.BSD-3-Clause diff --git a/image/usr/lib/noVNC/docs/LICENSE.GPL-3 b/image/usr/local/lib/novnc/docs/LICENSE.GPL-3 similarity index 100% rename from image/usr/lib/noVNC/docs/LICENSE.GPL-3 rename to image/usr/local/lib/novnc/docs/LICENSE.GPL-3 diff --git a/image/usr/lib/noVNC/docs/LICENSE.LGPL-3 b/image/usr/local/lib/novnc/docs/LICENSE.LGPL-3 similarity index 100% rename from image/usr/lib/noVNC/docs/LICENSE.LGPL-3 rename to image/usr/local/lib/novnc/docs/LICENSE.LGPL-3 diff --git a/image/usr/lib/noVNC/docs/LICENSE.MPL-2.0 b/image/usr/local/lib/novnc/docs/LICENSE.MPL-2.0 similarity index 100% rename from image/usr/lib/noVNC/docs/LICENSE.MPL-2.0 rename to image/usr/local/lib/novnc/docs/LICENSE.MPL-2.0 diff --git a/image/usr/lib/noVNC/docs/LICENSE.OFL-1.1 b/image/usr/local/lib/novnc/docs/LICENSE.OFL-1.1 similarity index 100% rename from image/usr/lib/noVNC/docs/LICENSE.OFL-1.1 rename to image/usr/local/lib/novnc/docs/LICENSE.OFL-1.1 diff --git a/image/usr/lib/noVNC/docs/LICENSE.pako b/image/usr/local/lib/novnc/docs/LICENSE.pako similarity index 100% rename from image/usr/lib/noVNC/docs/LICENSE.pako rename to image/usr/local/lib/novnc/docs/LICENSE.pako diff --git a/image/usr/lib/noVNC/docs/LICENSE.zlib b/image/usr/local/lib/novnc/docs/LICENSE.zlib similarity index 100% rename from image/usr/lib/noVNC/docs/LICENSE.zlib rename to image/usr/local/lib/novnc/docs/LICENSE.zlib diff --git a/image/usr/lib/noVNC/docs/VERSION b/image/usr/local/lib/novnc/docs/VERSION similarity index 100% rename from image/usr/lib/noVNC/docs/VERSION rename to image/usr/local/lib/novnc/docs/VERSION diff --git a/image/usr/lib/noVNC/docs/flash_policy.txt b/image/usr/local/lib/novnc/docs/flash_policy.txt similarity index 100% rename from image/usr/lib/noVNC/docs/flash_policy.txt rename to image/usr/local/lib/novnc/docs/flash_policy.txt diff --git a/image/usr/lib/noVNC/docs/links b/image/usr/local/lib/novnc/docs/links similarity index 100% rename from image/usr/lib/noVNC/docs/links rename to image/usr/local/lib/novnc/docs/links diff --git a/image/usr/lib/noVNC/docs/notes b/image/usr/local/lib/novnc/docs/notes similarity index 100% rename from image/usr/lib/noVNC/docs/notes rename to image/usr/local/lib/novnc/docs/notes diff --git a/image/usr/lib/noVNC/docs/release.txt b/image/usr/local/lib/novnc/docs/release.txt similarity index 100% rename from image/usr/lib/noVNC/docs/release.txt rename to image/usr/local/lib/novnc/docs/release.txt diff --git a/image/usr/lib/noVNC/docs/rfb_notes b/image/usr/local/lib/novnc/docs/rfb_notes similarity index 100% rename from image/usr/lib/noVNC/docs/rfb_notes rename to image/usr/local/lib/novnc/docs/rfb_notes diff --git a/image/usr/lib/noVNC/docs/rfbproto-3.3.pdf b/image/usr/local/lib/novnc/docs/rfbproto-3.3.pdf similarity index 100% rename from image/usr/lib/noVNC/docs/rfbproto-3.3.pdf rename to image/usr/local/lib/novnc/docs/rfbproto-3.3.pdf diff --git a/image/usr/lib/noVNC/docs/rfbproto-3.7.pdf b/image/usr/local/lib/novnc/docs/rfbproto-3.7.pdf similarity index 100% rename from image/usr/lib/noVNC/docs/rfbproto-3.7.pdf rename to image/usr/local/lib/novnc/docs/rfbproto-3.7.pdf diff --git a/image/usr/lib/noVNC/docs/rfbproto-3.8.pdf b/image/usr/local/lib/novnc/docs/rfbproto-3.8.pdf similarity index 100% rename from image/usr/lib/noVNC/docs/rfbproto-3.8.pdf rename to image/usr/local/lib/novnc/docs/rfbproto-3.8.pdf diff --git a/image/usr/lib/noVNC/karma.conf.js b/image/usr/local/lib/novnc/karma.conf.js similarity index 100% rename from image/usr/lib/noVNC/karma.conf.js rename to image/usr/local/lib/novnc/karma.conf.js diff --git a/image/usr/lib/noVNC/package.json b/image/usr/local/lib/novnc/package.json similarity index 100% rename from image/usr/lib/noVNC/package.json rename to image/usr/local/lib/novnc/package.json diff --git a/image/usr/lib/noVNC/po/Makefile b/image/usr/local/lib/novnc/po/Makefile similarity index 100% rename from image/usr/lib/noVNC/po/Makefile rename to image/usr/local/lib/novnc/po/Makefile diff --git a/image/usr/lib/noVNC/po/de.po b/image/usr/local/lib/novnc/po/de.po similarity index 100% rename from image/usr/lib/noVNC/po/de.po rename to image/usr/local/lib/novnc/po/de.po diff --git a/image/usr/lib/noVNC/po/el.po b/image/usr/local/lib/novnc/po/el.po similarity index 100% rename from image/usr/lib/noVNC/po/el.po rename to image/usr/local/lib/novnc/po/el.po diff --git a/image/usr/lib/noVNC/po/nl.po b/image/usr/local/lib/novnc/po/nl.po similarity index 100% rename from image/usr/lib/noVNC/po/nl.po rename to image/usr/local/lib/novnc/po/nl.po diff --git a/image/usr/lib/noVNC/po/noVNC.pot b/image/usr/local/lib/novnc/po/noVNC.pot similarity index 100% rename from image/usr/lib/noVNC/po/noVNC.pot rename to image/usr/local/lib/novnc/po/noVNC.pot diff --git a/image/usr/lib/noVNC/po/po2js b/image/usr/local/lib/novnc/po/po2js similarity index 100% rename from image/usr/lib/noVNC/po/po2js rename to image/usr/local/lib/novnc/po/po2js diff --git a/image/usr/lib/noVNC/po/sv.po b/image/usr/local/lib/novnc/po/sv.po similarity index 100% rename from image/usr/lib/noVNC/po/sv.po rename to image/usr/local/lib/novnc/po/sv.po diff --git a/image/usr/lib/noVNC/po/xgettext-html b/image/usr/local/lib/novnc/po/xgettext-html similarity index 100% rename from image/usr/lib/noVNC/po/xgettext-html rename to image/usr/local/lib/novnc/po/xgettext-html diff --git a/image/usr/lib/noVNC/tests/assertions.js b/image/usr/local/lib/novnc/tests/assertions.js similarity index 100% rename from image/usr/lib/noVNC/tests/assertions.js rename to image/usr/local/lib/novnc/tests/assertions.js diff --git a/image/usr/lib/noVNC/tests/fake.websocket.js b/image/usr/local/lib/novnc/tests/fake.websocket.js similarity index 100% rename from image/usr/lib/noVNC/tests/fake.websocket.js rename to image/usr/local/lib/novnc/tests/fake.websocket.js diff --git a/image/usr/lib/noVNC/tests/input.html b/image/usr/local/lib/novnc/tests/input.html similarity index 100% rename from image/usr/lib/noVNC/tests/input.html rename to image/usr/local/lib/novnc/tests/input.html diff --git a/image/usr/lib/noVNC/tests/playback.js b/image/usr/local/lib/novnc/tests/playback.js similarity index 100% rename from image/usr/lib/noVNC/tests/playback.js rename to image/usr/local/lib/novnc/tests/playback.js diff --git a/image/usr/lib/noVNC/tests/run_from_console.casper.js b/image/usr/local/lib/novnc/tests/run_from_console.casper.js similarity index 100% rename from image/usr/lib/noVNC/tests/run_from_console.casper.js rename to image/usr/local/lib/novnc/tests/run_from_console.casper.js diff --git a/image/usr/lib/noVNC/tests/run_from_console.js b/image/usr/local/lib/novnc/tests/run_from_console.js similarity index 100% rename from image/usr/lib/noVNC/tests/run_from_console.js rename to image/usr/local/lib/novnc/tests/run_from_console.js diff --git a/image/usr/lib/noVNC/tests/run_from_console.zombie.js b/image/usr/local/lib/novnc/tests/run_from_console.zombie.js similarity index 100% rename from image/usr/lib/noVNC/tests/run_from_console.zombie.js rename to image/usr/local/lib/novnc/tests/run_from_console.zombie.js diff --git a/image/usr/lib/noVNC/tests/test.base64.js b/image/usr/local/lib/novnc/tests/test.base64.js similarity index 100% rename from image/usr/lib/noVNC/tests/test.base64.js rename to image/usr/local/lib/novnc/tests/test.base64.js diff --git a/image/usr/lib/noVNC/tests/test.display.js b/image/usr/local/lib/novnc/tests/test.display.js similarity index 100% rename from image/usr/lib/noVNC/tests/test.display.js rename to image/usr/local/lib/novnc/tests/test.display.js diff --git a/image/usr/lib/noVNC/tests/test.helper.js b/image/usr/local/lib/novnc/tests/test.helper.js similarity index 100% rename from image/usr/lib/noVNC/tests/test.helper.js rename to image/usr/local/lib/novnc/tests/test.helper.js diff --git a/image/usr/lib/noVNC/tests/test.keyboard.js b/image/usr/local/lib/novnc/tests/test.keyboard.js similarity index 100% rename from image/usr/lib/noVNC/tests/test.keyboard.js rename to image/usr/local/lib/novnc/tests/test.keyboard.js diff --git a/image/usr/lib/noVNC/tests/test.rfb.js b/image/usr/local/lib/novnc/tests/test.rfb.js similarity index 100% rename from image/usr/lib/noVNC/tests/test.rfb.js rename to image/usr/local/lib/novnc/tests/test.rfb.js diff --git a/image/usr/lib/noVNC/tests/test.util.js b/image/usr/local/lib/novnc/tests/test.util.js similarity index 100% rename from image/usr/lib/noVNC/tests/test.util.js rename to image/usr/local/lib/novnc/tests/test.util.js diff --git a/image/usr/lib/noVNC/tests/test.websock.js b/image/usr/local/lib/novnc/tests/test.websock.js similarity index 100% rename from image/usr/lib/noVNC/tests/test.websock.js rename to image/usr/local/lib/novnc/tests/test.websock.js diff --git a/image/usr/lib/noVNC/tests/vnc_perf.html b/image/usr/local/lib/novnc/tests/vnc_perf.html similarity index 100% rename from image/usr/lib/noVNC/tests/vnc_perf.html rename to image/usr/local/lib/novnc/tests/vnc_perf.html diff --git a/image/usr/lib/noVNC/tests/vnc_playback.html b/image/usr/local/lib/novnc/tests/vnc_playback.html similarity index 100% rename from image/usr/lib/noVNC/tests/vnc_playback.html rename to image/usr/local/lib/novnc/tests/vnc_playback.html diff --git a/image/usr/lib/noVNC/utils/README.md b/image/usr/local/lib/novnc/utils/README.md similarity index 100% rename from image/usr/lib/noVNC/utils/README.md rename to image/usr/local/lib/novnc/utils/README.md diff --git a/image/usr/lib/noVNC/utils/b64-to-binary.pl b/image/usr/local/lib/novnc/utils/b64-to-binary.pl similarity index 100% rename from image/usr/lib/noVNC/utils/b64-to-binary.pl rename to image/usr/local/lib/novnc/utils/b64-to-binary.pl diff --git a/image/usr/lib/noVNC/utils/img2js.py b/image/usr/local/lib/novnc/utils/img2js.py similarity index 100% rename from image/usr/lib/noVNC/utils/img2js.py rename to image/usr/local/lib/novnc/utils/img2js.py diff --git a/image/usr/lib/noVNC/utils/json2graph.py b/image/usr/local/lib/novnc/utils/json2graph.py similarity index 100% rename from image/usr/lib/noVNC/utils/json2graph.py rename to image/usr/local/lib/novnc/utils/json2graph.py diff --git a/image/usr/lib/noVNC/utils/launch.sh b/image/usr/local/lib/novnc/utils/launch.sh similarity index 100% rename from image/usr/lib/noVNC/utils/launch.sh rename to image/usr/local/lib/novnc/utils/launch.sh diff --git a/image/usr/lib/noVNC/utils/make-module-transform.js b/image/usr/local/lib/novnc/utils/make-module-transform.js similarity index 100% rename from image/usr/lib/noVNC/utils/make-module-transform.js rename to image/usr/local/lib/novnc/utils/make-module-transform.js diff --git a/image/usr/lib/noVNC/utils/parse.js b/image/usr/local/lib/novnc/utils/parse.js similarity index 100% rename from image/usr/lib/noVNC/utils/parse.js rename to image/usr/local/lib/novnc/utils/parse.js diff --git a/image/usr/lib/noVNC/utils/u2x11 b/image/usr/local/lib/novnc/utils/u2x11 similarity index 100% rename from image/usr/lib/noVNC/utils/u2x11 rename to image/usr/local/lib/novnc/utils/u2x11 diff --git a/image/usr/lib/noVNC/utils/use_require.js b/image/usr/local/lib/novnc/utils/use_require.js similarity index 100% rename from image/usr/lib/noVNC/utils/use_require.js rename to image/usr/local/lib/novnc/utils/use_require.js diff --git a/image/usr/lib/noVNC/utils/websockify/.travis.yml b/image/usr/local/lib/novnc/utils/websockify/.travis.yml similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/.travis.yml rename to image/usr/local/lib/novnc/utils/websockify/.travis.yml diff --git a/image/usr/lib/noVNC/utils/websockify/CHANGES.txt b/image/usr/local/lib/novnc/utils/websockify/CHANGES.txt similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/CHANGES.txt rename to image/usr/local/lib/novnc/utils/websockify/CHANGES.txt diff --git a/image/usr/lib/noVNC/utils/websockify/LICENSE.txt b/image/usr/local/lib/novnc/utils/websockify/LICENSE.txt similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/LICENSE.txt rename to image/usr/local/lib/novnc/utils/websockify/LICENSE.txt diff --git a/image/usr/lib/noVNC/utils/websockify/MANIFEST.in b/image/usr/local/lib/novnc/utils/websockify/MANIFEST.in similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/MANIFEST.in rename to image/usr/local/lib/novnc/utils/websockify/MANIFEST.in diff --git a/image/usr/lib/noVNC/utils/websockify/Makefile b/image/usr/local/lib/novnc/utils/websockify/Makefile similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/Makefile rename to image/usr/local/lib/novnc/utils/websockify/Makefile diff --git a/image/usr/lib/noVNC/utils/websockify/README.md b/image/usr/local/lib/novnc/utils/websockify/README.md similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/README.md rename to image/usr/local/lib/novnc/utils/websockify/README.md diff --git a/image/usr/lib/noVNC/utils/websockify/Windows/Windows Service Readme.txt b/image/usr/local/lib/novnc/utils/websockify/Windows/Windows Service Readme.txt similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/Windows/Windows Service Readme.txt rename to image/usr/local/lib/novnc/utils/websockify/Windows/Windows Service Readme.txt diff --git a/image/usr/lib/noVNC/utils/websockify/Windows/noVNC Websocket Service Project/Program.cs b/image/usr/local/lib/novnc/utils/websockify/Windows/noVNC Websocket Service Project/Program.cs similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/Windows/noVNC Websocket Service Project/Program.cs rename to image/usr/local/lib/novnc/utils/websockify/Windows/noVNC Websocket Service Project/Program.cs diff --git a/image/usr/lib/noVNC/utils/websockify/Windows/noVNC Websocket Service Project/ProjectInstaller.Designer.cs b/image/usr/local/lib/novnc/utils/websockify/Windows/noVNC Websocket Service Project/ProjectInstaller.Designer.cs similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/Windows/noVNC Websocket Service Project/ProjectInstaller.Designer.cs rename to image/usr/local/lib/novnc/utils/websockify/Windows/noVNC Websocket Service Project/ProjectInstaller.Designer.cs diff --git a/image/usr/lib/noVNC/utils/websockify/Windows/noVNC Websocket Service Project/ProjectInstaller.cs b/image/usr/local/lib/novnc/utils/websockify/Windows/noVNC Websocket Service Project/ProjectInstaller.cs similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/Windows/noVNC Websocket Service Project/ProjectInstaller.cs rename to image/usr/local/lib/novnc/utils/websockify/Windows/noVNC Websocket Service Project/ProjectInstaller.cs diff --git a/image/usr/lib/noVNC/utils/websockify/Windows/noVNC Websocket Service Project/ProjectInstaller.resx b/image/usr/local/lib/novnc/utils/websockify/Windows/noVNC Websocket Service Project/ProjectInstaller.resx similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/Windows/noVNC Websocket Service Project/ProjectInstaller.resx rename to image/usr/local/lib/novnc/utils/websockify/Windows/noVNC Websocket Service Project/ProjectInstaller.resx diff --git a/image/usr/lib/noVNC/utils/websockify/Windows/noVNC Websocket Service Project/Properties/AssemblyInfo.cs b/image/usr/local/lib/novnc/utils/websockify/Windows/noVNC Websocket Service Project/Properties/AssemblyInfo.cs similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/Windows/noVNC Websocket Service Project/Properties/AssemblyInfo.cs rename to image/usr/local/lib/novnc/utils/websockify/Windows/noVNC Websocket Service Project/Properties/AssemblyInfo.cs diff --git a/image/usr/lib/noVNC/utils/websockify/Windows/noVNC Websocket Service Project/Service1.Designer.cs b/image/usr/local/lib/novnc/utils/websockify/Windows/noVNC Websocket Service Project/Service1.Designer.cs similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/Windows/noVNC Websocket Service Project/Service1.Designer.cs rename to image/usr/local/lib/novnc/utils/websockify/Windows/noVNC Websocket Service Project/Service1.Designer.cs diff --git a/image/usr/lib/noVNC/utils/websockify/Windows/noVNC Websocket Service Project/Service1.cs b/image/usr/local/lib/novnc/utils/websockify/Windows/noVNC Websocket Service Project/Service1.cs similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/Windows/noVNC Websocket Service Project/Service1.cs rename to image/usr/local/lib/novnc/utils/websockify/Windows/noVNC Websocket Service Project/Service1.cs diff --git a/image/usr/lib/noVNC/utils/websockify/Windows/noVNC Websocket Service Project/noVNC Websocket.csproj b/image/usr/local/lib/novnc/utils/websockify/Windows/noVNC Websocket Service Project/noVNC Websocket.csproj similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/Windows/noVNC Websocket Service Project/noVNC Websocket.csproj rename to image/usr/local/lib/novnc/utils/websockify/Windows/noVNC Websocket Service Project/noVNC Websocket.csproj diff --git a/image/usr/lib/noVNC/utils/websockify/Windows/noVNC Websocket Service Project/noVNC Websocket.sln b/image/usr/local/lib/novnc/utils/websockify/Windows/noVNC Websocket Service Project/noVNC Websocket.sln similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/Windows/noVNC Websocket Service Project/noVNC Websocket.sln rename to image/usr/local/lib/novnc/utils/websockify/Windows/noVNC Websocket Service Project/noVNC Websocket.sln diff --git a/image/usr/lib/noVNC/utils/websockify/docs/LICENSE.GPL-3 b/image/usr/local/lib/novnc/utils/websockify/docs/LICENSE.GPL-3 similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/docs/LICENSE.GPL-3 rename to image/usr/local/lib/novnc/utils/websockify/docs/LICENSE.GPL-3 diff --git a/image/usr/lib/noVNC/utils/websockify/docs/LICENSE.LGPL-3 b/image/usr/local/lib/novnc/utils/websockify/docs/LICENSE.LGPL-3 similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/docs/LICENSE.LGPL-3 rename to image/usr/local/lib/novnc/utils/websockify/docs/LICENSE.LGPL-3 diff --git a/image/usr/lib/noVNC/utils/websockify/docs/LICENSE.MPL-2.0 b/image/usr/local/lib/novnc/utils/websockify/docs/LICENSE.MPL-2.0 similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/docs/LICENSE.MPL-2.0 rename to image/usr/local/lib/novnc/utils/websockify/docs/LICENSE.MPL-2.0 diff --git a/image/usr/lib/noVNC/utils/websockify/docs/TODO b/image/usr/local/lib/novnc/utils/websockify/docs/TODO similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/docs/TODO rename to image/usr/local/lib/novnc/utils/websockify/docs/TODO diff --git a/image/usr/lib/noVNC/utils/websockify/docs/flash_policy.txt b/image/usr/local/lib/novnc/utils/websockify/docs/flash_policy.txt similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/docs/flash_policy.txt rename to image/usr/local/lib/novnc/utils/websockify/docs/flash_policy.txt diff --git a/image/usr/lib/noVNC/utils/websockify/docs/latency_results.txt b/image/usr/local/lib/novnc/utils/websockify/docs/latency_results.txt similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/docs/latency_results.txt rename to image/usr/local/lib/novnc/utils/websockify/docs/latency_results.txt diff --git a/image/usr/lib/noVNC/utils/websockify/docs/notes b/image/usr/local/lib/novnc/utils/websockify/docs/notes similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/docs/notes rename to image/usr/local/lib/novnc/utils/websockify/docs/notes diff --git a/image/usr/lib/noVNC/utils/websockify/docs/release.txt b/image/usr/local/lib/novnc/utils/websockify/docs/release.txt similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/docs/release.txt rename to image/usr/local/lib/novnc/utils/websockify/docs/release.txt diff --git a/image/usr/lib/noVNC/utils/websockify/docs/websockify.1 b/image/usr/local/lib/novnc/utils/websockify/docs/websockify.1 similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/docs/websockify.1 rename to image/usr/local/lib/novnc/utils/websockify/docs/websockify.1 diff --git a/image/usr/lib/noVNC/utils/websockify/include/VT100.js b/image/usr/local/lib/novnc/utils/websockify/include/VT100.js similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/include/VT100.js rename to image/usr/local/lib/novnc/utils/websockify/include/VT100.js diff --git a/image/usr/lib/noVNC/utils/websockify/include/keysym.js b/image/usr/local/lib/novnc/utils/websockify/include/keysym.js similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/include/keysym.js rename to image/usr/local/lib/novnc/utils/websockify/include/keysym.js diff --git a/image/usr/lib/noVNC/utils/websockify/include/util.js b/image/usr/local/lib/novnc/utils/websockify/include/util.js similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/include/util.js rename to image/usr/local/lib/novnc/utils/websockify/include/util.js diff --git a/image/usr/lib/noVNC/utils/websockify/include/websock.js b/image/usr/local/lib/novnc/utils/websockify/include/websock.js similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/include/websock.js rename to image/usr/local/lib/novnc/utils/websockify/include/websock.js diff --git a/image/usr/lib/noVNC/utils/websockify/include/webutil.js b/image/usr/local/lib/novnc/utils/websockify/include/webutil.js similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/include/webutil.js rename to image/usr/local/lib/novnc/utils/websockify/include/webutil.js diff --git a/image/usr/lib/noVNC/utils/websockify/include/wsirc.js b/image/usr/local/lib/novnc/utils/websockify/include/wsirc.js similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/include/wsirc.js rename to image/usr/local/lib/novnc/utils/websockify/include/wsirc.js diff --git a/image/usr/lib/noVNC/utils/websockify/include/wstelnet.js b/image/usr/local/lib/novnc/utils/websockify/include/wstelnet.js similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/include/wstelnet.js rename to image/usr/local/lib/novnc/utils/websockify/include/wstelnet.js diff --git a/image/usr/lib/noVNC/utils/websockify/other/Makefile b/image/usr/local/lib/novnc/utils/websockify/other/Makefile similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/other/Makefile rename to image/usr/local/lib/novnc/utils/websockify/other/Makefile diff --git a/image/usr/lib/noVNC/utils/websockify/other/README.md b/image/usr/local/lib/novnc/utils/websockify/other/README.md similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/other/README.md rename to image/usr/local/lib/novnc/utils/websockify/other/README.md diff --git a/image/usr/lib/noVNC/utils/websockify/other/js/README.md b/image/usr/local/lib/novnc/utils/websockify/other/js/README.md similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/other/js/README.md rename to image/usr/local/lib/novnc/utils/websockify/other/js/README.md diff --git a/image/usr/lib/noVNC/utils/websockify/other/js/package.json b/image/usr/local/lib/novnc/utils/websockify/other/js/package.json similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/other/js/package.json rename to image/usr/local/lib/novnc/utils/websockify/other/js/package.json diff --git a/image/usr/lib/noVNC/utils/websockify/other/js/websockify.js b/image/usr/local/lib/novnc/utils/websockify/other/js/websockify.js similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/other/js/websockify.js rename to image/usr/local/lib/novnc/utils/websockify/other/js/websockify.js diff --git a/image/usr/lib/noVNC/utils/websockify/other/launch.sh b/image/usr/local/lib/novnc/utils/websockify/other/launch.sh similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/other/launch.sh rename to image/usr/local/lib/novnc/utils/websockify/other/launch.sh diff --git a/image/usr/lib/noVNC/utils/websockify/other/project.clj b/image/usr/local/lib/novnc/utils/websockify/other/project.clj similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/other/project.clj rename to image/usr/local/lib/novnc/utils/websockify/other/project.clj diff --git a/image/usr/lib/noVNC/utils/websockify/other/websocket.c b/image/usr/local/lib/novnc/utils/websockify/other/websocket.c similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/other/websocket.c rename to image/usr/local/lib/novnc/utils/websockify/other/websocket.c diff --git a/image/usr/lib/noVNC/utils/websockify/other/websocket.h b/image/usr/local/lib/novnc/utils/websockify/other/websocket.h similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/other/websocket.h rename to image/usr/local/lib/novnc/utils/websockify/other/websocket.h diff --git a/image/usr/lib/noVNC/utils/websockify/other/websocket.rb b/image/usr/local/lib/novnc/utils/websockify/other/websocket.rb similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/other/websocket.rb rename to image/usr/local/lib/novnc/utils/websockify/other/websocket.rb diff --git a/image/usr/lib/noVNC/utils/websockify/other/websockify.c b/image/usr/local/lib/novnc/utils/websockify/other/websockify.c similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/other/websockify.c rename to image/usr/local/lib/novnc/utils/websockify/other/websockify.c diff --git a/image/usr/lib/noVNC/utils/websockify/other/websockify.clj b/image/usr/local/lib/novnc/utils/websockify/other/websockify.clj similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/other/websockify.clj rename to image/usr/local/lib/novnc/utils/websockify/other/websockify.clj diff --git a/image/usr/lib/noVNC/utils/websockify/other/websockify.rb b/image/usr/local/lib/novnc/utils/websockify/other/websockify.rb similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/other/websockify.rb rename to image/usr/local/lib/novnc/utils/websockify/other/websockify.rb diff --git a/image/usr/lib/noVNC/utils/websockify/other/wswrap b/image/usr/local/lib/novnc/utils/websockify/other/wswrap similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/other/wswrap rename to image/usr/local/lib/novnc/utils/websockify/other/wswrap diff --git a/image/usr/lib/noVNC/utils/websockify/rebind b/image/usr/local/lib/novnc/utils/websockify/rebind similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/rebind rename to image/usr/local/lib/novnc/utils/websockify/rebind diff --git a/image/usr/lib/noVNC/utils/websockify/rebind.c b/image/usr/local/lib/novnc/utils/websockify/rebind.c similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/rebind.c rename to image/usr/local/lib/novnc/utils/websockify/rebind.c diff --git a/image/usr/lib/noVNC/utils/websockify/run b/image/usr/local/lib/novnc/utils/websockify/run similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/run rename to image/usr/local/lib/novnc/utils/websockify/run diff --git a/image/usr/lib/noVNC/utils/websockify/setup.py b/image/usr/local/lib/novnc/utils/websockify/setup.py similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/setup.py rename to image/usr/local/lib/novnc/utils/websockify/setup.py diff --git a/image/usr/lib/noVNC/utils/websockify/test-requirements.txt b/image/usr/local/lib/novnc/utils/websockify/test-requirements.txt similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/test-requirements.txt rename to image/usr/local/lib/novnc/utils/websockify/test-requirements.txt diff --git a/image/usr/lib/noVNC/utils/websockify/tests/echo.html b/image/usr/local/lib/novnc/utils/websockify/tests/echo.html similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/tests/echo.html rename to image/usr/local/lib/novnc/utils/websockify/tests/echo.html diff --git a/image/usr/lib/noVNC/utils/websockify/tests/echo.py b/image/usr/local/lib/novnc/utils/websockify/tests/echo.py similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/tests/echo.py rename to image/usr/local/lib/novnc/utils/websockify/tests/echo.py diff --git a/image/usr/lib/noVNC/utils/websockify/tests/echo.rb b/image/usr/local/lib/novnc/utils/websockify/tests/echo.rb similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/tests/echo.rb rename to image/usr/local/lib/novnc/utils/websockify/tests/echo.rb diff --git a/image/usr/lib/noVNC/utils/websockify/tests/echo_client.py b/image/usr/local/lib/novnc/utils/websockify/tests/echo_client.py similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/tests/echo_client.py rename to image/usr/local/lib/novnc/utils/websockify/tests/echo_client.py diff --git a/image/usr/lib/noVNC/utils/websockify/tests/include b/image/usr/local/lib/novnc/utils/websockify/tests/include similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/tests/include rename to image/usr/local/lib/novnc/utils/websockify/tests/include diff --git a/image/usr/lib/noVNC/utils/websockify/tests/latency.html b/image/usr/local/lib/novnc/utils/websockify/tests/latency.html similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/tests/latency.html rename to image/usr/local/lib/novnc/utils/websockify/tests/latency.html diff --git a/image/usr/lib/noVNC/utils/websockify/tests/latency.py b/image/usr/local/lib/novnc/utils/websockify/tests/latency.py similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/tests/latency.py rename to image/usr/local/lib/novnc/utils/websockify/tests/latency.py diff --git a/image/usr/lib/noVNC/utils/websockify/tests/load.html b/image/usr/local/lib/novnc/utils/websockify/tests/load.html similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/tests/load.html rename to image/usr/local/lib/novnc/utils/websockify/tests/load.html diff --git a/image/usr/lib/noVNC/utils/websockify/tests/load.py b/image/usr/local/lib/novnc/utils/websockify/tests/load.py similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/tests/load.py rename to image/usr/local/lib/novnc/utils/websockify/tests/load.py diff --git a/image/usr/lib/noVNC/utils/websockify/tests/plain_echo.html b/image/usr/local/lib/novnc/utils/websockify/tests/plain_echo.html similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/tests/plain_echo.html rename to image/usr/local/lib/novnc/utils/websockify/tests/plain_echo.html diff --git a/image/usr/lib/noVNC/utils/websockify/tests/simple.html b/image/usr/local/lib/novnc/utils/websockify/tests/simple.html similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/tests/simple.html rename to image/usr/local/lib/novnc/utils/websockify/tests/simple.html diff --git a/image/usr/lib/noVNC/utils/websockify/tests/test_auth_plugins.py b/image/usr/local/lib/novnc/utils/websockify/tests/test_auth_plugins.py similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/tests/test_auth_plugins.py rename to image/usr/local/lib/novnc/utils/websockify/tests/test_auth_plugins.py diff --git a/image/usr/lib/noVNC/utils/websockify/tests/test_websocket.py b/image/usr/local/lib/novnc/utils/websockify/tests/test_websocket.py similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/tests/test_websocket.py rename to image/usr/local/lib/novnc/utils/websockify/tests/test_websocket.py diff --git a/image/usr/lib/noVNC/utils/websockify/tests/test_websocketproxy.py b/image/usr/local/lib/novnc/utils/websockify/tests/test_websocketproxy.py similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/tests/test_websocketproxy.py rename to image/usr/local/lib/novnc/utils/websockify/tests/test_websocketproxy.py diff --git a/image/usr/lib/noVNC/utils/websockify/tests/test_websockifyserver.py b/image/usr/local/lib/novnc/utils/websockify/tests/test_websockifyserver.py similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/tests/test_websockifyserver.py rename to image/usr/local/lib/novnc/utils/websockify/tests/test_websockifyserver.py diff --git a/image/usr/lib/noVNC/utils/websockify/tox.ini b/image/usr/local/lib/novnc/utils/websockify/tox.ini similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/tox.ini rename to image/usr/local/lib/novnc/utils/websockify/tox.ini diff --git a/image/usr/lib/noVNC/utils/websockify/websockify.py b/image/usr/local/lib/novnc/utils/websockify/websockify.py similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/websockify.py rename to image/usr/local/lib/novnc/utils/websockify/websockify.py diff --git a/image/usr/lib/noVNC/utils/websockify/websockify/__init__.py b/image/usr/local/lib/novnc/utils/websockify/websockify/__init__.py similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/websockify/__init__.py rename to image/usr/local/lib/novnc/utils/websockify/websockify/__init__.py diff --git a/image/usr/lib/noVNC/utils/websockify/websockify/auth_plugins.py b/image/usr/local/lib/novnc/utils/websockify/websockify/auth_plugins.py similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/websockify/auth_plugins.py rename to image/usr/local/lib/novnc/utils/websockify/websockify/auth_plugins.py diff --git a/image/usr/lib/noVNC/utils/websockify/websockify/token_plugins.py b/image/usr/local/lib/novnc/utils/websockify/websockify/token_plugins.py similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/websockify/token_plugins.py rename to image/usr/local/lib/novnc/utils/websockify/websockify/token_plugins.py diff --git a/image/usr/lib/noVNC/utils/websockify/websockify/websocket.py b/image/usr/local/lib/novnc/utils/websockify/websockify/websocket.py similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/websockify/websocket.py rename to image/usr/local/lib/novnc/utils/websockify/websockify/websocket.py diff --git a/image/usr/lib/noVNC/utils/websockify/websockify/websocketproxy.py b/image/usr/local/lib/novnc/utils/websockify/websockify/websocketproxy.py similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/websockify/websocketproxy.py rename to image/usr/local/lib/novnc/utils/websockify/websockify/websocketproxy.py diff --git a/image/usr/lib/noVNC/utils/websockify/websockify/websocketserver.py b/image/usr/local/lib/novnc/utils/websockify/websockify/websocketserver.py similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/websockify/websocketserver.py rename to image/usr/local/lib/novnc/utils/websockify/websockify/websocketserver.py diff --git a/image/usr/lib/noVNC/utils/websockify/websockify/websockifyserver.py b/image/usr/local/lib/novnc/utils/websockify/websockify/websockifyserver.py similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/websockify/websockifyserver.py rename to image/usr/local/lib/novnc/utils/websockify/websockify/websockifyserver.py diff --git a/image/usr/lib/noVNC/utils/websockify/wsirc.html b/image/usr/local/lib/novnc/utils/websockify/wsirc.html similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/wsirc.html rename to image/usr/local/lib/novnc/utils/websockify/wsirc.html diff --git a/image/usr/lib/noVNC/utils/websockify/wstelnet.html b/image/usr/local/lib/novnc/utils/websockify/wstelnet.html similarity index 100% rename from image/usr/lib/noVNC/utils/websockify/wstelnet.html rename to image/usr/local/lib/novnc/utils/websockify/wstelnet.html diff --git a/image/usr/lib/noVNC/vnc.html b/image/usr/local/lib/novnc/vnc.html similarity index 100% rename from image/usr/lib/noVNC/vnc.html rename to image/usr/local/lib/novnc/vnc.html diff --git a/image/usr/lib/noVNC/vnc_auto.html b/image/usr/local/lib/novnc/vnc_auto.html similarity index 100% rename from image/usr/lib/noVNC/vnc_auto.html rename to image/usr/local/lib/novnc/vnc_auto.html diff --git a/image/usr/lib/web/config/__init__.py b/image/usr/local/lib/web/config/__init__.py similarity index 100% rename from image/usr/lib/web/config/__init__.py rename to image/usr/local/lib/web/config/__init__.py diff --git a/image/usr/lib/web/lightop/__init__.py b/image/usr/local/lib/web/lightop/__init__.py similarity index 94% rename from image/usr/lib/web/lightop/__init__.py rename to image/usr/local/lib/web/lightop/__init__.py index 753a835..4196f25 100644 --- a/image/usr/lib/web/lightop/__init__.py +++ b/image/usr/local/lib/web/lightop/__init__.py @@ -115,14 +115,14 @@ def redirectme(): # sed cmd = ( 'sed -i \'s#' - '^command=/usr/bin/Xvfb.*$' + '^exec /usr/bin/Xvfb.*$' '#' - 'command=/usr/bin/Xvfb :1 -screen 0 {width}x{height}x16' - '#\' /etc/supervisor/conf.d/supervisord.conf' + 'exec /usr/bin/Xvfb :1 -screen 0 {width}x{height}x16' + '#\' /usr/local/bin/xvfb.sh' ).format(**env), subprocess.check_call(cmd, shell=True) # supervisorctrl reload - subprocess.check_call(['supervisorctl', 'reload']) + subprocess.check_call(['supervisorctl', 'restart', 'x:']) # check all running for i in range(40): diff --git a/image/usr/lib/web/log/__init__.py b/image/usr/local/lib/web/log/__init__.py similarity index 100% rename from image/usr/lib/web/log/__init__.py rename to image/usr/local/lib/web/log/__init__.py diff --git a/image/usr/lib/web/log/config.py b/image/usr/local/lib/web/log/config.py similarity index 100% rename from image/usr/lib/web/log/config.py rename to image/usr/local/lib/web/log/config.py diff --git a/image/usr/lib/web/requirements.txt b/image/usr/local/lib/web/requirements.txt similarity index 100% rename from image/usr/lib/web/requirements.txt rename to image/usr/local/lib/web/requirements.txt diff --git a/image/usr/lib/web/run.py b/image/usr/local/lib/web/run.py similarity index 100% rename from image/usr/lib/web/run.py rename to image/usr/local/lib/web/run.py diff --git a/image/usr/lib/web/static/6df2b309.favicon.ico b/image/usr/local/lib/web/static/6df2b309.favicon.ico similarity index 100% rename from image/usr/lib/web/static/6df2b309.favicon.ico rename to image/usr/local/lib/web/static/6df2b309.favicon.ico diff --git a/image/usr/lib/web/static/fonts/glyphicons-halflings-regular.eot b/image/usr/local/lib/web/static/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from image/usr/lib/web/static/fonts/glyphicons-halflings-regular.eot rename to image/usr/local/lib/web/static/fonts/glyphicons-halflings-regular.eot diff --git a/image/usr/lib/web/static/fonts/glyphicons-halflings-regular.svg b/image/usr/local/lib/web/static/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from image/usr/lib/web/static/fonts/glyphicons-halflings-regular.svg rename to image/usr/local/lib/web/static/fonts/glyphicons-halflings-regular.svg diff --git a/image/usr/lib/web/static/fonts/glyphicons-halflings-regular.ttf b/image/usr/local/lib/web/static/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from image/usr/lib/web/static/fonts/glyphicons-halflings-regular.ttf rename to image/usr/local/lib/web/static/fonts/glyphicons-halflings-regular.ttf diff --git a/image/usr/lib/web/static/fonts/glyphicons-halflings-regular.woff b/image/usr/local/lib/web/static/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from image/usr/lib/web/static/fonts/glyphicons-halflings-regular.woff rename to image/usr/local/lib/web/static/fonts/glyphicons-halflings-regular.woff diff --git a/image/usr/lib/web/static/index.html b/image/usr/local/lib/web/static/index.html similarity index 100% rename from image/usr/lib/web/static/index.html rename to image/usr/local/lib/web/static/index.html diff --git a/image/usr/lib/web/static/robots.txt b/image/usr/local/lib/web/static/robots.txt similarity index 100% rename from image/usr/lib/web/static/robots.txt rename to image/usr/local/lib/web/static/robots.txt diff --git a/image/usr/lib/web/static/scripts/046bbd30.main.js b/image/usr/local/lib/web/static/scripts/046bbd30.main.js similarity index 100% rename from image/usr/lib/web/static/scripts/046bbd30.main.js rename to image/usr/local/lib/web/static/scripts/046bbd30.main.js diff --git a/image/usr/lib/web/static/scripts/2c80432f.plugins.js b/image/usr/local/lib/web/static/scripts/2c80432f.plugins.js similarity index 100% rename from image/usr/lib/web/static/scripts/2c80432f.plugins.js rename to image/usr/local/lib/web/static/scripts/2c80432f.plugins.js diff --git a/image/usr/lib/web/static/scripts/9cd97fdd.vendor.js b/image/usr/local/lib/web/static/scripts/9cd97fdd.vendor.js similarity index 100% rename from image/usr/lib/web/static/scripts/9cd97fdd.vendor.js rename to image/usr/local/lib/web/static/scripts/9cd97fdd.vendor.js diff --git a/image/usr/lib/web/static/styles/536b3e9f.main.css b/image/usr/local/lib/web/static/styles/536b3e9f.main.css similarity index 100% rename from image/usr/lib/web/static/styles/536b3e9f.main.css rename to image/usr/local/lib/web/static/styles/536b3e9f.main.css diff --git a/image/usr/lib/web/static/styles/57fdc80f.vendor.css b/image/usr/local/lib/web/static/styles/57fdc80f.vendor.css similarity index 100% rename from image/usr/lib/web/static/styles/57fdc80f.vendor.css rename to image/usr/local/lib/web/static/styles/57fdc80f.vendor.css diff --git a/image/usr/share/doro-lxde-wallpapers/bg1.jpg b/image/usr/local/share/doro-lxde-wallpapers/bg1.jpg similarity index 100% rename from image/usr/share/doro-lxde-wallpapers/bg1.jpg rename to image/usr/local/share/doro-lxde-wallpapers/bg1.jpg diff --git a/image/usr/share/doro-lxde-wallpapers/bg2.jpg b/image/usr/local/share/doro-lxde-wallpapers/bg2.jpg similarity index 100% rename from image/usr/share/doro-lxde-wallpapers/bg2.jpg rename to image/usr/local/share/doro-lxde-wallpapers/bg2.jpg diff --git a/image/usr/share/doro-lxde-wallpapers/bg3.jpg b/image/usr/local/share/doro-lxde-wallpapers/bg3.jpg similarity index 100% rename from image/usr/share/doro-lxde-wallpapers/bg3.jpg rename to image/usr/local/share/doro-lxde-wallpapers/bg3.jpg diff --git a/image/usr/share/doro-lxde-wallpapers/bg4.jpg b/image/usr/local/share/doro-lxde-wallpapers/bg4.jpg similarity index 100% rename from image/usr/share/doro-lxde-wallpapers/bg4.jpg rename to image/usr/local/share/doro-lxde-wallpapers/bg4.jpg diff --git a/image/usr/share/doro-lxde-wallpapers/desktop-items-0.conf b/image/usr/local/share/doro-lxde-wallpapers/desktop-items-0.conf similarity index 51% rename from image/usr/share/doro-lxde-wallpapers/desktop-items-0.conf rename to image/usr/local/share/doro-lxde-wallpapers/desktop-items-0.conf index e61bd49..892fff2 100644 --- a/image/usr/share/doro-lxde-wallpapers/desktop-items-0.conf +++ b/image/usr/local/share/doro-lxde-wallpapers/desktop-items-0.conf @@ -2,10 +2,10 @@ wallpaper_mode=stretch wallpaper_common=0 wallpapers_configured=4 -wallpaper0=/usr/share/doro-lxde-wallpapers/bg1.jpg -wallpaper1=/usr/share/doro-lxde-wallpapers/bg2.jpg -wallpaper2=/usr/share/doro-lxde-wallpapers/bg3.jpg -wallpaper3=/usr/share/doro-lxde-wallpapers/bg4.jpg +wallpaper0=/usr/local/share/doro-lxde-wallpapers/bg1.jpg +wallpaper1=/usr/local/share/doro-lxde-wallpapers/bg2.jpg +wallpaper2=/usr/local/share/doro-lxde-wallpapers/bg3.jpg +wallpaper3=/usr/local/share/doro-lxde-wallpapers/bg4.jpg desktop_bg=#000000 desktop_fg=#ffffff desktop_shadow=#000000