Skip to content

Commit

Permalink
update: caddy1 to caddy2
Browse files Browse the repository at this point in the history
  • Loading branch information
233boy committed May 25, 2022
1 parent 7f76440 commit 9c63512
Show file tree
Hide file tree
Showing 15 changed files with 125 additions and 364 deletions.
33 changes: 7 additions & 26 deletions config/server/dynamic/http.json
Original file line number Diff line number Diff line change
Expand Up @@ -126,32 +126,13 @@
"routing": {
"domainStrategy": "IPOnDemand",
"rules": [
{
"type": "field",
"ip": [
"0.0.0.0/8",
"10.0.0.0/8",
"100.64.0.0/10",
"127.0.0.0/8",
"169.254.0.0/16",
"172.16.0.0/12",
"192.0.0.0/24",
"192.0.2.0/24",
"192.168.0.0/16",
"198.18.0.0/15",
"198.51.100.0/24",
"203.0.113.0/24",
"::1/128",
"fc00::/7",
"fe80::/10"
],
"outboundTag": "blocked"
},
{
"type": "field",
"inboundTag": ["tg-in"],
"outboundTag": "tg-out"
}
{
"type": "field",
"ip": [
"geoip:private"
],
"outboundTag": "blocked"
}
//include_ban_xx
//include_ban_bt
//include_ban_ad
Expand Down
33 changes: 7 additions & 26 deletions config/server/dynamic/kcp.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,32 +98,13 @@
"routing": {
"domainStrategy": "IPOnDemand",
"rules": [
{
"type": "field",
"ip": [
"0.0.0.0/8",
"10.0.0.0/8",
"100.64.0.0/10",
"127.0.0.0/8",
"169.254.0.0/16",
"172.16.0.0/12",
"192.0.0.0/24",
"192.0.2.0/24",
"192.168.0.0/16",
"198.18.0.0/15",
"198.51.100.0/24",
"203.0.113.0/24",
"::1/128",
"fc00::/7",
"fe80::/10"
],
"outboundTag": "blocked"
},
{
"type": "field",
"inboundTag": ["tg-in"],
"outboundTag": "tg-out"
}
{
"type": "field",
"ip": [
"geoip:private"
],
"outboundTag": "blocked"
}
//include_ban_xx
//include_ban_bt
//include_ban_ad
Expand Down
33 changes: 7 additions & 26 deletions config/server/dynamic/quic.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,32 +100,13 @@
"routing": {
"domainStrategy": "IPOnDemand",
"rules": [
{
"type": "field",
"ip": [
"0.0.0.0/8",
"10.0.0.0/8",
"100.64.0.0/10",
"127.0.0.0/8",
"169.254.0.0/16",
"172.16.0.0/12",
"192.0.0.0/24",
"192.0.2.0/24",
"192.168.0.0/16",
"198.18.0.0/15",
"198.51.100.0/24",
"203.0.113.0/24",
"::1/128",
"fc00::/7",
"fe80::/10"
],
"outboundTag": "blocked"
},
{
"type": "field",
"inboundTag": ["tg-in"],
"outboundTag": "tg-out"
}
{
"type": "field",
"ip": [
"geoip:private"
],
"outboundTag": "blocked"
}
//include_ban_xx
//include_ban_bt
//include_ban_ad
Expand Down
33 changes: 7 additions & 26 deletions config/server/dynamic/tcp.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,32 +85,13 @@
"routing": {
"domainStrategy": "IPOnDemand",
"rules": [
{
"type": "field",
"ip": [
"0.0.0.0/8",
"10.0.0.0/8",
"100.64.0.0/10",
"127.0.0.0/8",
"169.254.0.0/16",
"172.16.0.0/12",
"192.0.0.0/24",
"192.0.2.0/24",
"192.168.0.0/16",
"198.18.0.0/15",
"198.51.100.0/24",
"203.0.113.0/24",
"::1/128",
"fc00::/7",
"fe80::/10"
],
"outboundTag": "blocked"
},
{
"type": "field",
"inboundTag": ["tg-in"],
"outboundTag": "tg-out"
}
{
"type": "field",
"ip": [
"geoip:private"
],
"outboundTag": "blocked"
}
//include_ban_xx
//include_ban_bt
//include_ban_ad
Expand Down
33 changes: 7 additions & 26 deletions config/server/dynamic/ws.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,32 +88,13 @@
"routing": {
"domainStrategy": "IPOnDemand",
"rules": [
{
"type": "field",
"ip": [
"0.0.0.0/8",
"10.0.0.0/8",
"100.64.0.0/10",
"127.0.0.0/8",
"169.254.0.0/16",
"172.16.0.0/12",
"192.0.0.0/24",
"192.0.2.0/24",
"192.168.0.0/16",
"198.18.0.0/15",
"198.51.100.0/24",
"203.0.113.0/24",
"::1/128",
"fc00::/7",
"fe80::/10"
],
"outboundTag": "blocked"
},
{
"type": "field",
"inboundTag": ["tg-in"],
"outboundTag": "tg-out"
}
{
"type": "field",
"ip": [
"geoip:private"
],
"outboundTag": "blocked"
}
//include_ban_xx
//include_ban_bt
//include_ban_ad
Expand Down
42 changes: 7 additions & 35 deletions config/server/h2.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,6 @@
"233blog.com"
],
"path": "/233blog"
},
"security": "tls",
"tlsSettings": {
"certificates": [
{
"certificateFile": "/etc/v2ray/233boy/v2ray/config/233blog.com.cer",
"keyFile": "/etc/v2ray/233boy/v2ray/config/233blog.com.key"
}
]
}
},
"sniffing": {
Expand Down Expand Up @@ -81,32 +72,13 @@
"routing": {
"domainStrategy": "IPOnDemand",
"rules": [
{
"type": "field",
"ip": [
"0.0.0.0/8",
"10.0.0.0/8",
"100.64.0.0/10",
"127.0.0.0/8",
"169.254.0.0/16",
"172.16.0.0/12",
"192.0.0.0/24",
"192.0.2.0/24",
"192.168.0.0/16",
"198.18.0.0/15",
"198.51.100.0/24",
"203.0.113.0/24",
"::1/128",
"fc00::/7",
"fe80::/10"
],
"outboundTag": "blocked"
},
{
"type": "field",
"inboundTag": ["tg-in"],
"outboundTag": "tg-out"
}
{
"type": "field",
"ip": [
"geoip:private"
],
"outboundTag": "blocked"
}
//include_ban_xx
//include_ban_bt
//include_ban_ad
Expand Down
33 changes: 7 additions & 26 deletions config/server/http.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,32 +99,13 @@
"routing": {
"domainStrategy": "IPOnDemand",
"rules": [
{
"type": "field",
"ip": [
"0.0.0.0/8",
"10.0.0.0/8",
"100.64.0.0/10",
"127.0.0.0/8",
"169.254.0.0/16",
"172.16.0.0/12",
"192.0.0.0/24",
"192.0.2.0/24",
"192.168.0.0/16",
"198.18.0.0/15",
"198.51.100.0/24",
"203.0.113.0/24",
"::1/128",
"fc00::/7",
"fe80::/10"
],
"outboundTag": "blocked"
},
{
"type": "field",
"inboundTag": ["tg-in"],
"outboundTag": "tg-out"
}
{
"type": "field",
"ip": [
"geoip:private"
],
"outboundTag": "blocked"
}
//include_ban_xx
//include_ban_bt
//include_ban_ad
Expand Down
33 changes: 7 additions & 26 deletions config/server/kcp.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,32 +71,13 @@
"routing": {
"domainStrategy": "IPOnDemand",
"rules": [
{
"type": "field",
"ip": [
"0.0.0.0/8",
"10.0.0.0/8",
"100.64.0.0/10",
"127.0.0.0/8",
"169.254.0.0/16",
"172.16.0.0/12",
"192.0.0.0/24",
"192.0.2.0/24",
"192.168.0.0/16",
"198.18.0.0/15",
"198.51.100.0/24",
"203.0.113.0/24",
"::1/128",
"fc00::/7",
"fe80::/10"
],
"outboundTag": "blocked"
},
{
"type": "field",
"inboundTag": ["tg-in"],
"outboundTag": "tg-out"
}
{
"type": "field",
"ip": [
"geoip:private"
],
"outboundTag": "blocked"
}
//include_ban_xx
//include_ban_bt
//include_ban_ad
Expand Down
33 changes: 7 additions & 26 deletions config/server/quic.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,32 +72,13 @@
"routing": {
"domainStrategy": "IPOnDemand",
"rules": [
{
"type": "field",
"ip": [
"0.0.0.0/8",
"10.0.0.0/8",
"100.64.0.0/10",
"127.0.0.0/8",
"169.254.0.0/16",
"172.16.0.0/12",
"192.0.0.0/24",
"192.0.2.0/24",
"192.168.0.0/16",
"198.18.0.0/15",
"198.51.100.0/24",
"203.0.113.0/24",
"::1/128",
"fc00::/7",
"fe80::/10"
],
"outboundTag": "blocked"
},
{
"type": "field",
"inboundTag": ["tg-in"],
"outboundTag": "tg-out"
}
{
"type": "field",
"ip": [
"geoip:private"
],
"outboundTag": "blocked"
}
//include_ban_xx
//include_ban_bt
//include_ban_ad
Expand Down
Loading

0 comments on commit 9c63512

Please sign in to comment.