diff --git a/CODE-OF-CONDUCT.md b/CODE-OF-CONDUCT.md index 2d4e758b..ea66bb59 100644 --- a/CODE-OF-CONDUCT.md +++ b/CODE-OF-CONDUCT.md @@ -71,4 +71,3 @@ This Code of Conduct is adapted from the [Contributor Covenant][homepage], versi available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html [homepage]: https://www.contributor-covenant.org - diff --git a/README.md b/README.md index 0845bb80..51dd5914 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ Usage: Available Commands: bootstrap Bootstrap a FreeBSD release for container base. - clone Clone an existing container. + clone Clone an existing container. cmd Execute arbitrary command on targeted container(s). clone Clone an existing container. console Console into a running container. @@ -163,9 +163,9 @@ container at `10.17.89.45`. Finally, enable and (re)start the firewall: -## dynamic rdr +## dynamic rdr -The `rdr-anchor "rdr/*"` enables dynamic rdr rules to be setup using the +The `rdr-anchor "rdr/*"` enables dynamic rdr rules to be setup using the `bastille rdr` command at runtime - eg. ``` @@ -176,7 +176,7 @@ The `rdr-anchor "rdr/*"` enables dynamic rdr rules to be setup using the ``` Note that if you are rediirecting ports where the host is also listening - (eg. ssh) you should make sure that the host service is not listening on + (eg. ssh) you should make sure that the host service is not listening on the cloned interface - eg. for ssh set sshd_flags in rc.conf ## Enable pf rules @@ -268,7 +268,7 @@ default this value is set to "base". Additional components are added, space separated, without file extension. Bastille will attempt to fetch the required archives if they are not found in -the `cache/$RELEASE` directory. +the `cache/$RELEASE` directory. Downloaded artifacts are stored in the `cache/RELEASE` directory. "bootstrapped" releases are stored in `releases/RELEASE`. @@ -782,7 +782,7 @@ root@folsom:~ # At this point you are logged in to the container and have full shell access. The system is yours to use and/or abuse as you like. Any changes made inside -the container are limited to the container. +the container are limited to the container. bastille cp @@ -808,8 +808,8 @@ bastille rdr ------------ `bastille rdr` allows you to configure dynamic rdr rules for your containers -without modifying pf.conf (assuming you are using the `bastille0` interface -for a private network and have enabled `rdr-anchor 'rdr/*'` in /etc/pf.conf +without modifying pf.conf (assuming you are using the `bastille0` interface +for a private network and have enabled `rdr-anchor 'rdr/*'` in /etc/pf.conf as described in the Networking section). ```shell @@ -907,7 +907,7 @@ Note: On UFS systems containers must be stopped before export. ishmael ~ # bastille export folsom Exporting 'folsom' to a compressed .xz archive. Sending zfs data stream... - 100 % 1057.2 KiB / 9231.5 KiB = 0.115 0:01 + 100 % 1057.2 KiB / 9231.5 KiB = 0.115 0:01 Exported '/usr/local/bastille/jails/backups/folsom_2020-01-26-19:23:04.xz' successfully. ``` @@ -923,7 +923,7 @@ File validation successful! Importing 'folsom' from compressed .xz archive. Receiving zfs data stream... /usr/local/bastille/jails/backups/folsom_2020-01-26-19:22:23.xz (1/1) - 100 % 626.4 KiB / 9231.5 KiB = 0.068 0:02 + 100 % 626.4 KiB / 9231.5 KiB = 0.068 0:02 Container 'folsom' imported successfully. ``` @@ -1020,7 +1020,7 @@ limit the target areas available to anyone that has (or has gained) access. Networking Tips =============== -Tip #1: +Tip #1: ------- Ports and destinations can be defined as lists. eg; ``` @@ -1032,7 +1032,7 @@ round-robin between containers with ips 45, 46, 47, and 48 (on ports 80 or 443). -Tip #2: +Tip #2: ------- Ports can redirect to other ports. eg; ``` diff --git a/docs/Makefile b/docs/Makefile index 298ea9e2..51285967 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -16,4 +16,4 @@ help: # Catch-all target: route all unknown targets to Sphinx using the new # "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS). %: Makefile - @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) \ No newline at end of file + @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) diff --git a/docs/chapters/jail-config.rst b/docs/chapters/jail-config.rst index 457637d3..cee43112 100644 --- a/docs/chapters/jail-config.rst +++ b/docs/chapters/jail-config.rst @@ -45,7 +45,7 @@ devfs_ruleset effective and enforce_statfs is set to a value lower than 2. Devfs rules and rulesets cannot be viewed or modified from inside a jail. - + NOTE: It is important that only appropriate device nodes in devfs be exposed to a jail; access to disk devices in the jail may permit processes in the jail to bypass the jail sandboxing by @@ -178,13 +178,13 @@ cases. The kernel runs with five different security levels. Any super-user process can raise the level, but no process can lower it. The security levels are: - + -1 Permanently insecure mode - always run the system in insecure mode. This is the default initial value. - + 0 Insecure mode - immutable and append-only flags may be turned off. All devices may be read or written subject to their permissions. - + 1 Secure mode - the system immutable and system append-only flags may not be turned off; disks for mounted file systems, /dev/mem and /dev/kmem may not be opened for writing; /dev/io (if your platform @@ -192,18 +192,17 @@ cases. not be loaded or unloaded. The kernel debugger may not be entered using the debug.kdb.enter sysctl. A panic or trap cannot be forced using the debug.kdb.panic and other sysctl's. - + 2 Highly secure mode - same as secure mode, plus disks may not be opened for writing (except by mount(2)) whether mounted or not. This level precludes tampering with file systems by unmounting them, but also inhibits running newfs(8) while the system is multi- user. - + In addition, kernel time changes are restricted to less than or equal to one second. Attempts to change the time by more than this will log the message "Time adjustment clamped to +1 second". - + 3 Network secure mode - same as highly secure mode, plus IP packet filter rules (see ipfw(8), ipfirewall(4) and pfctl(8)) cannot be changed and dummynet(4) or pf(4) configuration cannot be adjusted. - diff --git a/docs/chapters/networking.rst b/docs/chapters/networking.rst index db3a7f3a..158f1e1c 100644 --- a/docs/chapters/networking.rst +++ b/docs/chapters/networking.rst @@ -95,20 +95,20 @@ Create the firewall rules: .. code-block:: shell ext_if="vtnet0" - + set block-policy return scrub in on $ext_if all fragment reassemble set skip on lo table persist nat on $ext_if from to any -> ($ext_if) - + ## static rdr example ## rdr pass inet proto tcp from any to any port {80, 443} -> 10.17.89.45 ## dynamic rdr anchor (see below) rdr-anchor "rdr/*" - + block in all pass out quick modulate state antispoof for $ext_if inet @@ -127,7 +127,7 @@ to containers are: .. code-block:: shell nat on $ext_if from to any -> ($ext_if) - + ## static rdr example ## rdr pass inet proto tcp from any to any port {80, 443} -> 10.17.89.45 @@ -141,7 +141,7 @@ containers at `10.17.89.45`. ## dynamic rdr anchor (see below) rdr-anchor "rdr/*" -The `rdr-anchor "rdr/*"` enables dynamic rdr rules to be setup using the +The `rdr-anchor "rdr/*"` enables dynamic rdr rules to be setup using the `bastille rdr` command at runtime - eg. bastille rdr tcp 2001 22 # Redirects tcp port 2001 on host to 22 on jail @@ -150,7 +150,7 @@ The `rdr-anchor "rdr/*"` enables dynamic rdr rules to be setup using the bastille rdr clear # Clear dynamic rdr rules Note that if you are redirecting ports where the host is also listening - (eg. ssh) you should make sure that the host service is not listening on + (eg. ssh) you should make sure that the host service is not listening on the cloned interface - eg. for ssh set sshd_flags in rc.conf sshd_flags="-o ListenAddress=" diff --git a/docs/chapters/subcommands/bootstrap.rst b/docs/chapters/subcommands/bootstrap.rst index 1742371e..15fe917f 100644 --- a/docs/chapters/subcommands/bootstrap.rst +++ b/docs/chapters/subcommands/bootstrap.rst @@ -25,7 +25,7 @@ To `bootstrap` a release, run the bootstrap sub-command with the release version as the argument. .. code-block:: shell - + ishmael ~ # bastille bootstrap 11.3-RELEASE [update] ishmael ~ # bastille bootstrap 12.0-RELEASE ishmael ~ # bastille bootstrap 12.1-RELEASE diff --git a/docs/chapters/subcommands/console.rst b/docs/chapters/subcommands/console.rst index ffe90fe2..40aa45c6 100644 --- a/docs/chapters/subcommands/console.rst +++ b/docs/chapters/subcommands/console.rst @@ -9,25 +9,25 @@ root login. ishmael ~ # bastille console folsom [folsom]: FreeBSD 12.1-RELEASE-p1 GENERIC - + Welcome to FreeBSD! - + Release Notes, Errata: https://www.FreeBSD.org/releases/ Security Advisories: https://www.FreeBSD.org/security/ FreeBSD Handbook: https://www.FreeBSD.org/handbook/ FreeBSD FAQ: https://www.FreeBSD.org/faq/ Questions List: https://lists.FreeBSD.org/mailman/listinfo/freebsd-questions/ FreeBSD Forums: https://forums.FreeBSD.org/ - + Documents installed with the system are in the /usr/local/share/doc/freebsd/ directory, or can be installed later with: pkg install en-freebsd-doc For other languages, replace "en" with a language code like de or fr. - + Show the version of FreeBSD installed: freebsd-version ; uname -a Please include that output and any error messages when posting questions. Introduction to manual pages: man man FreeBSD directory layout: man hier - + Edit /etc/motd to change this login announcement. root@folsom:~ # diff --git a/docs/chapters/subcommands/cp.rst b/docs/chapters/subcommands/cp.rst index 890c5438..ad985eb0 100644 --- a/docs/chapters/subcommands/cp.rst +++ b/docs/chapters/subcommands/cp.rst @@ -7,15 +7,15 @@ This command allows efficiently copying files from host to container(s). ishmael ~ # bastille cp ALL /tmp/resolv.conf-cf etc/resolv.conf [bastion]: - + [unbound0]: - + [unbound1]: - + [squid]: - + [nginx]: - + [folsom]: Unless you see errors reported in the output the `cp` was successful. diff --git a/docs/chapters/subcommands/create.rst b/docs/chapters/subcommands/create.rst index 44d4db79..810e6fa4 100644 --- a/docs/chapters/subcommands/create.rst +++ b/docs/chapters/subcommands/create.rst @@ -13,7 +13,7 @@ bootstrapped release and a private (rfc1918) IP address. .. code-block:: shell ishmael ~ # bastille create folsom 11.3-RELEASE 10.17.89.10 [interface] - + RELEASE: 11.3-RELEASE. NAME: folsom. IP: 10.17.89.10. diff --git a/docs/chapters/subcommands/htop.rst b/docs/chapters/subcommands/htop.rst index 40656b6b..d3493be2 100644 --- a/docs/chapters/subcommands/htop.rst +++ b/docs/chapters/subcommands/htop.rst @@ -2,7 +2,7 @@ htop ==== -This one runs `htop` inside the container. +This one runs `htop` inside the container. note: won't work if you don't have htop installed in the container. diff --git a/docs/chapters/subcommands/pkg.rst b/docs/chapters/subcommands/pkg.rst index 90f7afe3..5571c5b7 100644 --- a/docs/chapters/subcommands/pkg.rst +++ b/docs/chapters/subcommands/pkg.rst @@ -23,7 +23,7 @@ To manage binary packages within the container use `bastille pkg`. All repositories are up to date. Updating database digests format: 100% The following 10 package(s) will be affected (of 0 checked): - + New packages to be INSTALLED: vim-console: 8.1.0342 git-lite: 2.19.1 @@ -35,12 +35,12 @@ To manage binary packages within the container use `bastille pkg`. pcre: 8.42 gettext-runtime: 0.19.8.1_1 indexinfo: 0.3.1 - + Number of packages to be installed: 10 - + The process will require 77 MiB more space. 17 MiB to be downloaded. - + Proceed with this action? [y/N]: y [folsom] [1/10] Fetching vim-console-8.1.0342.txz: 100% 5 MiB 5.8MB/s 00:01 [folsom] [2/10] Fetching git-lite-2.19.1.txz: 100% 4 MiB 2.1MB/s 00:02 @@ -77,7 +77,7 @@ To manage binary packages within the container use `bastille pkg`. [folsom] [9/10] Extracting git-lite-2.19.1: 100% [folsom] [10/10] Installing zsh-5.6.2... [folsom] [10/10] Extracting zsh-5.6.2: 100% - + The PKG sub-command can, of course, do more than just `install`. The expectation is that you can fully leverage the pkg manager. This means, @@ -97,7 +97,7 @@ expectation is that you can fully leverage the pkg manager. This means, Processing candidates (1 candidates): 100% Checking integrity... done (0 conflicting) Your packages are up to date. - + [unbound0]: Updating pkg.bastillebsd.org repository catalogue... [unbound0] Fetching meta.txz: 100% 560 B 0.6kB/s 00:01 @@ -109,7 +109,7 @@ expectation is that you can fully leverage the pkg manager. This means, Processing candidates (0 candidates): 100% Checking integrity... done (0 conflicting) Your packages are up to date. - + [unbound1]: Updating pkg.bastillebsd.org repository catalogue... [unbound1] Fetching meta.txz: 100% 560 B 0.6kB/s 00:01 @@ -121,7 +121,7 @@ expectation is that you can fully leverage the pkg manager. This means, Processing candidates (0 candidates): 100% Checking integrity... done (0 conflicting) Your packages are up to date. - + [squid]: Updating pkg.bastillebsd.org repository catalogue... [squid] Fetching meta.txz: 100% 560 B 0.6kB/s 00:01 @@ -133,7 +133,7 @@ expectation is that you can fully leverage the pkg manager. This means, Processing candidates (0 candidates): 100% Checking integrity... done (0 conflicting) Your packages are up to date. - + [nginx]: Updating pkg.bastillebsd.org repository catalogue... [nginx] Fetching meta.txz: 100% 560 B 0.6kB/s 00:01 @@ -144,14 +144,14 @@ expectation is that you can fully leverage the pkg manager. This means, Checking for upgrades (1 candidates): 100% Processing candidates (1 candidates): 100% The following 1 package(s) will be affected (of 0 checked): - + Installed packages to be UPGRADED: nginx-lite: 1.14.0_14,2 -> 1.14.1,2 - + Number of packages to be upgraded: 1 - + 315 KiB to be downloaded. - + Proceed with this action? [y/N]: y [nginx] [1/1] Fetching nginx-lite-1.14.1,2.txz: 100% 315 KiB 322.8kB/s 00:01 Checking integrity... done (0 conflicting) diff --git a/docs/chapters/subcommands/rdr.rst b/docs/chapters/subcommands/rdr.rst index 5ee2cd6a..e96ebc30 100644 --- a/docs/chapters/subcommands/rdr.rst +++ b/docs/chapters/subcommands/rdr.rst @@ -3,12 +3,12 @@ rdr === `bastille rdr` allows you to configure dynamic rdr rules for your containers -without modifying pf.conf (assuming you are using the `bastille0` interface -for a private network and have enabled `rdr-anchor 'rdr/*'` in /etc/pf.conf +without modifying pf.conf (assuming you are using the `bastille0` interface +for a private network and have enabled `rdr-anchor 'rdr/*'` in /etc/pf.conf as described in the Networking section). -Note: you need to be careful if host services are configured to run -on all interfaces as this will include the jail interface - you should +Note: you need to be careful if host services are configured to run +on all interfaces as this will include the jail interface - you should sepcify the interface they run on in rc.conf (or other config files) .. code-block:: shell @@ -24,5 +24,3 @@ sepcify the interface they run on in rc.conf (or other config files) rdr on em0 inet proto udp from any to any port = 2053 -> 10.17.89.1 port 53 # bastille rdr dev1 clear nat cleared - - diff --git a/docs/chapters/subcommands/restart.rst b/docs/chapters/subcommands/restart.rst index 8ec5d9aa..2f6bf52a 100644 --- a/docs/chapters/subcommands/restart.rst +++ b/docs/chapters/subcommands/restart.rst @@ -8,6 +8,6 @@ To restart a container you can use the `bastille restart` command. ishmael ~ # bastille restart folsom [folsom]: folsom: removed - + [folsom]: folsom: created diff --git a/docs/chapters/subcommands/top.rst b/docs/chapters/subcommands/top.rst index ed64ca4c..16df8682 100644 --- a/docs/chapters/subcommands/top.rst +++ b/docs/chapters/subcommands/top.rst @@ -2,7 +2,7 @@ top === -This one runs `top` in that container. +This one runs `top` in that container. .. image:: ../../images/top.png diff --git a/docs/chapters/subcommands/update.rst b/docs/chapters/subcommands/update.rst index ee64d7be..c5a179cb 100644 --- a/docs/chapters/subcommands/update.rst +++ b/docs/chapters/subcommands/update.rst @@ -16,7 +16,7 @@ If no updates are available, a message will be shown: Fetching metadata index... done. Inspecting system... done. Preparing to download files... done. - + No updates needed to update system to 11.2-RELEASE-p4. No updates are available to install. @@ -34,7 +34,7 @@ The older the release, however, the more updates will be available: Fetching 2 metadata files... done. Inspecting system... done. Preparing to download files... done. - + The following files will be added as part of updating to 10.4-RELEASE-p13: ...[snip]... diff --git a/docs/chapters/subcommands/upgrade.rst b/docs/chapters/subcommands/upgrade.rst index af917c09..cf35e595 100644 --- a/docs/chapters/subcommands/upgrade.rst +++ b/docs/chapters/subcommands/upgrade.rst @@ -8,4 +8,3 @@ workflow this can be similar to a `bootstrap`. .. code-block:: shell ishmael ~ # bastille upgrade 11.2-RELEASE 12.0-RELEASE - diff --git a/docs/chapters/targeting.rst b/docs/chapters/targeting.rst index 138e0a07..6bf6bb14 100644 --- a/docs/chapters/targeting.rst +++ b/docs/chapters/targeting.rst @@ -25,23 +25,23 @@ Examples: Containers | command | target | args | description | +===========+========+==================+=============================================================+ | cmd | ALL | 'sockstat -4' | execute `sockstat -4` in ALL containers (ip4 sockets) | -+-----------+--------+-----+------------+-------------------------------------------------------------+ ++-----------+--------+-----+------------+-------------------------------------------------------------+ | console | mariadb02 | --- | console (shell) access to mariadb02 | -+----+------+----+---------+------------+--------------+----------------------------------------------+ ++----+------+----+---------+------------+--------------+----------------------------------------------+ | pkg | web01 | 'install nginx' | install nginx package in web01 container | +-----------+--------+------------------+-------------------------------------------------------------+ | pkg | ALL | upgrade | upgrade packages in ALL containers | -+-----------+--------+------------------+-------------------------------------------------------------+ ++-----------+--------+------------------+-------------------------------------------------------------+ | pkg | ALL | audit | (CVE) audit packages in ALL containers | -+-----------+--------+------------------+-------------------------------------------------------------+ ++-----------+--------+------------------+-------------------------------------------------------------+ | sysrc | web01 | nginx_enable=YES | execute `sysrc nginx_enable=YES` in web01 container | -+-----------+--------+------------------+-------------------------------------------------------------+ ++-----------+--------+------------------+-------------------------------------------------------------+ | template | ALL | username/base | apply `username/base` template to ALL containers | -+-----------+--------+------------------+-------------------------------------------------------------+ ++-----------+--------+------------------+-------------------------------------------------------------+ | start | web02 | --- | start web02 container | -+-----------+--------+-----+------------+-------------------------------------------------------------+ ++-----------+--------+-----+------------+-------------------------------------------------------------+ | cp | bastion03 | /tmp/resolv.conf-cf etc/resolv.conf | copy host-path to container-path in bastion03| -+----+------+----+---+------------------+--------------+----------------------------------------------+ ++----+------+----+---+------------------+--------------+----------------------------------------------+ | create | folsom | 12.0-RELEASE 10.17.89.10 | create 12.0 container named `folsom` with IP | +-----------+--------+------------------+--------------+----------------------------------------------+ @@ -57,10 +57,10 @@ Examples: Releases | command | target | args | description | +===========+==============+==============+=============================================================+ | bootstrap | 12.0-RELEASE | --- | bootstrap 12.0-RELEASE release | -+-----------+--------------+--------------+-------------------------------------------------------------+ ++-----------+--------------+--------------+-------------------------------------------------------------+ | update | 11.3-RELEASE | --- | update 11.2-RELEASE release | -+-----------+--------------+--------------+-------------------------------------------------------------+ ++-----------+--------------+--------------+-------------------------------------------------------------+ | upgrade | 11.2-RELEASE | 11.3-RELEASE | update 11.2-RELEASE release | -+-----------+--------------+--------------+-------------------------------------------------------------+ ++-----------+--------------+--------------+-------------------------------------------------------------+ | verify | 11.3-RELEASE | --- | update 11.2-RELEASE release | -+-----------+--------------+--------------+-------------------------------------------------------------+ ++-----------+--------------+--------------+-------------------------------------------------------------+ diff --git a/docs/chapters/template.rst b/docs/chapters/template.rst index ca987bb6..21adcb9d 100644 --- a/docs/chapters/template.rst +++ b/docs/chapters/template.rst @@ -115,7 +115,7 @@ directory names in the `bastille/templates` directory. Executing final command(s). chsh: user information updated Template Complete. - + [web01]: Copying files... Copy complete. @@ -143,4 +143,3 @@ directory names in the `bastille/templates` directory. Executing final command(s). chsh: user information updated Template Complete. - diff --git a/docs/chapters/usage.rst b/docs/chapters/usage.rst index bb131315..8e97eb9b 100644 --- a/docs/chapters/usage.rst +++ b/docs/chapters/usage.rst @@ -6,10 +6,10 @@ Usage ishmael ~ # bastille -h Bastille is an open-source system for automating deployment and management of containerized applications on FreeBSD. - + Usage: bastille command [ALL|glob] [args] - + Available Commands: bootstrap Bootstrap a FreeBSD release for container base. cmd Execute arbitrary command on targeted container(s). @@ -32,6 +32,6 @@ Usage upgrade Upgrade container release to X.Y-RELEASE. verify Compare release against a "known good" index. zfs Manage (get|set) zfs attributes on targeted container(s). - + Use "bastille -v|--version" for version information. Use "bastille command -h|--help" for more information about a command. diff --git a/usr/local/bin/bastille b/usr/local/bin/bastille index 18c9d11d..fa2f59d9 100755 --- a/usr/local/bin/bastille +++ b/usr/local/bin/bastille @@ -2,21 +2,21 @@ # # Copyright (c) 2018-2020, Christer Edwards # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: -# +# # * Redistributions of source code must retain the above copyright notice, this # list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * Neither the name of the copyright holder nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE diff --git a/usr/local/share/bastille/bootstrap.sh b/usr/local/share/bastille/bootstrap.sh index 8035afdc..ad2eb3e1 100644 --- a/usr/local/share/bastille/bootstrap.sh +++ b/usr/local/share/bastille/bootstrap.sh @@ -1,22 +1,22 @@ #!/bin/sh -# +# # Copyright (c) 2018-2020, Christer Edwards # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: -# +# # * Redistributions of source code must retain the above copyright notice, this # list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * Neither the name of the copyright holder nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE diff --git a/usr/local/share/bastille/cmd.sh b/usr/local/share/bastille/cmd.sh index f708acc7..5896f0d0 100644 --- a/usr/local/share/bastille/cmd.sh +++ b/usr/local/share/bastille/cmd.sh @@ -1,22 +1,22 @@ #!/bin/sh -# +# # Copyright (c) 2018-2020, Christer Edwards # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: -# +# # * Redistributions of source code must retain the above copyright notice, this # list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * Neither the name of the copyright holder nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE diff --git a/usr/local/share/bastille/colors.pre.sh b/usr/local/share/bastille/colors.pre.sh index b1d7d013..0d561420 100644 --- a/usr/local/share/bastille/colors.pre.sh +++ b/usr/local/share/bastille/colors.pre.sh @@ -1,8 +1,8 @@ #!/bin/sh -# +# # Copyright (c) 2014-2015 Bryan Drewery # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: @@ -11,7 +11,7 @@ # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. -# +# # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/usr/local/share/bastille/console.sh b/usr/local/share/bastille/console.sh index 897003f4..0ae545b5 100644 --- a/usr/local/share/bastille/console.sh +++ b/usr/local/share/bastille/console.sh @@ -1,22 +1,22 @@ #!/bin/sh -# +# # Copyright (c) 2018-2020, Christer Edwards # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: -# +# # * Redistributions of source code must retain the above copyright notice, this # list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * Neither the name of the copyright holder nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE diff --git a/usr/local/share/bastille/convert.sh b/usr/local/share/bastille/convert.sh index 3cb59beb..bfe22166 100644 --- a/usr/local/share/bastille/convert.sh +++ b/usr/local/share/bastille/convert.sh @@ -1,22 +1,22 @@ #!/bin/sh -# +# # Copyright (c) 2018-2020, Christer Edwards # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: -# +# # * Redistributions of source code must retain the above copyright notice, this # list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * Neither the name of the copyright holder nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE diff --git a/usr/local/share/bastille/cp.sh b/usr/local/share/bastille/cp.sh index 92681fba..b56f955c 100644 --- a/usr/local/share/bastille/cp.sh +++ b/usr/local/share/bastille/cp.sh @@ -1,22 +1,22 @@ #!/bin/sh -# +# # Copyright (c) 2018-2020, Christer Edwards # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: -# +# # * Redistributions of source code must retain the above copyright notice, this # list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * Neither the name of the copyright holder nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE diff --git a/usr/local/share/bastille/create.sh b/usr/local/share/bastille/create.sh index cb22afad..0b80ff7c 100644 --- a/usr/local/share/bastille/create.sh +++ b/usr/local/share/bastille/create.sh @@ -1,22 +1,22 @@ #!/bin/sh -# +# # Copyright (c) 2018-2020, Christer Edwards # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: -# +# # * Redistributions of source code must retain the above copyright notice, this # list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * Neither the name of the copyright holder nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -226,7 +226,7 @@ create_jail() { local bastille_jail_conf_interface=${INTERFACE} fi - ## generate the jail configuration file + ## generate the jail configuration file if [ -n "${VNET_JAIL}" ]; then generate_vnet_jail_conf else @@ -276,7 +276,7 @@ create_jail() { if [ -n "${bastille_zfs_zpool}" ]; then ## perform release base replication - ## sane bastille zfs options + ## sane bastille zfs options ZFS_OPTIONS=$(echo ${bastille_zfs_options} | sed 's/-o//g') ## take a temp snapshot of the base release diff --git a/usr/local/share/bastille/destroy.sh b/usr/local/share/bastille/destroy.sh index dc35fedf..f6aabc99 100644 --- a/usr/local/share/bastille/destroy.sh +++ b/usr/local/share/bastille/destroy.sh @@ -1,22 +1,22 @@ #!/bin/sh -# +# # Copyright (c) 2018-2020, Christer Edwards # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: -# +# # * Redistributions of source code must retain the above copyright notice, this # list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * Neither the name of the copyright holder nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE diff --git a/usr/local/share/bastille/export.sh b/usr/local/share/bastille/export.sh index 1da1cd10..7b7d5de8 100644 --- a/usr/local/share/bastille/export.sh +++ b/usr/local/share/bastille/export.sh @@ -1,22 +1,22 @@ #!/bin/sh -# +# # Copyright (c) 2018-2020, Christer Edwards # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: -# +# # * Redistributions of source code must retain the above copyright notice, this # list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * Neither the name of the copyright holder nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE diff --git a/usr/local/share/bastille/htop.sh b/usr/local/share/bastille/htop.sh index 0af8f2d5..0d154dce 100644 --- a/usr/local/share/bastille/htop.sh +++ b/usr/local/share/bastille/htop.sh @@ -1,22 +1,22 @@ #!/bin/sh -# +# # Copyright (c) 2018-2020, Christer Edwards # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: -# +# # * Redistributions of source code must retain the above copyright notice, this # list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * Neither the name of the copyright holder nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE diff --git a/usr/local/share/bastille/import.sh b/usr/local/share/bastille/import.sh index 5742b5ad..2f7fbb1a 100644 --- a/usr/local/share/bastille/import.sh +++ b/usr/local/share/bastille/import.sh @@ -1,22 +1,22 @@ #!/bin/sh -# +# # Copyright (c) 2018-2020, Christer Edwards # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: -# +# # * Redistributions of source code must retain the above copyright notice, this # list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * Neither the name of the copyright holder nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -471,7 +471,7 @@ fi # Check if archive exist then trim archive name if [ -f "${bastille_backupsdir}/${TARGET}" ]; then - # Filter unsupported/unknown archives + # Filter unsupported/unknown archives if echo "${TARGET}" | grep -q '_[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}-[0-9]\{6\}.xz$\|_[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}-[0-9]\{6\}.txz$\|_[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}.zip$\|-[0-9]\{12\}.[0-9]\{2\}.tar.gz$\|@[0-9]\{12\}.[0-9]\{2\}.tar$'; then if ls "${bastille_backupsdir}" | awk "/^${TARGET}$/" >/dev/null; then TARGET_TRIM=$(echo "${TARGET}" | sed "s/_[0-9]*-[0-9]*-[0-9]*-[0-9]*.xz//;s/_[0-9]*-[0-9]*-[0-9]*-[0-9]*.txz//;s/_[0-9]*-[0-9]*-[0-9]*.zip//;s/-[0-9]\{12\}.[0-9]\{2\}.tar.gz//;s/@[0-9]\{12\}.[0-9]\{2\}.tar//") diff --git a/usr/local/share/bastille/limits.sh b/usr/local/share/bastille/limits.sh index 483a0341..a8f7ad00 100644 --- a/usr/local/share/bastille/limits.sh +++ b/usr/local/share/bastille/limits.sh @@ -1,23 +1,23 @@ #!/bin/sh -# +# # Copyright (c) 2018-2020, Christer Edwards # All rights reserved. # Ressource limits added by Sven R github.com/hackacad -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: -# +# # * Redistributions of source code must retain the above copyright notice, this # list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * Neither the name of the copyright holder nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE diff --git a/usr/local/share/bastille/list.sh b/usr/local/share/bastille/list.sh index 28685096..dc6a4043 100644 --- a/usr/local/share/bastille/list.sh +++ b/usr/local/share/bastille/list.sh @@ -1,22 +1,22 @@ #!/bin/sh -# +# # Copyright (c) 2018-2020, Christer Edwards # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: -# +# # * Redistributions of source code must retain the above copyright notice, this # list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * Neither the name of the copyright holder nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE diff --git a/usr/local/share/bastille/pkg.sh b/usr/local/share/bastille/pkg.sh index 4651cbec..6904fb1d 100644 --- a/usr/local/share/bastille/pkg.sh +++ b/usr/local/share/bastille/pkg.sh @@ -1,22 +1,22 @@ #!/bin/sh -# +# # Copyright (c) 2018-2020, Christer Edwards # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: -# +# # * Redistributions of source code must retain the above copyright notice, this # list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * Neither the name of the copyright holder nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE diff --git a/usr/local/share/bastille/rdr.sh b/usr/local/share/bastille/rdr.sh index 9c4ebfed..cda32380 100644 --- a/usr/local/share/bastille/rdr.sh +++ b/usr/local/share/bastille/rdr.sh @@ -1,19 +1,19 @@ #!/bin/sh -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: -# +# # * Redistributions of source code must retain the above copyright notice, this # list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * Neither the name of the copyright holder nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -94,7 +94,7 @@ while [ $# -gt 0 ]; do if [ $# -lt 3 ]; then usage fi - ( pfctl -a "rdr/${JAIL_NAME}" -Psn; + ( pfctl -a "rdr/${JAIL_NAME}" -Psn; printf '%s\nrdr on $ext_if inet proto tcp to port %d -> %s port %d\n' "$EXT_IF" "$2" "$JAIL_IP" "$3" ) \ | pfctl -a "rdr/${JAIL_NAME}" -f- shift 3 @@ -103,7 +103,7 @@ while [ $# -gt 0 ]; do if [ $# -lt 3 ]; then usage fi - ( pfctl -a "rdr/${JAIL_NAME}" -Psn; + ( pfctl -a "rdr/${JAIL_NAME}" -Psn; printf '%s\nrdr on $ext_if inet proto udp to port %d -> %s port %d\n' "$EXT_IF" "$2" "$JAIL_IP" "$3" ) \ | pfctl -a "rdr/${JAIL_NAME}" -f- shift 3 diff --git a/usr/local/share/bastille/rename.sh b/usr/local/share/bastille/rename.sh index 7e9a89b7..c4645f86 100644 --- a/usr/local/share/bastille/rename.sh +++ b/usr/local/share/bastille/rename.sh @@ -1,22 +1,22 @@ #!/bin/sh -# +# # Copyright (c) 2018-2020, Christer Edwards # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: -# +# # * Redistributions of source code must retain the above copyright notice, this # list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * Neither the name of the copyright holder nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE diff --git a/usr/local/share/bastille/restart.sh b/usr/local/share/bastille/restart.sh index 114f19ce..5e42df3c 100644 --- a/usr/local/share/bastille/restart.sh +++ b/usr/local/share/bastille/restart.sh @@ -1,22 +1,22 @@ #!/bin/sh -# +# # Copyright (c) 2018-2020, Christer Edwards # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: -# +# # * Redistributions of source code must retain the above copyright notice, this # list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * Neither the name of the copyright holder nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE diff --git a/usr/local/share/bastille/service.sh b/usr/local/share/bastille/service.sh index 4a20ac58..d84930ef 100644 --- a/usr/local/share/bastille/service.sh +++ b/usr/local/share/bastille/service.sh @@ -1,22 +1,22 @@ #!/bin/sh -# +# # Copyright (c) 2018-2020, Christer Edwards # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: -# +# # * Redistributions of source code must retain the above copyright notice, this # list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * Neither the name of the copyright holder nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE diff --git a/usr/local/share/bastille/start.sh b/usr/local/share/bastille/start.sh index 46a6f1b0..4e580bfb 100644 --- a/usr/local/share/bastille/start.sh +++ b/usr/local/share/bastille/start.sh @@ -1,22 +1,22 @@ #!/bin/sh -# +# # Copyright (c) 2018-2020, Christer Edwards # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: -# +# # * Redistributions of source code must retain the above copyright notice, this # list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * Neither the name of the copyright holder nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE diff --git a/usr/local/share/bastille/stop.sh b/usr/local/share/bastille/stop.sh index 3c0cb45c..655f4dc9 100644 --- a/usr/local/share/bastille/stop.sh +++ b/usr/local/share/bastille/stop.sh @@ -1,22 +1,22 @@ #!/bin/sh -# +# # Copyright (c) 2018-2020, Christer Edwards # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: -# +# # * Redistributions of source code must retain the above copyright notice, this # list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * Neither the name of the copyright holder nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE diff --git a/usr/local/share/bastille/sysrc.sh b/usr/local/share/bastille/sysrc.sh index 40780a19..dbf1e49d 100644 --- a/usr/local/share/bastille/sysrc.sh +++ b/usr/local/share/bastille/sysrc.sh @@ -1,22 +1,22 @@ #!/bin/sh -# +# # Copyright (c) 2018-2020, Christer Edwards # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: -# +# # * Redistributions of source code must retain the above copyright notice, this # list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * Neither the name of the copyright holder nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE diff --git a/usr/local/share/bastille/template.sh b/usr/local/share/bastille/template.sh index 6535cd11..27997d29 100644 --- a/usr/local/share/bastille/template.sh +++ b/usr/local/share/bastille/template.sh @@ -1,22 +1,22 @@ #!/bin/sh -# +# # Copyright (c) 2018-2020, Christer Edwards # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: -# +# # * Redistributions of source code must retain the above copyright notice, this # list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * Neither the name of the copyright holder nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -73,7 +73,7 @@ fi ## global variables bastille_template=${bastille_templatesdir}/${TEMPLATE} for _jail in ${JAILS}; do - ## jail-specific variables. + ## jail-specific variables. bastille_jail_path=$(jls -j "${_jail}" path) echo -e "${COLOR_GREEN}[${_jail}]:${COLOR_RESET}" diff --git a/usr/local/share/bastille/top.sh b/usr/local/share/bastille/top.sh index 6b1cc7ec..db5f30ce 100644 --- a/usr/local/share/bastille/top.sh +++ b/usr/local/share/bastille/top.sh @@ -1,22 +1,22 @@ #!/bin/sh -# +# # Copyright (c) 2018-2020, Christer Edwards # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: -# +# # * Redistributions of source code must retain the above copyright notice, this # list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * Neither the name of the copyright holder nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE diff --git a/usr/local/share/bastille/update.sh b/usr/local/share/bastille/update.sh index 5ff3fe1c..aba963a7 100644 --- a/usr/local/share/bastille/update.sh +++ b/usr/local/share/bastille/update.sh @@ -1,22 +1,22 @@ #!/bin/sh -# +# # Copyright (c) 2018-2020, Christer Edwards # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: -# +# # * Redistributions of source code must retain the above copyright notice, this # list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * Neither the name of the copyright holder nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE diff --git a/usr/local/share/bastille/upgrade.sh b/usr/local/share/bastille/upgrade.sh index 9441bdc6..f597c454 100644 --- a/usr/local/share/bastille/upgrade.sh +++ b/usr/local/share/bastille/upgrade.sh @@ -1,22 +1,22 @@ #!/bin/sh -# +# # Copyright (c) 2018-2020, Christer Edwards # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: -# +# # * Redistributions of source code must retain the above copyright notice, this # list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * Neither the name of the copyright holder nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE diff --git a/usr/local/share/bastille/verify.sh b/usr/local/share/bastille/verify.sh index befc574f..c2dc6d19 100644 --- a/usr/local/share/bastille/verify.sh +++ b/usr/local/share/bastille/verify.sh @@ -1,22 +1,22 @@ #!/bin/sh -# +# # Copyright (c) 2018-2020, Christer Edwards # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: -# +# # * Redistributions of source code must retain the above copyright notice, this # list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * Neither the name of the copyright holder nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE diff --git a/usr/local/share/bastille/zfs.sh b/usr/local/share/bastille/zfs.sh index 419def1b..b6b49083 100644 --- a/usr/local/share/bastille/zfs.sh +++ b/usr/local/share/bastille/zfs.sh @@ -1,22 +1,22 @@ #!/bin/sh -# +# # Copyright (c) 2018-2020, Christer Edwards # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: -# +# # * Redistributions of source code must retain the above copyright notice, this # list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright notice, # this list of conditions and the following disclaimer in the documentation # and/or other materials provided with the distribution. -# +# # * Neither the name of the copyright holder nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE