From aa99b5e6e9b685830eb4a53bdc831668b835b12f Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 5 Jun 2023 14:46:51 +0200
Subject: [x11vnc/tigervnc] Seems we shouldn't remove something still in use

PVS2 is still using x11vnc for screen scraping, so maybe removing that
when we moved to tigervnc for remte access wasn't such a great idea.

Maybe, some day in the future, PVS2 will be extended so it can use
either server.
---
 core/modules/x11vnc/module.conf        | 6 +-----
 core/modules/x11vnc/module.conf.debian | 7 ++++---
 core/modules/x11vnc/module.conf.ubuntu | 7 ++++---
 3 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'core/modules/x11vnc')

diff --git a/core/modules/x11vnc/module.conf b/core/modules/x11vnc/module.conf
index 4149438d..89f266c6 100644
--- a/core/modules/x11vnc/module.conf
+++ b/core/modules/x11vnc/module.conf
@@ -1,11 +1,7 @@
 #!/bin/bash
 REQUIRED_BINARIES="
-	X0tigervnc
-	x0tigervncserver
-	vncpasswd
+	x11vnc
 "
 REQUIRED_DIRECTORIES="
-	/etc/tigervnc
-	/usr/share/perl5/TigerVNC
 "
 REQUIRED_FILES=""
diff --git a/core/modules/x11vnc/module.conf.debian b/core/modules/x11vnc/module.conf.debian
index 6a19ce74..798e2c3b 100644
--- a/core/modules/x11vnc/module.conf.debian
+++ b/core/modules/x11vnc/module.conf.debian
@@ -1,6 +1,7 @@
 #!/bin/bash
+REQUIRED_INSTALLED_PACKAGES="
+  x11vnc
+"
 REQUIRED_CONTENT_PACKAGES="
-  tigervnc-scraping-server
-  tigervnc-common
-  tigervnc-tools
+  x11vnc
 "
diff --git a/core/modules/x11vnc/module.conf.ubuntu b/core/modules/x11vnc/module.conf.ubuntu
index 6a19ce74..798e2c3b 100644
--- a/core/modules/x11vnc/module.conf.ubuntu
+++ b/core/modules/x11vnc/module.conf.ubuntu
@@ -1,6 +1,7 @@
 #!/bin/bash
+REQUIRED_INSTALLED_PACKAGES="
+  x11vnc
+"
 REQUIRED_CONTENT_PACKAGES="
-  tigervnc-scraping-server
-  tigervnc-common
-  tigervnc-tools
+  x11vnc
 "
-- 
cgit v1.2.3-55-g7522