Skip to content

Fine tune packages #283

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

Merged
moubctez merged 6 commits into from
Apr 23, 2026
Merged

Fine tune packages #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f53ca78
Fine tune packages
moubctez Apr 23, 2026
6744827
Update trivy action
moubctez Apr 23, 2026
052664c
.trivyignore.yaml
moubctez Apr 23, 2026
e89a2c4
trivy-action
moubctez Apr 23, 2026
55cd97f
trivy-action
moubctez Apr 23, 2026
a2dacd9
.trivyignore.yaml
moubctez Apr 23, 2026
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
1 change: 1 addition & 0 deletions .fpm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
--description "Defguard Edge service"
--url "https://defguard.net/"
--maintainer "Defguard"
--config-files /etc/defguard/proxy.toml
2 changes: 1 addition & 1 deletion .github/workflows/build-docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
cache-to: type=gha,mode=max

- name: Scan image with Trivy
uses: aquasecurity/trivy-action@0.35.0
uses: aquasecurity/trivy-action@v0.36.0
with:
image-ref: "${{ env.GHCR_REPO }}:${{ github.sha }}-${{ matrix.tag }}"
format: "table"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/sbom.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
submodules: recursive

- name: Create SBOM with Trivy
uses: aquasecurity/trivy-action@0.35.0
uses: aquasecurity/trivy-action@v0.36.0
with:
scan-type: 'fs'
format: 'spdx-json'
Expand All @@ -43,7 +43,7 @@ jobs:
scanners: "vuln"

- name: Create Docker image SBOM with Trivy
uses: aquasecurity/trivy-action@0.35.0
uses: aquasecurity/trivy-action@v0.36.0
with:
image-ref: "ghcr.io/defguard/defguard-proxy:${{ steps.vars.outputs.VERSION }}"
scan-type: 'image'
Expand All @@ -53,7 +53,7 @@ jobs:
scanners: "vuln"

- name: Create security advisory file with Trivy
uses: aquasecurity/trivy-action@0.35.0
uses: aquasecurity/trivy-action@v0.36.0
with:
scan-type: 'fs'
format: 'json'
Expand All @@ -63,7 +63,7 @@ jobs:
scanners: "vuln"

- name: Create Docker image security advisory file with Trivy
uses: aquasecurity/trivy-action@0.35.0
uses: aquasecurity/trivy-action@v0.36.0
with:
image-ref: "ghcr.io/defguard/defguard-proxy:${{ steps.vars.outputs.VERSION }}"
scan-type: 'image'
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,10 @@ jobs:
submodules: recursive

- name: Scan code with Trivy
uses: aquasecurity/trivy-action@0.35.0
uses: aquasecurity/trivy-action@v0.36.0
env:
TRIVY_IGNOREFILE: ".trivyignore.yaml"
TRIVY_SHOW_SUPPRESSED: 1
with:
scan-type: 'fs'
scan-ref: '.'
Expand Down
4 changes: 4 additions & 0 deletions .trivyignore.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
vulnerabilities:
- id: GHSA-w5hq-g745-h8pq
expired_at: 2026-04-30
statement: 'Not yet fixed in dependencies'
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 5 additions & 6 deletions freebsd/defguard-proxy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@

. /etc/rc.subr

name="defguard"
rcvar=defguard_enable
name="defguard_proxy"
rcvar=defguard_proxy_enable
command="/usr/local/bin/defguard-proxy"
config="/etc/defguard/proxy.toml"
start_cmd="${name}_start"
start_cmd="${name}_proxy_start"

defguard_start()
{
${command} --config ${config} &
defguard_proxy_start() {
${command} --config ${config} &
}

load_rc_config $name
Expand Down
2 changes: 1 addition & 1 deletion linux/defguard-proxy.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[Unit]
Description=Defguard Edge service
Documentation=https://defguard.gitbook.io/defguard/
Documentation=https://docs.defguard.net/
Wants=network-online.target
After=network-online.target

Expand Down
Loading