From 897d30ba22d1b6e50f1d1fa549ed1b1713368bf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrub=C3=BD?= Date: Mon, 11 Dec 2023 12:00:08 +0100 Subject: [PATCH] add bytesocks --- Dockerfile | 12 ++++++++++-- services/bytesocks/bytesocks-service.conf | 7 +++++++ services/bytesocks/config.json | 4 ++++ services/luckpermsweb/config.json | 2 +- services/nginx/nginx.conf | 22 +++++++++++++++++++++- supervisord.conf | 2 +- 6 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 services/bytesocks/bytesocks-service.conf create mode 100644 services/bytesocks/config.json diff --git a/Dockerfile b/Dockerfile index cab23f8..4e73a6d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.16 # configure supervisord -RUN apk add --update supervisor openjdk17-jdk parallel nginx nodejs npm git && rm -rf /tmp/* /var/cache/apk/* +RUN apk add --update supervisor openjdk17-jdk parallel nginx nodejs npm git maven && rm -rf /tmp/* /var/cache/apk/* ADD supervisord.conf /etc/ #configure bytebin @@ -10,14 +10,22 @@ ADD https://ci.lucko.me/job/bytebin/lastSuccessfulBuild/artifact/target/bytebin. ADD services/bytebin/config.json /opt/bytebin/config.json ADD services/bytebin/bytebin-service.conf /etc/supervisor/conf.d/bytebin-service.conf +#configure bytesocks +RUN mkdir /opt/bytesocks +RUN git clone --recursive https://github.com/lucko/bytesocks.git /tmp/bytesocks +RUN cd /tmp/bytesocks && mvn --no-transfer-progress -B package && cp /tmp/bytesocks/target/bytesocks*.jar /opt/bytesocks/bytesocks.jar && rm -rf /tmp/bytesocks +ADD services/bytesocks/config.json /opt/bytesocks/config.json +ADD services/bytesocks/bytesocks-service.conf /etc/supervisor/conf.d/bytesocks-service.conf + #configure nginx ADD services/nginx/nginx-service.conf /etc/supervisor/conf.d/nginx-service.conf ADD services/nginx/nginx.conf /etc/nginx/http.d/web.conf - +#configure luckperms web RUN git clone --recursive https://github.com/lucko/LuckPermsWeb.git /opt/LuckPermsWeb && rm -rf /opt/LuckPermsWeb/config.json ADD services/luckpermsweb/config.json /opt/LuckPermsWeb/config.json RUN mkdir -p /opt/web && cd /opt/LuckPermsWeb && npm install && npm run build && cp -r dist/* /opt/web && rm -rf /opt/LuckPermsWeb +RUN apk del nodejs npm git maven && rm -rf /tmp/* /var/cache/apk/* ENTRYPOINT ["supervisord", "--nodaemon", "--configuration", "/etc/supervisord.conf"] diff --git a/services/bytesocks/bytesocks-service.conf b/services/bytesocks/bytesocks-service.conf new file mode 100644 index 0000000..759502e --- /dev/null +++ b/services/bytesocks/bytesocks-service.conf @@ -0,0 +1,7 @@ +[program:bytesocks] +command=/usr/bin/java -jar bytesocks.jar +directory=/opt/bytesocks +autostart=true +autorestart=true +stderr_logfile=/var/log/bytesocks.err.log +stdout_logfile=/var/log/bytesocks.out.log \ No newline at end of file diff --git a/services/bytesocks/config.json b/services/bytesocks/config.json new file mode 100644 index 0000000..7728d76 --- /dev/null +++ b/services/bytesocks/config.json @@ -0,0 +1,4 @@ +{ + "host": "127.0.0.1", + "port": 8086 + } \ No newline at end of file diff --git a/services/luckpermsweb/config.json b/services/luckpermsweb/config.json index b25fbc5..cd07af2 100644 --- a/services/luckpermsweb/config.json +++ b/services/luckpermsweb/config.json @@ -1,6 +1,6 @@ { "bytebin_url": "../bytebin/", - "bytesocks_host": "usersockets.luckperms.net", + "bytesocks_host": "../bytesock/", "base": "/", "selfHosted": true, "api_url": "https://metadata.luckperms.net" diff --git a/services/nginx/nginx.conf b/services/nginx/nginx.conf index 6b7ece6..6e72e54 100644 --- a/services/nginx/nginx.conf +++ b/services/nginx/nginx.conf @@ -10,7 +10,7 @@ server { location = /bytebin { - return 302 /luckperms/bytebin/; + return 302 /bytebin/; } location /bytebin/ { @@ -26,4 +26,24 @@ server { proxy_pass http://127.0.0.1:8085/; } + location = /bytesocks { + return 302 /bytesocks/; + } + + location /bytesocks/ { + client_max_body_size 30M; + client_body_timeout 60s; + + proxy_set_header Host $host; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_http_version 1.1; + proxy_redirect http:// https://; + + proxy_pass http://127.0.0.1:8086/; + } + } \ No newline at end of file diff --git a/supervisord.conf b/supervisord.conf index d8f750e..db2ee80 100644 --- a/supervisord.conf +++ b/supervisord.conf @@ -3,7 +3,7 @@ nodaemon=true [program:logging] -command=parallel --tagstring "{}:" --line-buffer tail -f {} ::: /var/log/bytebin.out.log /var/log/nginx/access.log /var/log/nginx/error.log +command=parallel --tagstring "{}:" --line-buffer tail -f {} ::: /var/log/bytebin.out.log /var/log/bytesocks.out.log /var/log/nginx/access.log /var/log/nginx/error.log user=root directory=/root/ priority=40