Merge pull request #966 from DefGuard/main

Sync dev with newest main changes (post 1.2)
DefGuard · Jan 22, 2025 · 48c3eed · 48c3eed
2 parents 8162e8d + f19cea6
commit 48c3eed
Show file tree

Hide file tree

Showing 38 changed files with 894 additions and 469 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -186,7 +186,7 @@ jobs:
         if: matrix.build == 'freebsd'
         uses: defGuard/fpm-action@main
         with:
-          fpm_args: "${{ matrix.asset_name }}-${{ github.ref_name }}=/usr/local/bin/defguard defguard.service.freebsd=/usr/local/etc/rc.d/defguard"
+          fpm_args: "defguard-${{ github.ref_name }}-${{ matrix.target }}=/usr/local/bin/defguard defguard.service.freebsd=/usr/local/etc/rc.d/defguard"
           fpm_opts: "--architecture ${{ matrix.arch }} --debug --output-type freebsd --version ${{ env.VERSION }} --package defguard-${{ env.VERSION }}_${{ matrix.target }}.pkg --freebsd-osversion '*'"
 
       - name: Upload FreeBSD

diff --git a/.sqlx/query-455cdf6e1284b773de2d44332b49b31030fe878f3001447d2c245b9502dff427.json b/.sqlx/query-455cdf6e1284b773de2d44332b49b31030fe878f3001447d2c245b9502dff427.json
diff --git a/.sqlx/query-56e835feea4f834510c020e111d06585092b9f160b8c8bdf34610de0c4d2cf52.json b/.sqlx/query-56e835feea4f834510c020e111d06585092b9f160b8c8bdf34610de0c4d2cf52.json
diff --git a/.sqlx/query-77291d31a566e9deca452048a933ffce58f7d086e51d05e491333c0d55f6edb4.json b/.sqlx/query-77291d31a566e9deca452048a933ffce58f7d086e51d05e491333c0d55f6edb4.json
diff --git a/...76837035da3fd7a4fd7f95ce5b0ae03b3400.json → ...cfdd858d1e86bb1033e358b1bcb9962d27fc.json b/...76837035da3fd7a4fd7f95ce5b0ae03b3400.json → ...cfdd858d1e86bb1033e358b1bcb9962d27fc.json
diff --git a/.sqlx/query-ed74bbe1d6c370e3106345d652bcaa6070009e231e4d8721fa37764e6a3dc07b.json b/.sqlx/query-ed74bbe1d6c370e3106345d652bcaa6070009e231e4d8721fa37764e6a3dc07b.json