Merge pull request #2625 from v2fly/master

marge fly

.github/workflows/dlc.yml

@@ -0,0 +1,28 @@
+name: Update dlc
+
+on:
+  schedule:
+    - cron: '0 0 * * FRI'
+
+jobs:
+
+  build:
+    name: Update
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v2
+
+    - name: Download and Write
+      run: |
+        curl -L -o release/config/geoip.dat "https://github.com/v2ray/geoip/raw/release/geoip.dat"
+        curl -L -o release/config/geosite.dat "https://github.com/v2ray/domain-list-community/raw/release/dlc.dat"
+        
+    - name: push
+      run: |
+        git config --local user.email "[email protected]"
+        git config --local user.name "GitHub Action"
+        git commit -am "update geoip, geosite" -a
+        git push -v --progress
+    

.github/workflows/linter.yml

@@ -5,6 +5,7 @@ on:
     branches: [ master ]
   pull_request:
     branches: [ master ]
+    types: [assigned, opened, synchronize, reopened]
 
 jobs:
   build:
@@ -16,6 +17,8 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Lint Code Base
-        uses: github/super-linter@v2.0.0
+        uses: github/super-linter@v2.2.0
         env:
-          VALIDATE_ALL_CODEBASE: false
+          VALIDATE_ALL_CODEBASE: false
+          VALIDATE_JSON: false
+          VALIDATE_ANSIBLE: false

.github/workflows/sign.yml

@@ -0,0 +1,37 @@
+# This is a basic workflow to help you get started with Actions
+
+name: Sign
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  release:
+    types: [released]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+
+      # Invoke release signing
+      - name: make it run
+        run: chmod +x $GITHUB_WORKSPACE/release/requestsign_github.sh
+
+      # Invoke release signing
+      - name: make it run
+        run: chmod +x $GITHUB_WORKSPACE/release/requestsign.sh
+
+      # Invoke release signing
+      - name: Invoke release signing
+        env:
+          SIGN_SERVICE_PASSWORD: ${{ secrets.SIGN_SERVICE_PASSWORD }}
+          SIGN_SERIVCE_URL: ${{ secrets.SIGN_SERIVCE_URL }}
+          GITHUB_TOKEN:  ${{ secrets.GITHUB_TOKEN }}
+        run: $GITHUB_WORKSPACE/release/requestsign_github.sh

.github/workflows/stale.yml

@@ -0,0 +1,18 @@
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: "30 1 * * *"
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/stale@v1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-issue-message: 'This issue is stale because it has been open 120 days with no activity. Remove stale label or comment or this will be closed in 5 days'
+        days-before-stale: 120
+        days-before-close: 5

app/policy/config.go

@@ -84,8 +84,10 @@ func (p *Policy) ToCorePolicy() policy.Session {
 func (p *SystemPolicy) ToCorePolicy() policy.System {
 	return policy.System{
 		Stats: policy.SystemStats{
-			InboundUplink:   p.Stats.InboundUplink,
-			InboundDownlink: p.Stats.InboundDownlink,
+			InboundUplink:    p.Stats.InboundUplink,
+			InboundDownlink:  p.Stats.InboundDownlink,
+			OutboundUplink:   p.Stats.OutboundUplink,
+			OutboundDownlink: p.Stats.OutboundDownlink,
 		},
 	}
 }