Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merge fly #2725

Merged
merged 27 commits into from
Sep 8, 2020
Merged

merge fly #2725

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
829a28b
remove docker action
kslr Sep 2, 2020
7ffac22
1.14.7 -> 1.15.1
RPRX Sep 2, 2020
af9dbbc
Upgrade all dependencies
RPRX Sep 2, 2020
d9f50f8
Cleanup go.sum
RPRX Sep 2, 2020
44d5829
Fix: change lint order to avoid file changes notice
Loyalsoldier Sep 3, 2020
7fe8dd2
Run go mod tidy
Loyalsoldier Sep 3, 2020
a1c96a1
Bump github/super-linter from v3.9.2 to v3.9.3
dependabot[bot] Sep 3, 2020
68c1e3e
Merge pull request #159 from v2fly/dependabot/github_actions/github/s…
kslr Sep 3, 2020
7001483
Don't copy assets if they are already present
felixonmars Sep 3, 2020
39e9916
Merge pull request #160 from felixonmars/fix-test
vcptr Sep 3, 2020
11bf22b
Fix dns tests by setting v2ray.location.asset
felixonmars Sep 3, 2020
d2226cb
Merge pull request #161 from felixonmars/fix-test
vcptr Sep 3, 2020
5309338
update geoip, geosite
actions-user Sep 4, 2020
6981711
Merge pull request #158 from Loyalsoldier/fix-lint
kslr Sep 4, 2020
f9d37b7
Extract session information during routing as routing context
Vigilans Sep 4, 2020
93afbc5
add golangci config
kslr Sep 4, 2020
b083aa2
Merge pull request #108 from Vigilans/vigilans/routing-context
kslr Sep 4, 2020
ce38341
Bump github/super-linter from v3.9.3 to v3.9.4
dependabot[bot] Sep 4, 2020
bff96a7
Support Channel (Observer Pattern) in Stats Manager
Vigilans Sep 4, 2020
ddd091a
Merge pull request #163 from Vigilans/vigilans/stats-channel
kslr Sep 4, 2020
801b949
fix abstract UDS & add PROXY protocol support to DS inbound
lucifer9 Sep 4, 2020
e6233c9
Merge pull request #162 from v2fly/dependabot/github_actions/github/s…
RPRX Sep 5, 2020
5751de2
systemd: prevent restart on corrupt config
DuckSoft Sep 6, 2020
aecf59a
Merge pull request #166 from DuckSoft/master
kslr Sep 6, 2020
f10f5b4
Merge pull request #164 from lucifer9/ds-enhance
RPRX Sep 7, 2020
16fe0b0
Do not convert @ to \x00
RPRX Sep 7, 2020
d7a5f01
Merge branch 'master' into 2725
kslr Sep 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
systemd: prevent restart on corrupt config
  • Loading branch information
@DuckSoft
DuckSoft committed Sep 6, 2020
commit 5751de2af5cc08f7620df32f180446318ba133d8
1 change: 1 addition & 0 deletions release/config/systemd/system/v2ray.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ AmbientCapabilities=CAP_NET_ADMIN CAP_NET_BIND_SERVICE
NoNewPrivileges=true
ExecStart=/usr/local/bin/v2ray -config /usr/local/etc/v2ray/config.json
Restart=on-failure
RestartPreventExitStatus=23

[Install]
WantedBy=multi-user.target
1 change: 1 addition & 0 deletions release/config/systemd/system/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ AmbientCapabilities=CAP_NET_ADMIN CAP_NET_BIND_SERVICE
NoNewPrivileges=true
ExecStart=/usr/local/bin/v2ray -config /usr/local/etc/v2ray/%i.json
Restart=on-failure
RestartPreventExitStatus=23

[Install]
WantedBy=multi-user.target