diff --git a/lib/pult/.vnc.daemon.swp b/lib/pult/.vnc.daemon.swp deleted file mode 100644 index c6bd768033383020c2a3be5d3197b39ef06aef5e..0000000000000000000000000000000000000000 Binary files a/lib/pult/.vnc.daemon.swp and /dev/null differ diff --git a/pult-install b/pult-install index bc9b1e068baa2c3133f06a6973738b66f9c97a00..0b99174e5a785d2562ed04251eef7334f5d97773 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 31be300e6c890262646374d4ed48bec38d913218..0000000000000000000000000000000000000000 --- 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