Skip to content

Commit

Permalink
Merge pull request #2029 from Luap99/firewall-doc
Browse files Browse the repository at this point in the history
fix outdated firewall_driver docs
  • Loading branch information
openshift-merge-bot[bot] authored May 31, 2024
2 parents 18fdea5 + 0c06025 commit c382b95
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
5 changes: 2 additions & 3 deletions docs/containers.conf.5.md
Original file line number Diff line number Diff line change
Expand Up @@ -459,9 +459,8 @@ and "$graphroot/networks" as rootless.

The firewall driver to be used by netavark.
The default is empty which means netavark will pick one accordingly. Current supported
drivers are "iptables", "none" (no firewall rules will be created) and "firewalld" (firewalld is
experimental at the moment and not recommend outside of testing). In the future we are
planning to add support for a "nftables" driver.
drivers are "iptables", "nftables", "none" (no firewall rules will be created) and "firewalld" (firewalld is
experimental at the moment and not recommend outside of testing).

**dns_bind_port**=53

Expand Down
10 changes: 5 additions & 5 deletions pkg/config/containers.conf
Original file line number Diff line number Diff line change
Expand Up @@ -350,9 +350,9 @@ default_sysctls = [

# The firewall driver to be used by netavark.
# The default is empty which means netavark will pick one accordingly. Current supported
# drivers are "iptables", "none" (no firewall rules will be created) and "firewalld" (firewalld is
# experimental at the moment and not recommend outside of testing). In the future we are
# planning to add support for a "nftables" driver.
# drivers are "iptables", "nftables", "none" (no firewall rules will be created) and "firewalld" (firewalld is
# experimental at the moment and not recommend outside of testing).
#
#firewall_driver = ""


Expand Down Expand Up @@ -890,10 +890,10 @@ default_sysctls = [
[podmansh]
# Shell to spawn in container. Default: /bin/sh.
#shell = "/bin/sh"
#
#
# Name of the container the podmansh user should join.
#container = "podmansh"
#
#
# Default timeout in seconds for podmansh logins.
# Favored over the deprecated "podmansh_timeout" field.
#timeout = 30

1 comment on commit c382b95

@packit-as-a-service
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

podman-next COPR build failed. @containers/packit-build please check.

Please sign in to comment.