From 02423b5b30bfd0ad28b328c7247f3063d15f255e Mon Sep 17 00:00:00 2001
From: Peter Gerwinski <peter.gerwinski@hs-bochum.de>
Date: Wed, 16 Dec 2020 18:02:00 +0100
Subject: [PATCH] restructured directories, adapted pult-install
---
lib/pult/.vnc.daemon.swp | Bin 12288 -> 0 bytes
pult-install | 18 +++++++++---------
sbin/pultd | 1 -
{var/www/site => www}/cgi-bin/pult-upload.cgi | 0
{var/www/site => www}/cgi-bin/pult.cgi | 0
{novnc/app => www/cvh-camera}/adapter.min.js | 0
.../cvh-camera/camera-receiver.css | 0
.../cvh-camera/camera-receiver.html | 0
.../cvh-camera/camera-receiver.js.in | 0
.../site => www}/cvh-camera/camera-sender.css | 0
.../cvh-camera/camera-sender.html | 0
.../cvh-camera/camera-sender.js.in | 0
{novnc/app => www/cvh-camera}/janus.js | 0
.../www/site => www}/cvh-camera/warning.js.in | 0
.../novnc/app}/adapter.min.js | 0
.../novnc}/app/camera-receiver.js.in | 0
.../cvh-camera => www/novnc/app}/janus.js | 0
{novnc => www/novnc}/app/socket.io.js | 0
.../novnc}/app/styles/camera-receiver.css | 0
{novnc => www/novnc}/core/display.js | 0
{novnc => www/novnc}/vnc.html | 0
{var/www/site => www}/pult/pointer.png | Bin
.../site => www}/pult/pult-logo-192x74.png | Bin
.../site => www}/pult/stylesheets/default.css | 0
{var/www/site => www}/vnc/index.html | 0
...hschule-bochum-cvh-vertikal-v2-128x205.png | Bin
.../site => www}/vnc/stylesheets/default.css | 0
27 files changed, 9 insertions(+), 10 deletions(-)
delete mode 100644 lib/pult/.vnc.daemon.swp
delete mode 120000 sbin/pultd
rename {var/www/site => www}/cgi-bin/pult-upload.cgi (100%)
rename {var/www/site => www}/cgi-bin/pult.cgi (100%)
rename {novnc/app => www/cvh-camera}/adapter.min.js (100%)
rename {var/www/site => www}/cvh-camera/camera-receiver.css (100%)
rename {var/www/site => www}/cvh-camera/camera-receiver.html (100%)
rename {var/www/site => www}/cvh-camera/camera-receiver.js.in (100%)
rename {var/www/site => www}/cvh-camera/camera-sender.css (100%)
rename {var/www/site => www}/cvh-camera/camera-sender.html (100%)
rename {var/www/site => www}/cvh-camera/camera-sender.js.in (100%)
rename {novnc/app => www/cvh-camera}/janus.js (100%)
rename {var/www/site => www}/cvh-camera/warning.js.in (100%)
rename {var/www/site/cvh-camera => www/novnc/app}/adapter.min.js (100%)
rename {novnc => www/novnc}/app/camera-receiver.js.in (100%)
rename {var/www/site/cvh-camera => www/novnc/app}/janus.js (100%)
rename {novnc => www/novnc}/app/socket.io.js (100%)
rename {novnc => www/novnc}/app/styles/camera-receiver.css (100%)
rename {novnc => www/novnc}/core/display.js (100%)
rename {novnc => www/novnc}/vnc.html (100%)
rename {var/www/site => www}/pult/pointer.png (100%)
rename {var/www/site => www}/pult/pult-logo-192x74.png (100%)
rename {var/www/site => www}/pult/stylesheets/default.css (100%)
rename {var/www/site => www}/vnc/index.html (100%)
rename {var/www/site => www}/vnc/logo-hochschule-bochum-cvh-vertikal-v2-128x205.png (100%)
rename {var/www/site => www}/vnc/stylesheets/default.css (100%)
diff --git a/lib/pult/.vnc.daemon.swp b/lib/pult/.vnc.daemon.swp
deleted file mode 100644
index c6bd768033383020c2a3be5d3197b39ef06aef5e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 12288
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
HID-KIsld2(
diff --git a/pult-install b/pult-install
index bc9b1e0..0b99174 100755
--- a/pult-install
+++ b/pult-install
@@ -65,13 +65,13 @@ for file in pult pult-upload; do
)
done
-$install -o root -g root -m 644 var/www/site/pult/*.png "$www_directory/pult/"
-$install -o root -g root -m 644 var/www/site/pult/stylesheets/default.css "$www_directory/pult/stylesheets/"
-$install -o root -g root -m 644 var/www/site/cvh-camera/* "$www_directory/cvh-camera/"
-$install -o root -g root -m 644 novnc/vnc.html "$novnc_directory/"
-$install -o root -g root -m 644 novnc/core/*.js "$novnc_directory/core/"
-$install -o root -g root -m 644 novnc/app/*.js "$novnc_directory/app/"
-$install -o root -g root -m 644 novnc/app/styles/*.css "$novnc_directory/app/styles/"
+$install -o root -g root -m 644 www/pult/*.png "$www_directory/pult/"
+$install -o root -g root -m 644 www/pult/stylesheets/default.css "$www_directory/pult/stylesheets/"
+$install -o root -g root -m 644 www/cvh-camera/* "$www_directory/cvh-camera/"
+$install -o root -g root -m 644 www/novnc/vnc.html "$novnc_directory/"
+$install -o root -g root -m 644 www/novnc/core/*.js "$novnc_directory/core/"
+$install -o root -g root -m 644 www/novnc/app/*.js "$novnc_directory/app/"
+$install -o root -g root -m 644 www/novnc/app/styles/*.css "$novnc_directory/app/styles/"
$install -o root -g root -m 644 etc/systemd/system/* /etc/systemd/system/
install_directory "$www_directory/pult-upload" www-data.pult 6575
@@ -83,9 +83,9 @@ cat << EOF
Please install manually:
- etc/nginx/sites-available/fragment.conf in your nginx configuration
- etc/janus/janus.plugin.videoroom.jcfg.fragment in your janus configuration
- - var/www/site/vnc as your VNC channel web page
+ - www/vnc as your VNC channel web page
- adapt cvh-camera-update-credentials to your www directory,
and add a cron job to execute it periodically, for instance:
- */15 * * * * $sbin_directory/cvh-camera-update-credentials
+ 42 * * * * $sbin_directory/cvh-camera-update-credentials
- activate and enable the services in /etc/systemd/system
EOF
diff --git a/sbin/pultd b/sbin/pultd
deleted file mode 120000
index 31be300..0000000
--- a/sbin/pultd
+++ /dev/null
@@ -1 +0,0 @@
-../lib/pult/pult.daemon
\ No newline at end of file
diff --git a/var/www/site/cgi-bin/pult-upload.cgi b/www/cgi-bin/pult-upload.cgi
similarity index 100%
rename from var/www/site/cgi-bin/pult-upload.cgi
rename to www/cgi-bin/pult-upload.cgi
diff --git a/var/www/site/cgi-bin/pult.cgi b/www/cgi-bin/pult.cgi
similarity index 100%
rename from var/www/site/cgi-bin/pult.cgi
rename to www/cgi-bin/pult.cgi
diff --git a/novnc/app/adapter.min.js b/www/cvh-camera/adapter.min.js
similarity index 100%
rename from novnc/app/adapter.min.js
rename to www/cvh-camera/adapter.min.js
diff --git a/var/www/site/cvh-camera/camera-receiver.css b/www/cvh-camera/camera-receiver.css
similarity index 100%
rename from var/www/site/cvh-camera/camera-receiver.css
rename to www/cvh-camera/camera-receiver.css
diff --git a/var/www/site/cvh-camera/camera-receiver.html b/www/cvh-camera/camera-receiver.html
similarity index 100%
rename from var/www/site/cvh-camera/camera-receiver.html
rename to www/cvh-camera/camera-receiver.html
diff --git a/var/www/site/cvh-camera/camera-receiver.js.in b/www/cvh-camera/camera-receiver.js.in
similarity index 100%
rename from var/www/site/cvh-camera/camera-receiver.js.in
rename to www/cvh-camera/camera-receiver.js.in
diff --git a/var/www/site/cvh-camera/camera-sender.css b/www/cvh-camera/camera-sender.css
similarity index 100%
rename from var/www/site/cvh-camera/camera-sender.css
rename to www/cvh-camera/camera-sender.css
diff --git a/var/www/site/cvh-camera/camera-sender.html b/www/cvh-camera/camera-sender.html
similarity index 100%
rename from var/www/site/cvh-camera/camera-sender.html
rename to www/cvh-camera/camera-sender.html
diff --git a/var/www/site/cvh-camera/camera-sender.js.in b/www/cvh-camera/camera-sender.js.in
similarity index 100%
rename from var/www/site/cvh-camera/camera-sender.js.in
rename to www/cvh-camera/camera-sender.js.in
diff --git a/novnc/app/janus.js b/www/cvh-camera/janus.js
similarity index 100%
rename from novnc/app/janus.js
rename to www/cvh-camera/janus.js
diff --git a/var/www/site/cvh-camera/warning.js.in b/www/cvh-camera/warning.js.in
similarity index 100%
rename from var/www/site/cvh-camera/warning.js.in
rename to www/cvh-camera/warning.js.in
diff --git a/var/www/site/cvh-camera/adapter.min.js b/www/novnc/app/adapter.min.js
similarity index 100%
rename from var/www/site/cvh-camera/adapter.min.js
rename to www/novnc/app/adapter.min.js
diff --git a/novnc/app/camera-receiver.js.in b/www/novnc/app/camera-receiver.js.in
similarity index 100%
rename from novnc/app/camera-receiver.js.in
rename to www/novnc/app/camera-receiver.js.in
diff --git a/var/www/site/cvh-camera/janus.js b/www/novnc/app/janus.js
similarity index 100%
rename from var/www/site/cvh-camera/janus.js
rename to www/novnc/app/janus.js
diff --git a/novnc/app/socket.io.js b/www/novnc/app/socket.io.js
similarity index 100%
rename from novnc/app/socket.io.js
rename to www/novnc/app/socket.io.js
diff --git a/novnc/app/styles/camera-receiver.css b/www/novnc/app/styles/camera-receiver.css
similarity index 100%
rename from novnc/app/styles/camera-receiver.css
rename to www/novnc/app/styles/camera-receiver.css
diff --git a/novnc/core/display.js b/www/novnc/core/display.js
similarity index 100%
rename from novnc/core/display.js
rename to www/novnc/core/display.js
diff --git a/novnc/vnc.html b/www/novnc/vnc.html
similarity index 100%
rename from novnc/vnc.html
rename to www/novnc/vnc.html
diff --git a/var/www/site/pult/pointer.png b/www/pult/pointer.png
similarity index 100%
rename from var/www/site/pult/pointer.png
rename to www/pult/pointer.png
diff --git a/var/www/site/pult/pult-logo-192x74.png b/www/pult/pult-logo-192x74.png
similarity index 100%
rename from var/www/site/pult/pult-logo-192x74.png
rename to www/pult/pult-logo-192x74.png
diff --git a/var/www/site/pult/stylesheets/default.css b/www/pult/stylesheets/default.css
similarity index 100%
rename from var/www/site/pult/stylesheets/default.css
rename to www/pult/stylesheets/default.css
diff --git a/var/www/site/vnc/index.html b/www/vnc/index.html
similarity index 100%
rename from var/www/site/vnc/index.html
rename to www/vnc/index.html
diff --git a/var/www/site/vnc/logo-hochschule-bochum-cvh-vertikal-v2-128x205.png b/www/vnc/logo-hochschule-bochum-cvh-vertikal-v2-128x205.png
similarity index 100%
rename from var/www/site/vnc/logo-hochschule-bochum-cvh-vertikal-v2-128x205.png
rename to www/vnc/logo-hochschule-bochum-cvh-vertikal-v2-128x205.png
diff --git a/var/www/site/vnc/stylesheets/default.css b/www/vnc/stylesheets/default.css
similarity index 100%
rename from var/www/site/vnc/stylesheets/default.css
rename to www/vnc/stylesheets/default.css
--
GitLab