Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 1 addition & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -215,9 +215,7 @@ jobs:
--version ${{ env.VERSION }}
--package defguard-proxy-${{ env.VERSION }}_x86_64-unknown-freebsd.pkg
--freebsd-osversion '*'
--depends openssl
--before-install freebsd/preinst
--after-remove freebsd/postrm"
--depends openssl"

- name: Upload Linux x86_64 archive
uses: shogo82148/actions-upload-release-asset@v1
Expand Down
Binary file modified docs/header.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 0 additions & 9 deletions freebsd/postrm

This file was deleted.

13 changes: 0 additions & 13 deletions freebsd/preinst

This file was deleted.

2 changes: 2 additions & 0 deletions linux/defguard-proxy.service
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ After=network-online.target
[Service]
User=defguard
Group=defguard
AmbientCapabilities=CAP_NET_BIND_SERVICE
CapabilityBoundingSet=CAP_NET_BIND_SERVICE
ExecReload=/bin/kill -HUP $MAINPID
ExecStart=/usr/bin/defguard-proxy --config /etc/defguard/proxy.toml
KillMode=process
Expand Down
4 changes: 2 additions & 2 deletions linux/postinst
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ case "${1}" in
abort-upgrade | abort-remove | abort-deconfigure)
if [ -x /usr/bin/systemctl ]; then
/usr/bin/systemctl daemon-reload
if /usr/bin/systemctl is-enabled ${SERVICE_NAME} >/dev/null 2>&1; then
/usr/bin/systemctl start ${SERVICE_NAME} || true
if /usr/bin/systemctl is-enabled --quiet ${SERVICE_NAME}; then
/usr/bin/systemctl --no-block restart ${SERVICE_NAME}
fi
fi
;;
Expand Down
7 changes: 3 additions & 4 deletions linux/postrm
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@ set -e
USERNAME=defguard

if [ -x /usr/bin/systemctl ]; then
/usr/bin/systemctl daemon-reload >/dev/null 2>&1 || true
/usr/bin/systemctl --quiet daemon-reload || true
fi

if id -u ${USERNAME} >/dev/null 2>&1
then
echo "If no longer needed, remove ${USERNAME} manually: userdel ${USERNAME}"
if id -u ${USERNAME} >/dev/null 2>&1; then
echo "If no longer needed, remove ${USERNAME} manually: userdel ${USERNAME}"
fi
2 changes: 1 addition & 1 deletion linux/preinst
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ if ! id -u ${USERNAME} >/dev/null 2>&1; then
fi

mkdir -p /etc/defguard
chown ${USERNAME}:${USERNAME} /etc/defguard
chown -R ${USERNAME}:${USERNAME} /etc/defguard
chmod 750 /etc/defguard
2 changes: 1 addition & 1 deletion linux/prerm
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ set -e
SERVICE_NAME='defguard-proxy'

if [ -x /usr/bin/systemctl ]; then
/usr/bin/systemctl --no-block stop ${SERVICE_NAME} >/dev/null 2>&1 || true
/usr/bin/systemctl --no-block --quiet stop ${SERVICE_NAME} || true
fi
Loading