From 841486535526a3b2ad293b59c6624daba6b2a85d Mon Sep 17 00:00:00 2001
From: Christer Edwards <christer.edwards@gmail.com>
Date: Thu, 28 Nov 2019 09:21:13 -0700
Subject: [PATCH] 0.5.20191128 release

---
 Makefile                       | 21 +++++++++++++++++++++
 README.md                      | 12 ++++++++----
 docs/chapters/installation.rst | 16 +++++++++++++++-
 docs/chapters/networking.rst   |  8 ++++----
 docs/conf.py                   |  4 ++--
 usr/local/bin/bastille         |  2 +-
 6 files changed, 51 insertions(+), 12 deletions(-)
 create mode 100644 Makefile

diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..43aba9db
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,21 @@
+.PHONY: install
+install:
+	@echo "Installing Bastille"
+	@echo
+	@cp -av usr /
+	@echo
+	@echo "This method is for testing / development."
+
+.PHONY: uninstall
+uninstall:
+	@echo "Removing Bastille command"
+	@rm -vf /usr/local/bin/bastille
+	@echo
+	@echo "Removing Bastille sub-commands"
+	@rm -rvf /usr/local/share/bastille
+	@echo
+	@echo "removing configuration file"
+	@rm -rvf /usr/local/etc/bastille
+	@echo
+	@echo "removing startup script"
+	@rm -vf /usr/local/etc/rc.d/bastille
diff --git a/README.md b/README.md
index 110b8c55..e3d37976 100644
--- a/README.md
+++ b/README.md
@@ -21,12 +21,18 @@ portsnap fetch auto
 make -C /usr/ports/sysutils/bastille install clean
 ```
 
+**Git**
+```shell
+git clone https://github.com/BastilleBSD/bastille.git
+cd bastille
+make install
+```
+
 **enable at boot**
 ```shell
 sysrc bastille_enable=YES
 ```
 
-
 Basic Usage
 -----------
 ```shell
@@ -64,12 +70,10 @@ Use "bastille command -h|--help" for more information about a command.
 
 ```
 
-
 ## 0.5-beta
 This document outlines the basic usage of the Bastille container management
 framework. This release is still considered beta.
 
-
 Network Requirements
 ====================
 Several networking options can be performed regarding the user needs.  Basic
@@ -106,8 +110,8 @@ ext_if="vtnet0"
 
 set block-policy return
 scrub in on $ext_if all fragment reassemble
-
 set skip on lo
+
 table <jails> persist
 nat on $ext_if from <jails> to any -> ($ext_if)
 
diff --git a/docs/chapters/installation.rst b/docs/chapters/installation.rst
index 21bbf367..9b4f9023 100644
--- a/docs/chapters/installation.rst
+++ b/docs/chapters/installation.rst
@@ -4,7 +4,7 @@ Bastille is available in the official FreeBSD ports tree at
 `sysutils/bastille`. Binary packages available in `quarterly` and `latest`
 repositories.
 
-Current version is `0.5.20191125`.
+Current version is `0.5.20191128`.
 
 To install from the FreeBSD package repository:
 
@@ -28,3 +28,17 @@ ports
 .. code-block:: shell
 
   make -C /usr/ports/sysutils/bastille install clean
+
+
+GIT
+---
+
+.. code-block:: shell
+
+  git clone https://github.com/BastilleBSD/bastille.git
+  cd bastille
+  make install
+
+This method will install the latest files from GitHub directly onto your
+system. It is verbose about the files it installs (for later removal), and also
+has a `make uninstall` target.
diff --git a/docs/chapters/networking.rst b/docs/chapters/networking.rst
index 48c2f258..90f9f222 100644
--- a/docs/chapters/networking.rst
+++ b/docs/chapters/networking.rst
@@ -81,7 +81,6 @@ First, create the loopback interface:
   ishmael ~ # sysrc cloned_interfaces+=lo1
   ishmael ~ # sysrc ifconfig_lo1_name="bastille0"
   ishmael ~ # service netif cloneup
-  ishmael ~ # ifconfig bastille0 inet 10.17.89.10
 
 Second, enable the firewall:
 
@@ -99,9 +98,10 @@ Create the firewall rules:
   
   set block-policy return
   scrub in on $ext_if all fragment reassemble
-  
   set skip on lo
-  nat on $ext_if from bastille0:network to any -> ($ext_if)
+
+  table <jails> persist
+  nat on $ext_if from <jails> to any -> ($ext_if)
   
   ## rdr example
   ## rdr pass inet proto tcp from any to any port {80, 443} -> 10.17.89.45
@@ -119,7 +119,7 @@ to containers are:
 
 .. code-block:: shell
 
-  nat on $ext_if from bastille0:network to any -> ($ext_if)
+  nat on $ext_if from <jails> to any -> ($ext_if)
   
   ## rdr example
   ## rdr pass inet proto tcp from any to any port {80, 443} -> 10.17.89.45
diff --git a/docs/conf.py b/docs/conf.py
index 51417dca..296dde63 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -12,9 +12,9 @@
 author = 'Christer Edwards'
 
 # The short X.Y version
-version = '0.5.20191125'
+version = '0.5.20191128'
 # The full version, including alpha/beta/rc tags
-release = '0.5.20191125-beta'
+release = '0.5.20191128-beta'
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/usr/local/bin/bastille b/usr/local/bin/bastille
index 0aff4846..67c3a2b1 100755
--- a/usr/local/bin/bastille
+++ b/usr/local/bin/bastille
@@ -69,7 +69,7 @@ bastille_perms_check
 . /usr/local/etc/bastille/bastille.conf
 
 ## version
-BASTILLE_VERSION="0.5.20191125"
+BASTILLE_VERSION="0.5.20191128"
 
 usage() {
     cat << EOF