Swap x11vnc with tightvncserver

Basically installed this because it can be used with pyvirtualdisplay as a backend AND because it brings in the Xvnc tooling which will start an X11 server as well as a VNC server.
rmol · Dec 21, 2018 · af16906 · af16906
1 parent d97d728
commit af16906
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/securedrop/Dockerfile b/securedrop/Dockerfile
@@ -9,7 +9,7 @@ RUN apt-get update && \
     apt-get install -y devscripts \
                        python-pip libpython2.7-dev libssl-dev secure-delete \
                        gnupg2 ruby redis-server git xvfb haveged curl \
-                       gettext paxctl x11vnc enchant libffi-dev sqlite3 wget \
+                       gettext paxctl tightvncserver enchant libffi-dev sqlite3 wget \
                        libasound2 libdbus-glib-1-2 libgtk2.0-0 libfontconfig1 libxrender1 \
                        libcairo-gobject2 libgtk-3-0 libstartup-notification0
 

diff --git a/securedrop/bin/dev-deps b/securedrop/bin/dev-deps
@@ -11,7 +11,7 @@ function run_redis() {
 }
 
 function run_x11vnc() {
-    setsid x11vnc -display :1 -autoport 5901 -shared >& /tmp/x11vnc.out || cat /tmp/x11vnc.out
+    setsid Xvnc -depth 24 -geometry 1024x768 -rfbport 5901 :1 >& /tmp/x11vnc.out || cat /tmp/x11vnc.out
 }
 
 function urandom() {

diff --git a/securedrop/bin/run b/securedrop/bin/run
@@ -7,7 +7,6 @@ source "${BASH_SOURCE%/*}/dev-deps"
 
 run_xvfb &
 run_redis &
-run_x11vnc &
 urandom
 run_sass --watch &
 maybe_create_config_py

diff --git a/securedrop/bin/run-test b/securedrop/bin/run-test
@@ -6,6 +6,7 @@ set -euo pipefail
 source "${BASH_SOURCE%/*}/dev-deps"
 
 run_redis &
+run_x11vnc &
 urandom
 run_sass --force --update
 maybe_create_config_py