diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 5776d4e..0fd21c9 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -84,7 +84,7 @@ jobs: md5sum: false sha256sum: false binary_name: 'qBittorrent-ClientBlocker' - extra_files: 'lang/ LICENSE *.md *.json ' + extra_files: 'lang/ LICENSE *.md *.txt *.json' - name: 'Upload GitHub Artifact (Nightly)' uses: actions/upload-artifact@v4 if: ${{ github.event_name != 'release' }} diff --git a/Dockerfile b/Dockerfile index 34e2ab3..2e83869 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ RUN PROGRAM_VERSION="$(basename ${GITHUB_REF})"; \ RUN . /envfile; echo "Running on ${BUILDOS}/${BUILDARCH}, Building for ${TARGETOS}/${TARGETARCH}, Version: ${PROGRAM_VERSION}" -ADD lang/ *LICENSE* *.md *.go *.sh go.mod go.sum config.json ./ +ADD lang/ *LICENSE* *.md *.go *.sh *.txt *.json go.mod go.sum ./ RUN go mod download RUN . /envfile; go build -ldflags "-w -X \"main.programVersion=${PROGRAM_VERSION}\"" -o qBittorrent-ClientBlocker diff --git a/blockBackList.json b/blockList-Optional.json similarity index 100% rename from blockBackList.json rename to blockList-Optional.json diff --git a/config.json b/config.json index ad3072c..075ba32 100644 --- a/config.json +++ b/config.json @@ -14,7 +14,7 @@ "skipCertVerification": false, "blockListFile": [ "blockList.json", - // "blockBackList.json", + // "blockList-Optional.json" ], "blockListURL": [ "https://bta.iaalai.cn/qBittorrent-ClientBlocker/blockList.json", @@ -22,14 +22,13 @@ ], "portBlockList": [], "ipBlockList": [ - "customIpBlock.txt", "ipBlockList.txt" ], "ipBlockListURL": [ "https://bta.iaalai.cn/BTN-Collected-Rules/combine/all.txt", "https://cdn.jsdelivr.net/gh/PBH-BTN/BTN-Collected-Rules@main/combine/all.txt", - "https://bta.iaalai.cn/BTN-Collected-Rules/qBittorrent-ClientBlocker/blockIP.txt", - "https://cdn.jsdelivr.net/gh/Simple-Tracker/qBittorrent-ClientBlocker@dev/blockIP.txt" + "https://bta.iaalai.cn/BTN-Collected-Rules/qBittorrent-ClientBlocker/ipBlockList.txt", + "https://cdn.jsdelivr.net/gh/Simple-Tracker/qBittorrent-ClientBlocker@dev/ipBlockList.txt" ], "ipBlockListFile": [] /*