From eab1638c96cecd64f27b2219aca4ebbf2f038e8b Mon Sep 17 00:00:00 2001 From: Arthur Lu Date: Tue, 12 Dec 2023 10:14:10 -0800 Subject: [PATCH] move sites to http, add stream proxies --- {sites => http}/default.conf | 0 {sites => http}/gitea.conf | 0 {sites => http}/homepage.conf | 0 {sites => http}/ldap.conf | 0 {sites => http}/mail.conf | 0 {sites => http}/opns.conf | 0 {sites => http}/paas.conf | 0 {sites => http}/pve.conf | 0 {sites => http}/redirect.conf | 0 {sites => http}/root.conf | 0 {sites => http}/status.conf | 0 {sites => http}/wiki.conf | 0 nginx.conf | 12 ++++++++++-- stream/minecraft.conf | 5 +++++ 14 files changed, 15 insertions(+), 2 deletions(-) rename {sites => http}/default.conf (100%) rename {sites => http}/gitea.conf (100%) rename {sites => http}/homepage.conf (100%) rename {sites => http}/ldap.conf (100%) rename {sites => http}/mail.conf (100%) rename {sites => http}/opns.conf (100%) rename {sites => http}/paas.conf (100%) rename {sites => http}/pve.conf (100%) rename {sites => http}/redirect.conf (100%) rename {sites => http}/root.conf (100%) rename {sites => http}/status.conf (100%) rename {sites => http}/wiki.conf (100%) create mode 100644 stream/minecraft.conf diff --git a/sites/default.conf b/http/default.conf similarity index 100% rename from sites/default.conf rename to http/default.conf diff --git a/sites/gitea.conf b/http/gitea.conf similarity index 100% rename from sites/gitea.conf rename to http/gitea.conf diff --git a/sites/homepage.conf b/http/homepage.conf similarity index 100% rename from sites/homepage.conf rename to http/homepage.conf diff --git a/sites/ldap.conf b/http/ldap.conf similarity index 100% rename from sites/ldap.conf rename to http/ldap.conf diff --git a/sites/mail.conf b/http/mail.conf similarity index 100% rename from sites/mail.conf rename to http/mail.conf diff --git a/sites/opns.conf b/http/opns.conf similarity index 100% rename from sites/opns.conf rename to http/opns.conf diff --git a/sites/paas.conf b/http/paas.conf similarity index 100% rename from sites/paas.conf rename to http/paas.conf diff --git a/sites/pve.conf b/http/pve.conf similarity index 100% rename from sites/pve.conf rename to http/pve.conf diff --git a/sites/redirect.conf b/http/redirect.conf similarity index 100% rename from sites/redirect.conf rename to http/redirect.conf diff --git a/sites/root.conf b/http/root.conf similarity index 100% rename from sites/root.conf rename to http/root.conf diff --git a/sites/status.conf b/http/status.conf similarity index 100% rename from sites/status.conf rename to http/status.conf diff --git a/sites/wiki.conf b/http/wiki.conf similarity index 100% rename from sites/wiki.conf rename to http/wiki.conf diff --git a/nginx.conf b/nginx.conf index 26a11b4..75aac7b 100644 --- a/nginx.conf +++ b/nginx.conf @@ -33,6 +33,14 @@ http { # proxy parameters include proxy-params.conf; - # include sites - include sites/*; + # include http + include http/*.conf; } +stream { + # logging + access_log access.log; + error_log error.log; + + # include stream + include stream/*.conf; +} \ No newline at end of file diff --git a/stream/minecraft.conf b/stream/minecraft.conf new file mode 100644 index 0000000..3c3aa81 --- /dev/null +++ b/stream/minecraft.conf @@ -0,0 +1,5 @@ +server { + listen 25565 reuseport; + proxy_timeout 30s; + proxy_pass minecraft.root; +} \ No newline at end of file