diff --git a/etc_janus_janus.plugin.streaming.jcfg b/janus/etc_janus_janus.plugin.streaming.jcfg similarity index 100% rename from etc_janus_janus.plugin.streaming.jcfg rename to janus/etc_janus_janus.plugin.streaming.jcfg diff --git a/galbot_nginx.conf b/nginx/galbot_nginx.conf similarity index 100% rename from galbot_nginx.conf rename to nginx/galbot_nginx.conf diff --git a/nu_century_gothic.ttf b/nu_century_gothic.ttf deleted file mode 100644 index 879704e..0000000 Binary files a/nu_century_gothic.ttf and /dev/null differ diff --git a/galbot.service b/systemd/galbot.service similarity index 100% rename from galbot.service rename to systemd/galbot.service diff --git a/systemd/tunel-http.service b/systemd/tunel-http.service new file mode 100644 index 0000000..1015903 --- /dev/null +++ b/systemd/tunel-http.service @@ -0,0 +1,15 @@ +[Unit] +Description=HTTP tunel +After=network.target + +[Service] +# Tuneliraj lokalni port 22 na streznikov port 2222 +User=g1smo +RemainAfterExit=yes +EnvironmentFile=/etc/default/galbot +ExecStart=/usr/bin/ssh -nNT -o ServerAliveInterval=60 -o ExitOnForwardFailure=yes -R 8989:localhost:80 ${REMOTEUSER}@${REMOTEHOST} +RestartSec=5 +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/systemd/tunel-janus.service b/systemd/tunel-janus.service new file mode 100644 index 0000000..33cfa0d --- /dev/null +++ b/systemd/tunel-janus.service @@ -0,0 +1,15 @@ +[Unit] +Description=Janus tunel +After=network.target + +[Service] +# Tuneliraj lokalni port 22 na streznikov port 2222 +User=g1smo +RemainAfterExit=yes +EnvironmentFile=/etc/default/galbot +ExecStart=/usr/bin/ssh -nNT -o ServerAliveInterval=60 -o ExitOnForwardFailure=yes -R 8188:localhost:8188 ${REMOTEUSER}@${REMOTEHOST} +RestartSec=5 +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/systemd/tunel-ssh.service b/systemd/tunel-ssh.service new file mode 100644 index 0000000..bb2b0e5 --- /dev/null +++ b/systemd/tunel-ssh.service @@ -0,0 +1,16 @@ +[Unit] +Description=SSH tunel +After=network.target + +[Service] +# Tuneliraj lokalni port 22 na streznikov port 2222 +User=g1smo +RemainAfterExit=yes +EnvironmentFile=/etc/default/galbot +#ExecStart=/usr/bin/autossh -M 20000 -nNT -o ServerAliveInterval=60 -o ExitOnForwardFailure=yes -R 2222:localhost:22 ${REMOTEUSER}@${REMOTEHOST} +ExecStart=/usr/bin/ssh -nNT -o ServerAliveInterval=60 -o ExitOnForwardFailure=yes -R 2222:localhost:22 ${REMOTEUSER}@${REMOTEHOST} +RestartSec=5 +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/systemd/tunel-ssh.service.bak b/systemd/tunel-ssh.service.bak new file mode 100644 index 0000000..68d9203 --- /dev/null +++ b/systemd/tunel-ssh.service.bak @@ -0,0 +1,13 @@ +[Unit] +Description=SSH tunel +After=network.target + +[Service] +# Tuneliraj lokalni port 22 na streznikov port 2222 +EnvironmentFile=/etc/default/galbot" +ExecStart=/usr/bin/ssh -NT -o ServerAliveInterval=60 -o ExitOnForwardFailure=yes -R 2222:localhost:22 ${REMOTEUSER}@${REMOTEHOST} +RestartSec=5 +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/Config_tasmota_F0D5C8_5576_12.4.0.3.dmp b/tasmota/Config_tasmota_F0D5C8_5576_12.4.0.3.dmp similarity index 100% rename from Config_tasmota_F0D5C8_5576_12.4.0.3.dmp rename to tasmota/Config_tasmota_F0D5C8_5576_12.4.0.3.dmp diff --git a/autoexec.be b/tasmota/autoexec.be similarity index 100% rename from autoexec.be rename to tasmota/autoexec.be diff --git a/ustvari_wifi.sh b/ustvari_wifi.sh deleted file mode 100755 index 2ab8b24..0000000 --- a/ustvari_wifi.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -create_ap wlan0 eth0 GalBotNet spustimenotzeno --country SI --freq-band 2.4 diff --git a/www/favicon.ico b/www/favicon.ico new file mode 100644 index 0000000..ccbf5bf Binary files /dev/null and b/www/favicon.ico differ diff --git a/CenturyGothic.ttf b/www/font/CenturyGothic.ttf similarity index 100% rename from CenturyGothic.ttf rename to www/font/CenturyGothic.ttf diff --git a/index.html b/www/index.html similarity index 78% rename from index.html rename to www/index.html index 8659573..6dc70e7 100644 --- a/index.html +++ b/www/index.html @@ -8,11 +8,11 @@ Galerija BOT - - - - - + + + + + diff --git a/propeliraj.js b/www/js/propeliraj.js similarity index 100% rename from propeliraj.js rename to www/js/propeliraj.js diff --git a/script-janus.js b/www/js/script-janus.js similarity index 100% rename from script-janus.js rename to www/js/script-janus.js diff --git a/settings.js.primer b/www/js/settings.js.primer similarity index 100% rename from settings.js.primer rename to www/js/settings.js.primer diff --git a/streaming.js b/www/js/streaming.js similarity index 100% rename from streaming.js rename to www/js/streaming.js diff --git a/webrtc-adapter.min.js b/www/js/webrtc-adapter.min.js similarity index 100% rename from webrtc-adapter.min.js rename to www/js/webrtc-adapter.min.js diff --git a/desno.svg b/www/slike/desno.svg similarity index 100% rename from desno.svg rename to www/slike/desno.svg diff --git a/gor.svg b/www/slike/gor.svg similarity index 100% rename from gor.svg rename to www/slike/gor.svg diff --git a/stil.css b/www/stil.css similarity index 90% rename from stil.css rename to www/stil.css index 442a2fe..898ad12 100644 --- a/stil.css +++ b/www/stil.css @@ -1,6 +1,6 @@ @font-face { font-family: CenturyGothic; - src: url("CenturyGothic.ttf") format("truetype"); + src: url("../font/CenturyGothic.ttf") format("truetype"); } body { @@ -16,16 +16,15 @@ body { h1, h2 { display: inline; + font-weight: normal; } h1 { font-size: 2.5rem; margin-right: .4rem; - font-weight: normal; } h2 { font-size: .8rem; - font-weight: normal; word-spacing: 1px; } @@ -144,35 +143,28 @@ button[disabled] { right: 0; background-size: contain; background-repeat: no-repeat; -} -#levo:before, -#desno:before, -#ravno:before { width: 80%; height: 80%; left: 10%; - top: 10%; } -#levo:before, -#desno:before { - top: 20%; -} #ravno:before { - background-image: url(gor.svg); + background-image: url(slike/gor.svg); width: 65%; height: 65%; top: 17.5%; left: 17.5%; } + +#desno:before, #levo:before { - background-image: url(desno.svg); - transform: scaleX(-1); + top: 20%; + background-image: url(slike/desno.svg); } -#desno:before { - background-image: url(desno.svg); +#levo:before { + transform: scaleX(-1); } .predvajam .gumbi {