Skip to content
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

firewall.py complete revamp #2011

Open
wants to merge 14 commits into
base: dev
Choose a base branch
from
Open

firewall.py complete revamp #2011

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
291bca0
firewall.py complete revamp
Salamandar Dec 9, 2024
a9e2519
Remove conflict between yunohost-firewall and nftables
Salamandar Dec 11, 2024
2dd68e5
Fix mypy: it doesn't detect the proper logging class
Salamandar Dec 11, 2024
a206c61
iptables to nftables: Update translations
Salamandar Dec 9, 2024
df4e759
Use nftables instead of iptables for fail2ban
Salamandar Dec 9, 2024
8b0425d
Add nftables config and conf-regen
Salamandar Dec 9, 2024
a0d0179
resources: rewrite port resource for the new firewall API
Salamandar Dec 12, 2024
4aa4bc7
firewall: Positional protocol argument
Salamandar Dec 13, 2024
574ae08
Add command firewall is-open <port> -p <protocol> for apps
Salamandar Dec 13, 2024
f666cc1
Replace yunohost-firewall.service with an override on nftables.servic…
Salamandar Dec 15, 2024
7bb4779
DONOTMERGE apt update before install
Salamandar Dec 11, 2024
6802b91
firewall: Add a custom script that run-parts the hooks instead of cal…
Salamandar Dec 17, 2024
43666cf
app resources: Fix firewall, exposed can be a bool too
Salamandar Dec 20, 2024
a6a217e
Improve firewall migration: add comment for port opened for an app
Salamandar Dec 21, 2024
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
Prev Previous commit
Next Next commit
Remove conflict between yunohost-firewall and nftables
  • Loading branch information
@Salamandar
Salamandar committed Dec 20, 2024
commit a9e2519d7cfd463c31ad1d2ad52dc7b98bfa91a0
11 changes: 0 additions & 11 deletions hooks/conf_regen/01-yunohost
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,16 +278,6 @@ ConditionVirtualization=!container
EOF
fi

# Make nftable conflict with yunohost-firewall
mkdir -p ${pending_dir}/etc/systemd/system/nftables.service.d/
cat > ${pending_dir}/etc/systemd/system/nftables.service.d/ynh-override.conf << EOF
Salamandar marked this conversation as resolved.
Show resolved Hide resolved
[Unit]
# yunohost-firewall and nftables conflict with each other
Conflicts=yunohost-firewall.service
ConditionFileIsExecutable=!/etc/init.d/yunohost-firewall
ConditionPathExists=!/etc/systemd/system/multi-user.target.wants/yunohost-firewall.service
EOF

# Don't suspend computer on LidSwitch
mkdir -p ${pending_dir}/etc/systemd/logind.conf.d/
cat > ${pending_dir}/etc/systemd/logind.conf.d/ynh-override.conf << EOF
Expand Down Expand Up @@ -361,7 +351,6 @@ do_post_regen() {
}
fi

[[ ! "$regen_conf_files" =~ "nftables.service.d/ynh-override.conf" ]] || systemctl daemon-reload
[[ ! "$regen_conf_files" =~ "login.conf.d/ynh-override.conf" ]] || {
systemctl daemon-reload
systemctl restart systemd-logind
Expand Down