summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2023-06-05 14:46:51 +0200
committerSimon Rettberg2023-06-05 14:55:13 +0200
commitaa99b5e6e9b685830eb4a53bdc831668b835b12f (patch)
treece865d26a5363774115477e687b5513bf528f135
parent[remote-access] Look for proper port(s) when checking activity (diff)
downloadmltk-aa99b5e6e9b685830eb4a53bdc831668b835b12f.tar.gz
mltk-aa99b5e6e9b685830eb4a53bdc831668b835b12f.tar.xz
mltk-aa99b5e6e9b685830eb4a53bdc831668b835b12f.zip
[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.
-rw-r--r--core/modules/remote-access/module.conf2
-rw-r--r--core/modules/tigervnc/module.build14
-rw-r--r--core/modules/tigervnc/module.conf11
-rw-r--r--core/modules/tigervnc/module.conf.debian6
-rw-r--r--core/modules/tigervnc/module.conf.fedora7
-rw-r--r--core/modules/tigervnc/module.conf.opensuse7
-rw-r--r--core/modules/tigervnc/module.conf.ubuntu6
-rw-r--r--core/modules/x11vnc/module.conf6
-rw-r--r--core/modules/x11vnc/module.conf.debian7
-rw-r--r--core/modules/x11vnc/module.conf.ubuntu7
l---------core/targets/bwlp/tigervnc1
11 files changed, 62 insertions, 12 deletions
diff --git a/core/modules/remote-access/module.conf b/core/modules/remote-access/module.conf
index 9a6a9a64..4ab0ef0e 100644
--- a/core/modules/remote-access/module.conf
+++ b/core/modules/remote-access/module.conf
@@ -1,6 +1,6 @@
#!/bin/bash
REQUIRED_MODULES="
- x11vnc
+ tigervnc
"
diff --git a/core/modules/tigervnc/module.build b/core/modules/tigervnc/module.build
new file mode 100644
index 00000000..a183dc1f
--- /dev/null
+++ b/core/modules/tigervnc/module.build
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+fetch_source() {
+ :
+}
+
+build() {
+ :
+}
+
+post_copy() {
+ :
+}
+
diff --git a/core/modules/tigervnc/module.conf b/core/modules/tigervnc/module.conf
new file mode 100644
index 00000000..4149438d
--- /dev/null
+++ b/core/modules/tigervnc/module.conf
@@ -0,0 +1,11 @@
+#!/bin/bash
+REQUIRED_BINARIES="
+ X0tigervnc
+ x0tigervncserver
+ vncpasswd
+"
+REQUIRED_DIRECTORIES="
+ /etc/tigervnc
+ /usr/share/perl5/TigerVNC
+"
+REQUIRED_FILES=""
diff --git a/core/modules/tigervnc/module.conf.debian b/core/modules/tigervnc/module.conf.debian
new file mode 100644
index 00000000..6a19ce74
--- /dev/null
+++ b/core/modules/tigervnc/module.conf.debian
@@ -0,0 +1,6 @@
+#!/bin/bash
+REQUIRED_CONTENT_PACKAGES="
+ tigervnc-scraping-server
+ tigervnc-common
+ tigervnc-tools
+"
diff --git a/core/modules/tigervnc/module.conf.fedora b/core/modules/tigervnc/module.conf.fedora
new file mode 100644
index 00000000..1ca43771
--- /dev/null
+++ b/core/modules/tigervnc/module.conf.fedora
@@ -0,0 +1,7 @@
+#!/bin/bash
+REQUIRED_INSTALLED_PACKAGES="
+ x11vnc
+"
+REQUIRED_CONTENT_PACKAGES="
+ x11vnc
+"
diff --git a/core/modules/tigervnc/module.conf.opensuse b/core/modules/tigervnc/module.conf.opensuse
new file mode 100644
index 00000000..798e2c3b
--- /dev/null
+++ b/core/modules/tigervnc/module.conf.opensuse
@@ -0,0 +1,7 @@
+#!/bin/bash
+REQUIRED_INSTALLED_PACKAGES="
+ x11vnc
+"
+REQUIRED_CONTENT_PACKAGES="
+ x11vnc
+"
diff --git a/core/modules/tigervnc/module.conf.ubuntu b/core/modules/tigervnc/module.conf.ubuntu
new file mode 100644
index 00000000..6a19ce74
--- /dev/null
+++ b/core/modules/tigervnc/module.conf.ubuntu
@@ -0,0 +1,6 @@
+#!/bin/bash
+REQUIRED_CONTENT_PACKAGES="
+ tigervnc-scraping-server
+ tigervnc-common
+ tigervnc-tools
+"
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
"
diff --git a/core/targets/bwlp/tigervnc b/core/targets/bwlp/tigervnc
new file mode 120000
index 00000000..390babeb
--- /dev/null
+++ b/core/targets/bwlp/tigervnc
@@ -0,0 +1 @@
+../../modules/tigervnc \ No newline at end of file