From 0d2e840d0c9dde319bca8073ef86ac87ed9c0c54 Mon Sep 17 00:00:00 2001 From: TolaMironcenko Date: Fri, 5 Jul 2024 14:43:29 +0700 Subject: [PATCH] added nginx --- auth_service_cpp | 2 +- openrouter/src/openrouter.cpp | 2 +- openrouter/src/web/js/routes.js | 2 +- openrouter/src/web/js/settings/ssh.js | 1 - openrouter/src/web/js/syslog.js | 3 - rootfs/etc/init.d/nginx | 33 +++++++++++ rootfs/etc/rc.d/70telnet | 1 + .../{95openrouterinit => 85openrouterinit} | 0 rootfs/etc/rc.d/95nginx | 1 + rootfs/usr/conf/nginx.conf | 56 +++++++++++++++++++ 10 files changed, 94 insertions(+), 7 deletions(-) create mode 100755 rootfs/etc/init.d/nginx create mode 120000 rootfs/etc/rc.d/70telnet rename rootfs/etc/rc.d/{95openrouterinit => 85openrouterinit} (100%) create mode 120000 rootfs/etc/rc.d/95nginx create mode 100644 rootfs/usr/conf/nginx.conf diff --git a/auth_service_cpp b/auth_service_cpp index fb961af..8abb0a9 160000 --- a/auth_service_cpp +++ b/auth_service_cpp @@ -1 +1 @@ -Subproject commit fb961af71c07f95a38bed13163f3ecda5a1576c0 +Subproject commit 8abb0a901a37ad341104ec018361db315a658680 diff --git a/openrouter/src/openrouter.cpp b/openrouter/src/openrouter.cpp index d8b6ad5..b0b7132 100644 --- a/openrouter/src/openrouter.cpp +++ b/openrouter/src/openrouter.cpp @@ -51,6 +51,6 @@ int main() { << "0.0.0.0" << RESET << ":" << CYAN << "43244" << RESET << " ]" << std::endl; syslog(LOG_INFO, "openrouter administration software started."); - srv.listen("0.0.0.0", 80); + srv.listen("127.0.0.1", 43244); return 0; } diff --git a/openrouter/src/web/js/routes.js b/openrouter/src/web/js/routes.js index c7b7b28..abe0845 100644 --- a/openrouter/src/web/js/routes.js +++ b/openrouter/src/web/js/routes.js @@ -1,4 +1,4 @@ -const authhost = 'http://172.20.10.2:43243' +const authhost = window.location.origin const host = window.location.origin const prefix = 'api' diff --git a/openrouter/src/web/js/settings/ssh.js b/openrouter/src/web/js/settings/ssh.js index 8f170bb..fb25ee1 100644 --- a/openrouter/src/web/js/settings/ssh.js +++ b/openrouter/src/web/js/settings/ssh.js @@ -65,7 +65,6 @@ const get_ssh_keys = () => { method: 'POST', body: `{"token":"${localStorage.getItem("token")}"}` }).then(data => data.json()).then(jsondata => { - console.log(jsondata.keys) sshkeys = jsondata.keys sshkeystablebody.innerHTML = "" for (const key in sshkeys) { diff --git a/openrouter/src/web/js/syslog.js b/openrouter/src/web/js/syslog.js index c043cc1..e824680 100644 --- a/openrouter/src/web/js/syslog.js +++ b/openrouter/src/web/js/syslog.js @@ -7,7 +7,6 @@ let openrouterfilterenable = false let authservicefilerenable = false const get_syslog_data = () => { - console.log("get_syslog_data") fetch(routes.syslog(), { method: 'GET', // body: `{"token":"${localStorage.getItem("token")}"}` @@ -49,7 +48,6 @@ const openrouterfilterfunc = (textdata) => { syslogalldata = syslogalldata.filter(data => { return data.includes("openrouter:") }) - console.log(syslogalldata) syslogdata.innerHTML = "" for (const data in syslogalldata) { syslogdata.innerHTML += syslogalldata[data] + "
" @@ -63,7 +61,6 @@ const authservicefilterfunc = (textdata) => { syslogalldata = syslogalldata.filter(data => { return data.includes("auth_service:") }) - console.log(syslogalldata) syslogdata.innerHTML = "" for (const data in syslogalldata) { syslogdata.innerHTML += syslogalldata[data] + "
" diff --git a/rootfs/etc/init.d/nginx b/rootfs/etc/init.d/nginx new file mode 100755 index 0000000..12b0f43 --- /dev/null +++ b/rootfs/etc/init.d/nginx @@ -0,0 +1,33 @@ +#!/bin/sh +Green='\033[0;32m' +Color_off='\033[0m' +Red='\033[0;31m' + +case "$1" in + start) + printf "Starting nginx " + nginx + if [[ "$?" == "0" ]]; then + printf "[$Green OK $Color_off]\n" + else + printf "[$Red ERR $Color_off]\n" + fi + ;; + stop) + printf "Stopping nginx " + nginx -s stop + if [[ "$?" == "0" ]]; then + printf "[$Green OK $Color_off]\n" + else + printf "[$Red ERR $Color_off]\n" + fi + ;; + restart|reload) + "$0" stop + "$0" start + ;; + *) + echo "nginx init script usage: $0 {start|stop|restart}" + return 1 +esac +return $? diff --git a/rootfs/etc/rc.d/70telnet b/rootfs/etc/rc.d/70telnet new file mode 120000 index 0000000..64788c7 --- /dev/null +++ b/rootfs/etc/rc.d/70telnet @@ -0,0 +1 @@ +../init.d/telnet \ No newline at end of file diff --git a/rootfs/etc/rc.d/95openrouterinit b/rootfs/etc/rc.d/85openrouterinit similarity index 100% rename from rootfs/etc/rc.d/95openrouterinit rename to rootfs/etc/rc.d/85openrouterinit diff --git a/rootfs/etc/rc.d/95nginx b/rootfs/etc/rc.d/95nginx new file mode 120000 index 0000000..16a8734 --- /dev/null +++ b/rootfs/etc/rc.d/95nginx @@ -0,0 +1 @@ +../init.d/nginx \ No newline at end of file diff --git a/rootfs/usr/conf/nginx.conf b/rootfs/usr/conf/nginx.conf new file mode 100644 index 0000000..58c4812 --- /dev/null +++ b/rootfs/usr/conf/nginx.conf @@ -0,0 +1,56 @@ + +#user nobody; +worker_processes 1; + +events { + worker_connections 1024; +} + + +http { + include mime.types; + default_type application/octet-stream; + + sendfile on; + keepalive_timeout 65; + + gzip on; + + server { + listen 80; + server_name localhost; + + + + location / { + proxy_pass http://127.0.0.1:43244; + } + + location /api/settings { + proxy_pass http://127.0.0.1:43244/api/settings; + } + + location /api/syslog { + proxy_pass http://127.0.0.1:43244/api/syslog; + } + + location /api/reboot { + proxy_pass http://127.0.0.1:43244/api/reboot; + } + + location /auth/admin { + proxy_pass http://127.0.0.1:43243/auth/admin; + } + + location /api { + proxy_pass http://127.0.0.1:43243/api; + } + + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root html; + } + + } + +}