Merge pull request #201 from mariusvw/hotfix/whitespace

Hotfix/whitespace
This commit is contained in:
Christer Edwards
2020-04-14 08:46:31 -06:00
committed by GitHub
48 changed files with 268 additions and 275 deletions
+22 -23
View File
@@ -5,32 +5,31 @@
Christer Edwards [christer.edwards@gmail.com] Christer Edwards [christer.edwards@gmail.com]
## Contributors (code) ## Contributors (code)
- Barry McCormick
Barry McCormick - Brian Downs
Brian Downs - Dave Cottlehuber
Dave Cottlehuber - Giacomo Olgeni
Giacomo Olgeni - JP Mens
JP Mens - Jose Rivera
Jose Rivera - Lars E.
Lars E. - Paul C.
Paul C. - Sven R.
Sven R.
### Special thanks ### Special thanks
Software doesn't happen in a vacuum. Thank you to the following people who may Software doesn't happen in a vacuum. Thank you to the following people who may
not be found in the commit history but have influenced Bastille's development not be found in the commit history but have influenced Bastille's development
in some way. in some way.
Carlos Meza - Carlos Meza
Casandra Woodcox - Casandra Woodcox
Clint Savage - Clint Savage
G. Clifford Williams - G. Clifford Williams
Jack Thomasson - Jack Thomasson
Jun C Park - Jun C Park
Justin Desilets - Justin Desilets
Larry Raab - Larry Raab
Nate Taylor - Nate Taylor
Peter Czanik - Peter Czanik
Ryan Simpkins - Ryan Simpkins
Tim Gelter - Tim Gelter
Trevor Sharpe - Trevor Sharpe
-1
View File
@@ -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 available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
[homepage]: https://www.contributor-covenant.org [homepage]: https://www.contributor-covenant.org
-1
View File
@@ -206,4 +206,3 @@ cases.
3 Network secure mode - same as highly secure mode, plus IP packet 3 Network secure mode - same as highly secure mode, plus IP packet
filter rules (see ipfw(8), ipfirewall(4) and pfctl(8)) cannot be filter rules (see ipfw(8), ipfirewall(4) and pfctl(8)) cannot be
changed and dummynet(4) or pf(4) configuration cannot be adjusted. changed and dummynet(4) or pf(4) configuration cannot be adjusted.
-2
View File
@@ -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 rdr on em0 inet proto udp from any to any port = 2053 -> 10.17.89.1 port 53
# bastille rdr dev1 clear # bastille rdr dev1 clear
nat cleared nat cleared
-1
View File
@@ -8,4 +8,3 @@ workflow this can be similar to a `bootstrap`.
.. code-block:: shell .. code-block:: shell
ishmael ~ # bastille upgrade 11.2-RELEASE 12.0-RELEASE ishmael ~ # bastille upgrade 11.2-RELEASE 12.0-RELEASE
-1
View File
@@ -143,4 +143,3 @@ directory names in the `bastille/templates` directory.
Executing final command(s). Executing final command(s).
chsh: user information updated chsh: user information updated
Template Complete. Template Complete.