diff --git a/README.md b/README.md index 36eb47e1..f7f6a9ce 100644 --- a/README.md +++ b/README.md @@ -110,7 +110,7 @@ automatically. This feature is new since version 0.10.20231013. ```shell ishmael ~ # bastille setup -h -ishmael ~ # Usage: bastille setup [pf|bastille0|zfs|vnet] +ishmael ~ # Usage: bastille setup [pf|network|zfs|vnet] ``` On fresh installations it is likely safe to run `bastille setup` with no diff --git a/docs/chapters/subcommands/setup.rst b/docs/chapters/subcommands/setup.rst index 53d65e61..cf5ddfbc 100644 --- a/docs/chapters/subcommands/setup.rst +++ b/docs/chapters/subcommands/setup.rst @@ -9,7 +9,7 @@ options for a Bastille host with one command. .. code-block:: shell ishmael ~ # bastille setup -h ## display setup help - ishmael ~ # bastille setup bastille0 ## only configure loopback interface + ishmael ~ # bastille setup network ## only configure loopback interface ishmael ~ # bastille setup pf ## only configure default firewall ishmael ~ # bastille setup zfs ## only configure ZFS storage ishmael ~ # bastille setup vnet ## only configure VNET bridge diff --git a/usr/local/share/bastille/setup.sh b/usr/local/share/bastille/setup.sh index d29322fe..d9db8834 100644 --- a/usr/local/share/bastille/setup.sh +++ b/usr/local/share/bastille/setup.sh @@ -30,12 +30,12 @@ bastille_config="/usr/local/etc/bastille/bastille.conf" . /usr/local/share/bastille/common.sh -# shellcheck source=/usr/local/etc/bastille/bastille.conf -if [ ! -f "${bastille_config}" ] -then +if [ ! -f "${bastille_config}" ]; then cp /usr/local/etc/bastille/bastille.conf.sample ${bastille_config} fi + +# shellcheck source=/usr/local/etc/bastille/bastille.conf . ${bastille_config} usage() { @@ -141,7 +141,12 @@ help|-h|--help) pf|firewall) configure_pf ;; -network|bastille0|loopback) +bastille0) + # TODO remove in future release 0.13 + warn "'bastille setup bastille0' will be deprecated in the next 0.13 version." + configure_network + ;; +network|loopback) configure_network ;; zfs|storage)