diff --git a/.gitignore b/.gitignore index c160f00..247e1b4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ custom.env docker-compose.yml +docker-compose.*.gen diff --git a/aria2/aria2.run b/aria2/aria2.run index 5caeac8..ee553bd 100755 --- a/aria2/aria2.run +++ b/aria2/aria2.run @@ -6,7 +6,7 @@ umask 002 TEMP_PATH="/etc/aria2/aria2.conf.template" CONF_PATH="/etc/aria2/aria2.conf" SESSION_PATH="/var/aria2/aria2.session" -TRACKERS_URL="https://cdn.jsdelivr.net/gh/ngosang/trackerslist@master/trackers_best_ip.txt" +TRACKERS_URL="https://gitee.com/nhdxxwg233/trackerslist/raw/master/trackers_best_ip.txt" touch "$SESSION_PATH" if ! aria2c -d /tmp ${TRACKERS_URL} >/dev/null 2>&1; then diff --git a/caddy/Caddyfile b/caddy/Caddyfile new file mode 100644 index 0000000..44f71dc --- /dev/null +++ b/caddy/Caddyfile @@ -0,0 +1,54 @@ +{ + auto_https off +} + +http://lanhost.top, http://nas.lanhost.top, http://www.lanhost.top { + root * /srv/http/www + file_server { + index lanhost.html + } +} + +http://nas.sigkill.top { + root * /srv/http/www + file_server { + index sigkill.html + } +} + +http://ad.lanhost.top { + reverse_proxy http://adguard + reverse_proxy /admin http://adguard:3000 +} + +http://admin.lanhost.top { + reverse_proxy http://portainer:9000 +} + +http://aria2.lanhost.top, http://aria2.sigkill.top { + root * /srv/http/aria2 + file_server { + index index.html + } + reverse_proxy /public http://aria2-public:6800 { + rewrite /jsonrpc + } + reverse_proxy /tmp http://aria2-tmp:6800 { + rewrite /jsonrpc + } +} + +http://motd.lanhost.top, http://motd.sigkill.top { + root * /srv/http/motd + file_server / { + index index + } +} + +http://files.lanhost.top { + reverse_proxy http://files +} + +http://media.lanhost.top { + reverse_proxy http://172.16.10.1:8096 +} diff --git a/caddy/Dockerfile b/caddy/Dockerfile new file mode 100644 index 0000000..d304283 --- /dev/null +++ b/caddy/Dockerfile @@ -0,0 +1,12 @@ +ARG CADDY_VERSION=2 +FROM caddy:${CADDY_VERSION}-alpine + +COPY Caddyfile /etc/caddy/ +COPY http/ /srv/http/ + +#COPY php-fpm/www.conf /etc/php81/php-fpm.d/ +#COPY php-fpm/php.ini /etc/php81/ + +VOLUME ["/srv/http"] + +#ENTRYPOINT ["caddy.run"] diff --git a/nginx/nginx/srv/http/aria2/README.md b/caddy/http/aria2/README.md similarity index 100% rename from nginx/nginx/srv/http/aria2/README.md rename to caddy/http/aria2/README.md diff --git a/nginx/nginx/srv/http/aria2/css/bootstrap-responsive.min.css b/caddy/http/aria2/css/bootstrap-responsive.min.css similarity index 100% rename from nginx/nginx/srv/http/aria2/css/bootstrap-responsive.min.css rename to caddy/http/aria2/css/bootstrap-responsive.min.css diff --git a/nginx/nginx/srv/http/aria2/css/bootstrap.min.css b/caddy/http/aria2/css/bootstrap.min.css similarity index 100% rename from nginx/nginx/srv/http/aria2/css/bootstrap.min.css rename to caddy/http/aria2/css/bootstrap.min.css diff --git a/nginx/nginx/srv/http/aria2/css/main.css b/caddy/http/aria2/css/main.css similarity index 100% rename from nginx/nginx/srv/http/aria2/css/main.css rename to caddy/http/aria2/css/main.css diff --git a/nginx/nginx/srv/http/aria2/img/favicon.ico b/caddy/http/aria2/img/favicon.ico similarity index 100% rename from nginx/nginx/srv/http/aria2/img/favicon.ico rename to caddy/http/aria2/img/favicon.ico diff --git a/nginx/nginx/srv/http/aria2/img/glyphicons-halflings-white.png b/caddy/http/aria2/img/glyphicons-halflings-white.png similarity index 100% rename from nginx/nginx/srv/http/aria2/img/glyphicons-halflings-white.png rename to caddy/http/aria2/img/glyphicons-halflings-white.png diff --git a/nginx/nginx/srv/http/aria2/img/glyphicons-halflings.png b/caddy/http/aria2/img/glyphicons-halflings.png similarity index 100% rename from nginx/nginx/srv/http/aria2/img/glyphicons-halflings.png rename to caddy/http/aria2/img/glyphicons-halflings.png diff --git a/nginx/nginx/srv/http/aria2/index.html b/caddy/http/aria2/index.html similarity index 100% rename from nginx/nginx/srv/http/aria2/index.html rename to caddy/http/aria2/index.html diff --git a/nginx/nginx/srv/http/aria2/js/aria2.js b/caddy/http/aria2/js/aria2.js similarity index 100% rename from nginx/nginx/srv/http/aria2/js/aria2.js rename to caddy/http/aria2/js/aria2.js diff --git a/nginx/nginx/srv/http/aria2/js/bootstrap.min.js b/caddy/http/aria2/js/bootstrap.min.js similarity index 100% rename from nginx/nginx/srv/http/aria2/js/bootstrap.min.js rename to caddy/http/aria2/js/bootstrap.min.js diff --git a/nginx/nginx/srv/http/aria2/js/jquery-1.7.2.min.js b/caddy/http/aria2/js/jquery-1.7.2.min.js similarity index 100% rename from nginx/nginx/srv/http/aria2/js/jquery-1.7.2.min.js rename to caddy/http/aria2/js/jquery-1.7.2.min.js diff --git a/nginx/nginx/srv/http/aria2/js/jquery.Storage.js b/caddy/http/aria2/js/jquery.Storage.js similarity index 100% rename from nginx/nginx/srv/http/aria2/js/jquery.Storage.js rename to caddy/http/aria2/js/jquery.Storage.js diff --git a/nginx/nginx/srv/http/aria2/js/jquery.base64.min.js b/caddy/http/aria2/js/jquery.base64.min.js similarity index 100% rename from nginx/nginx/srv/http/aria2/js/jquery.base64.min.js rename to caddy/http/aria2/js/jquery.base64.min.js diff --git a/nginx/nginx/srv/http/aria2/js/jquery.jsonrpc.js b/caddy/http/aria2/js/jquery.jsonrpc.js similarity index 100% rename from nginx/nginx/srv/http/aria2/js/jquery.jsonrpc.js rename to caddy/http/aria2/js/jquery.jsonrpc.js diff --git a/nginx/nginx/srv/http/aria2/js/mustache.js b/caddy/http/aria2/js/mustache.js similarity index 100% rename from nginx/nginx/srv/http/aria2/js/mustache.js rename to caddy/http/aria2/js/mustache.js diff --git a/nginx/nginx/srv/http/aria2/js/peerid.js b/caddy/http/aria2/js/peerid.js similarity index 100% rename from nginx/nginx/srv/http/aria2/js/peerid.js rename to caddy/http/aria2/js/peerid.js diff --git a/nginx/nginx/srv/http/aria2/js/yaaw.js b/caddy/http/aria2/js/yaaw.js similarity index 100% rename from nginx/nginx/srv/http/aria2/js/yaaw.js rename to caddy/http/aria2/js/yaaw.js diff --git a/nginx/nginx/srv/http/aria2/offline.appcache b/caddy/http/aria2/offline.appcache similarity index 100% rename from nginx/nginx/srv/http/aria2/offline.appcache rename to caddy/http/aria2/offline.appcache diff --git a/nginx/nginx/srv/http/speed/.github/ISSUE_TEMPLATE/bug_report.md b/caddy/http/speed/.github/ISSUE_TEMPLATE/bug_report.md similarity index 100% rename from nginx/nginx/srv/http/speed/.github/ISSUE_TEMPLATE/bug_report.md rename to caddy/http/speed/.github/ISSUE_TEMPLATE/bug_report.md diff --git a/nginx/nginx/srv/http/speed/.github/ISSUE_TEMPLATE/feature_request.md b/caddy/http/speed/.github/ISSUE_TEMPLATE/feature_request.md similarity index 100% rename from nginx/nginx/srv/http/speed/.github/ISSUE_TEMPLATE/feature_request.md rename to caddy/http/speed/.github/ISSUE_TEMPLATE/feature_request.md diff --git a/nginx/nginx/srv/http/speed/.gitignore b/caddy/http/speed/.gitignore similarity index 100% rename from nginx/nginx/srv/http/speed/.gitignore rename to caddy/http/speed/.gitignore diff --git a/nginx/nginx/srv/http/speed/.logo/LibreSpeed.ai b/caddy/http/speed/.logo/LibreSpeed.ai similarity index 100% rename from nginx/nginx/srv/http/speed/.logo/LibreSpeed.ai rename to caddy/http/speed/.logo/LibreSpeed.ai diff --git a/nginx/nginx/srv/http/speed/.logo/LibreSpeed.svg b/caddy/http/speed/.logo/LibreSpeed.svg similarity index 100% rename from nginx/nginx/srv/http/speed/.logo/LibreSpeed.svg rename to caddy/http/speed/.logo/LibreSpeed.svg diff --git a/nginx/nginx/srv/http/speed/.logo/icon_huge.png b/caddy/http/speed/.logo/icon_huge.png similarity index 100% rename from nginx/nginx/srv/http/speed/.logo/icon_huge.png rename to caddy/http/speed/.logo/icon_huge.png diff --git a/nginx/nginx/srv/http/speed/.logo/logo2.png b/caddy/http/speed/.logo/logo2.png similarity index 100% rename from nginx/nginx/srv/http/speed/.logo/logo2.png rename to caddy/http/speed/.logo/logo2.png diff --git a/nginx/nginx/srv/http/speed/.logo/logo3.png b/caddy/http/speed/.logo/logo3.png similarity index 100% rename from nginx/nginx/srv/http/speed/.logo/logo3.png rename to caddy/http/speed/.logo/logo3.png diff --git a/nginx/nginx/srv/http/speed/backend/empty.php b/caddy/http/speed/backend/empty.php similarity index 100% rename from nginx/nginx/srv/http/speed/backend/empty.php rename to caddy/http/speed/backend/empty.php diff --git a/nginx/nginx/srv/http/speed/backend/garbage.php b/caddy/http/speed/backend/garbage.php similarity index 100% rename from nginx/nginx/srv/http/speed/backend/garbage.php rename to caddy/http/speed/backend/garbage.php diff --git a/nginx/nginx/srv/http/speed/backend/getIP.php b/caddy/http/speed/backend/getIP.php similarity index 100% rename from nginx/nginx/srv/http/speed/backend/getIP.php rename to caddy/http/speed/backend/getIP.php diff --git a/nginx/nginx/srv/http/speed/backend/getIP_ipInfo_apikey.php b/caddy/http/speed/backend/getIP_ipInfo_apikey.php similarity index 100% rename from nginx/nginx/srv/http/speed/backend/getIP_ipInfo_apikey.php rename to caddy/http/speed/backend/getIP_ipInfo_apikey.php diff --git a/nginx/nginx/srv/http/speed/basic.html b/caddy/http/speed/basic.html similarity index 100% rename from nginx/nginx/srv/http/speed/basic.html rename to caddy/http/speed/basic.html diff --git a/nginx/nginx/srv/http/speed/chart.html b/caddy/http/speed/chart.html similarity index 100% rename from nginx/nginx/srv/http/speed/chart.html rename to caddy/http/speed/chart.html diff --git a/nginx/nginx/srv/http/speed/customSettings.html b/caddy/http/speed/customSettings.html similarity index 100% rename from nginx/nginx/srv/http/speed/customSettings.html rename to caddy/http/speed/customSettings.html diff --git a/nginx/nginx/srv/http/speed/full.html b/caddy/http/speed/full.html similarity index 100% rename from nginx/nginx/srv/http/speed/full.html rename to caddy/http/speed/full.html diff --git a/nginx/nginx/srv/http/speed/gauges.html b/caddy/http/speed/gauges.html similarity index 100% rename from nginx/nginx/srv/http/speed/gauges.html rename to caddy/http/speed/gauges.html diff --git a/nginx/nginx/srv/http/speed/index.html b/caddy/http/speed/index.html similarity index 100% rename from nginx/nginx/srv/http/speed/index.html rename to caddy/http/speed/index.html diff --git a/nginx/nginx/srv/http/speed/pretty.html b/caddy/http/speed/pretty.html similarity index 100% rename from nginx/nginx/srv/http/speed/pretty.html rename to caddy/http/speed/pretty.html diff --git a/nginx/nginx/srv/http/speed/progressBar.html b/caddy/http/speed/progressBar.html similarity index 100% rename from nginx/nginx/srv/http/speed/progressBar.html rename to caddy/http/speed/progressBar.html diff --git a/nginx/nginx/srv/http/speed/speedtest.js b/caddy/http/speed/speedtest.js similarity index 100% rename from nginx/nginx/srv/http/speed/speedtest.js rename to caddy/http/speed/speedtest.js diff --git a/nginx/nginx/srv/http/speed/speedtest_worker.js b/caddy/http/speed/speedtest_worker.js similarity index 100% rename from nginx/nginx/srv/http/speed/speedtest_worker.js rename to caddy/http/speed/speedtest_worker.js diff --git a/nginx/nginx/srv/http/www/lanhost.html b/caddy/http/www/lanhost.html similarity index 83% rename from nginx/nginx/srv/http/www/lanhost.html rename to caddy/http/www/lanhost.html index b71afb4..018c1a4 100644 --- a/nginx/nginx/srv/http/www/lanhost.html +++ b/caddy/http/www/lanhost.html @@ -25,9 +25,9 @@
Files on smb://NAS64 (protect/public/tmp).
Directories protect/public is on server's hdd.
Directory tmp is in server's memery(6G available).
@@ -35,8 +35,8 @@Aria2(Public) --> Files(Public)
-Aria2(Tmp) --> Files(Tmp)
+Aria2(Public) --> Files(Public)
+Aria2(Tmp) --> Files(Tmp)
Files on smb://NAS64 (protect/public/tmp).
Directories protect/public is on server's hdd.
Directory tmp is in server's memery(6G available).
@@ -35,8 +35,8 @@Aria2(Public) --> Files(Public)
-Aria2(Tmp) --> Files(Tmp)
+Aria2(Public) --> Files(Public)
+Aria2(Tmp) --> Files(Tmp)