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.

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

mt: update pfrule.sh, improve table handling #602

Merged
merged 22 commits into from
Nov 13, 2024
Merged

Conversation

msimerson
Copy link
Owner

@msimerson msimerson commented Nov 10, 2024

Changes proposed in this pull request:

  • mt: default NTPd is now openntpd
  • mt: install pfrule from GH repo (vs inline)
    • add mt6-fetch, get_jail_data
  • pfrule.sh:
    • adds a -n option
    • adds binat loading support
    • loads tables in pf.conf.d
    • unload is smarter now
  • host: ntpd stop -> onestop
  • base: fix jail config so service jail start base works

Fixes #600

Checklist:

  • docs up-to-date

@msimerson
Copy link
Owner Author

msimerson commented Nov 10, 2024

This also adds a -n option to pfrule.sh, which does a preview showing exactly the commands that would be run.

unload

./pfrule.sh unload -n
pfctl -a nat/dovecot -F nat
pfctl -a rdr/dovecot -F nat
pfctl -a filter/dovecot -F rules
pfctl -t dovecot -T flush
pfctl -t insecure_mua -T flush

load

./pfrule.sh load -n
pfctl -t dovecot -T replace -f /data/dovecot/etc/pf.conf.d/dovecot.table
pfctl -t insecure_mua -T replace -f /data/dovecot/etc/pf.conf.d/insecure_mua.table
pfctl -a nat/dovecot -f /data/dovecot/etc/pf.conf.d/nat.conf
pfctl -a rdr/dovecot -f /data/dovecot/etc/pf.conf.d/rdr.conf
pfctl -a filter/dovecot -f /data/dovecot/etc/pf.conf.d/filter.conf

@msimerson msimerson marked this pull request as ready for review November 11, 2024 02:00
@msimerson msimerson merged commit 34ea03b into master Nov 13, 2024
6 checks passed
@msimerson msimerson deleted the 600-pfrule-tables branch November 13, 2024 02:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

new pf rule design does not work
1 participant