From 7b44a7bf6ea65278ba79e9a0c9df848b8bc1a082 Mon Sep 17 00:00:00 2001 From: "cn.yimian.xyz" Date: Thu, 20 Aug 2020 18:39:49 +0800 Subject: [PATCH 1/4] add guide --- .../nginx/conf.d/guide.yimian.xyz.conf | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 cn.yimian.xyz/nginx/conf.d/guide.yimian.xyz.conf diff --git a/cn.yimian.xyz/nginx/conf.d/guide.yimian.xyz.conf b/cn.yimian.xyz/nginx/conf.d/guide.yimian.xyz.conf new file mode 100644 index 0000000..f4c2c69 --- /dev/null +++ b/cn.yimian.xyz/nginx/conf.d/guide.yimian.xyz.conf @@ -0,0 +1,34 @@ +server { + listen 80; + #listen [::]:80; + server_name guide.yimian.xyz; + rewrite ^(.*)$ https://$host$1 permanent; +} + + +server { + # listen 80; + # listen [::]:80; + listen 443 ssl; + + server_name guide.yimian.xyz; + root /home/www/guide; + index index.php index.html; + client_max_body_size 50m; + + ssl_certificate /mnt/config/ssl/yimian.xyz/yimian.xyz.crt; #2 + ssl_certificate_key /mnt/config/ssl/yimian.xyz/yimian.xyz.key; #3 + + ssl_session_cache shared:SSL:1m; + ssl_session_timeout 5m; + ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4; + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ssl_prefer_server_ciphers on; + # error_page 404 = /404.php; + + # Load configuration files for the default server block. + include /mnt/etc/common/nginx/default.d/*.conf; + + location / { + } +} From bf3d62fad7eadb168d6a7481bd1c2104866d8aaf Mon Sep 17 00:00:00 2001 From: "cn.yimian.xyz" Date: Thu, 20 Aug 2020 18:45:10 +0800 Subject: [PATCH 2/4] img --- ...yimian.xyz.conf.dead => img.yimian.xyz.conf} | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) rename cn.yimian.xyz/nginx/conf.d/{img.yimian.xyz.conf.dead => img.yimian.xyz.conf} (70%) diff --git a/cn.yimian.xyz/nginx/conf.d/img.yimian.xyz.conf.dead b/cn.yimian.xyz/nginx/conf.d/img.yimian.xyz.conf similarity index 70% rename from cn.yimian.xyz/nginx/conf.d/img.yimian.xyz.conf.dead rename to cn.yimian.xyz/nginx/conf.d/img.yimian.xyz.conf index e73edbf..0abd376 100644 --- a/cn.yimian.xyz/nginx/conf.d/img.yimian.xyz.conf.dead +++ b/cn.yimian.xyz/nginx/conf.d/img.yimian.xyz.conf @@ -12,7 +12,7 @@ server { listen 443 ssl; server_name img.yimian.xyz; - root /home/www/img; + root /home/www/img/; index index.php index.html; ssl_certificate /mnt/config/ssl/yimian.xyz/yimian.xyz.crt; #2 @@ -25,17 +25,10 @@ server { ssl_prefer_server_ciphers on; # error_page 404 = /404.php; - location / { - if (-f $request_filename/index.html){ - rewrite (.*) $1/index.html break; - } - if (-f $request_filename/index.php){ - rewrite (.*) $1/index.php; - } - if (!-f $request_filename){ - rewrite (.*) /index.php; - } - } + if (-f $request_filename/index.html){ rewrite (.*) $1/index.html break; } + if (-f $request_filename/index.php){ rewrite (.*) $1/index.php; } + if (!-f $request_filename){ rewrite (.*) /index.php; } + if (!-e $request_filename) { rewrite ^(.*)$ /index.php$1 last; } # Load configuration files for the default server block. include /mnt/etc/common/nginx/default.d/*.conf; From 2b2a1ce2fa889a7c351b266120bc6eaa32a316ec Mon Sep 17 00:00:00 2001 From: "cn.yimian.xyz" Date: Sat, 22 Aug 2020 19:07:22 +0800 Subject: [PATCH 3/4] cp-acc --- .../nginx/conf.d/cp-acc.yimian.xyz.conf | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 cn.yimian.xyz/nginx/conf.d/cp-acc.yimian.xyz.conf diff --git a/cn.yimian.xyz/nginx/conf.d/cp-acc.yimian.xyz.conf b/cn.yimian.xyz/nginx/conf.d/cp-acc.yimian.xyz.conf new file mode 100644 index 0000000..84b7d24 --- /dev/null +++ b/cn.yimian.xyz/nginx/conf.d/cp-acc.yimian.xyz.conf @@ -0,0 +1,40 @@ +server { + listen 80; + #listen [::]:80; + server_name cp-acc.yimian.xyz; + rewrite ^(.*)$ https://$host$1 permanent; +} + + +server { + # listen 80; + # listen [::]:80; + listen 443 ssl; + + server_name cp-acc.yimian.xyz; + root /home/www/cp-acc; + index index.php index.html; + + ssl_certificate /mnt/config/ssl/yimian.xyz/yimian.xyz.crt; #2 + ssl_certificate_key /mnt/config/ssl/yimian.xyz/yimian.xyz.key; #3 + + ssl_session_cache shared:SSL:1m; + ssl_session_timeout 5m; + ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4; + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ssl_prefer_server_ciphers on; + # error_page 404 = /404.php; + + + # Load configuration files for the default server block. + include /mnt/etc/common/nginx/default.d/*.conf; + + + error_page 404 /404.html; + location = /40x.html { + } + + error_page 500 502 503 504 /50x.html; + location = /50x.html { + } +} From 4abbd2399f2e2c42ba343ab1f784969882815155 Mon Sep 17 00:00:00 2001 From: iotcat Date: Tue, 25 Aug 2020 01:15:36 +0800 Subject: [PATCH 4/4] gitea --- common/frp/frpc.ini.home | 11 +++++++ .../nginx/conf.d/git.yimian.xyz.conf | 30 +++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 home.yimian.xyz/nginx/conf.d/git.yimian.xyz.conf diff --git a/common/frp/frpc.ini.home b/common/frp/frpc.ini.home index 3739305..ecea18e 100644 --- a/common/frp/frpc.ini.home +++ b/common/frp/frpc.ini.home @@ -22,3 +22,14 @@ custom_domains = docker.yimian.xyz type = https local_port = 443 custom_domains = v-china.yimian.xyz + +[ushio_git] +type = https +local_port = 443 +custom_domains = git.yimian.xyz + +[ushio_git_ssh] +type = tcp +local_port = 222 +local_ip = 127.0.0.1 +remote_port = 4422 diff --git a/home.yimian.xyz/nginx/conf.d/git.yimian.xyz.conf b/home.yimian.xyz/nginx/conf.d/git.yimian.xyz.conf new file mode 100644 index 0000000..d47de80 --- /dev/null +++ b/home.yimian.xyz/nginx/conf.d/git.yimian.xyz.conf @@ -0,0 +1,30 @@ +server { + listen 80; + #listen [::]:80; + server_name git.yimian.xyz; + rewrite ^(.*)$ https://$host$1 permanent; +} + +server { + #listen 80; + listen 443 ssl; + server_name git.yimian.xyz; + + ssl_certificate /mnt/config/ssl/yimian.xyz/yimian.xyz.crt; + ssl_certificate_key /mnt/config/ssl/yimian.xyz/yimian.xyz.key; + + location / { + proxy_pass http://gitea:3000/; + proxy_read_timeout 300s; + proxy_send_timeout 300s; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $connection_upgrade; + } + + +} +