Merge branch 'master' of github.com:IoTcat/ushio-etc

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

common/hosts/hosts.deny

@@ -18,3 +18,5 @@ sshd:139.199.115.210:deny
 sshd:106.13.233.102:deny
 # DenyHosts: Thu Aug 20 01:01:35 2020 | sshd: 117.78.39.146
 sshd: 117.78.39.146
+# DenyHosts: Sat Aug 22 14:42:00 2020 | sshd: 211.76.55.12
+sshd: 211.76.55.12

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;
+   } 
+
+
+}
+

usa.yimian.xyz/nginx/conf.d/git.yimian.xyz.conf

@@ -0,0 +1,42 @@
+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;
+    client_max_body_size 9000M;
+
+    ssl_certificate         /mnt/config/ssl/yimian.xyz/yimian.xyz.crt;
+    ssl_certificate_key     /mnt/config/ssl/yimian.xyz/yimian.xyz.key;
+
+    location / {
+         #proxy_pass https://frps:4443;
+         #proxy_ssl_server_name on;
+         #proxy_ssl_certificate /mnt/config/ssl/yimian.xyz/yimian.xyz.crt;
+         #proxy_ssl_certificate_key /mnt/config/ssl/yimian.xyz/yimian.xyz.key;
+         #proxy_http_version 1.1;
+         #proxy_set_header Upgrade $http_upgrade;
+         #proxy_set_header Connection 'upgrade';
+         #proxy_set_header Host $host;
+         #proxy_cache_bypass $http_upgrade;
+         resolver 8.8.8.8;
+         proxy_ssl_server_name on;
+         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_set_header Host $host:$server_port;
+         proxy_pass https://$host:4443; #通过域名访问frp服务
+        proxy_read_timeout 300s;
+        proxy_send_timeout 300s;
+        #proxy_set_header Host $host;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $connection_upgrade;
+ 
+    } 
+}