From 0d7c3ab8585a8a84824bcdc6d75122d5ba7a3c72 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Mon, 24 Feb 2020 14:35:03 +0100
Subject: [PATCH 001/147] Plex install script

---
 plex.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 plex.sh

diff --git a/plex.sh b/plex.sh
new file mode 100644
index 00000000..9c426637
--- /dev/null
+++ b/plex.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+echo '{"pkgs":["plexmediaserver-plexpass","ca_root_nss"]}' > /tmp/pkg.json
+iocage create -n "plex" -p /tmp/pkg.json -r 11.3-RELEASE ip4_addr="vnet0|192.168.10.23/24" defaultrouter="192.168.10.1" vnet="on" allow_raw_sockets="1" boot="on"
+rm /tmp/pkg.json
+iocage exec plex mkdir -p /config
+iocage exec plex mkdir -p /mnt/library
+iocage fstab -a plex /mnt/tank/apps/plex /config nullfs rw 0 0
+iocage fstab -a plex /mnt/tank/Library /mnt/library nullfs ro 0 0
+iocage exec plex chown -R plex:plex /config
+iocage exec plex sysrc "plexmediaserver_plexpass_enable=YES"
+iocage exec plex sysrc plexmediaserver_plexpass_support_path="/config"
+iocage exec plex service plexmediaserver_plexpass start
\ No newline at end of file

From 0ed29b36883197392f5db907e8cddafcabdad7db Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Mon, 24 Feb 2020 14:38:04 +0100
Subject: [PATCH 002/147] make executable

---
 plex.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 plex.sh

diff --git a/plex.sh b/plex.sh
old mode 100644
new mode 100755

From 2739b39073d4921b68ada8fe409dac9570fd9062 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Mon, 24 Feb 2020 14:45:03 +0100
Subject: [PATCH 003/147] add plex update

---
 FreeBSD.conf | 3 +++
 plex.sh      | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 FreeBSD.conf

diff --git a/FreeBSD.conf b/FreeBSD.conf
new file mode 100644
index 00000000..7c0472ec
--- /dev/null
+++ b/FreeBSD.conf
@@ -0,0 +1,3 @@
+FreeBSD: {
+    url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest"
+}
\ No newline at end of file
diff --git a/plex.sh b/plex.sh
index 9c426637..16c01ac8 100755
--- a/plex.sh
+++ b/plex.sh
@@ -1,8 +1,10 @@
 #!/bin/sh
 
-echo '{"pkgs":["plexmediaserver-plexpass","ca_root_nss"]}' > /tmp/pkg.json
+echo '{"pkgs":["plexmediaserver-plexpass","ca_root_nss","nano"]}' > /tmp/pkg.json
 iocage create -n "plex" -p /tmp/pkg.json -r 11.3-RELEASE ip4_addr="vnet0|192.168.10.23/24" defaultrouter="192.168.10.1" vnet="on" allow_raw_sockets="1" boot="on"
 rm /tmp/pkg.json
+iocage exec plex "mkdir -p /usr/local/etc/pkg/repos"
+cp ./FreeBSD.conf /mnt/tank/iocage/jails/plex/root/usr/local/etc/pkg/repos/FreeBSD.conf
 iocage exec plex mkdir -p /config
 iocage exec plex mkdir -p /mnt/library
 iocage fstab -a plex /mnt/tank/apps/plex /config nullfs rw 0 0
@@ -10,4 +12,6 @@ iocage fstab -a plex /mnt/tank/Library /mnt/library nullfs ro 0 0
 iocage exec plex chown -R plex:plex /config
 iocage exec plex sysrc "plexmediaserver_plexpass_enable=YES"
 iocage exec plex sysrc plexmediaserver_plexpass_support_path="/config"
+iocage exec plex pkg update
+iocage exec plex pkg upgrade
 iocage exec plex service plexmediaserver_plexpass start
\ No newline at end of file

From 51ed8edcf8f9ddad0a038292ec6803d2a53ff788 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Mon, 24 Feb 2020 15:49:54 +0100
Subject: [PATCH 004/147] add chmod plex folder

---
 plex.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plex.sh b/plex.sh
index 16c01ac8..fe48427a 100755
--- a/plex.sh
+++ b/plex.sh
@@ -14,4 +14,5 @@ iocage exec plex sysrc "plexmediaserver_plexpass_enable=YES"
 iocage exec plex sysrc plexmediaserver_plexpass_support_path="/config"
 iocage exec plex pkg update
 iocage exec plex pkg upgrade
+iocage exec plex chown -R plex:plex /usr/local/share/plexmediaserver-plexpass/
 iocage exec plex service plexmediaserver_plexpass start
\ No newline at end of file

From 0d1af41bb9b2ad503c29d506d3b993a9656e81f9 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Mon, 24 Feb 2020 16:00:03 +0100
Subject: [PATCH 005/147] prepare organizr, move conf files to folders, add yes
 to pkg commands

---
 organizr-conf/nginx.conf               | 30 ++++++++++++++++++++++++++
 organizr.sh                            | 21 ++++++++++++++++++
 FreeBSD.conf => plex-conf/FreeBSD.conf |  0
 plex.sh                                |  6 +++---
 4 files changed, 54 insertions(+), 3 deletions(-)
 create mode 100644 organizr-conf/nginx.conf
 create mode 100644 organizr.sh
 rename FreeBSD.conf => plex-conf/FreeBSD.conf (100%)

diff --git a/organizr-conf/nginx.conf b/organizr-conf/nginx.conf
new file mode 100644
index 00000000..cb049500
--- /dev/null
+++ b/organizr-conf/nginx.conf
@@ -0,0 +1,30 @@
+user www;
+worker_processes 1;
+events {
+worker_connections 1024;
+}
+http {
+include mime.types;
+default_type application/octet-stream;
+sendfile on;
+keepalive_timeout 65;
+server {
+listen 80;
+server_name localhost;
+root /usr/local/www/Organizr;
+location / {
+index index.php index.html index.htm;
+}
+error_page 500 502 503 504 /50x.html;
+location = /50x.html {
+root /usr/local/www/nginx-dist;
+}
+location ~ \.php$ {
+fastcgi_split_path_info ^(.+\.php)(/.+)$;
+fastcgi_pass unix:/var/run/php-fpm.sock;
+fastcgi_index index.php;
+fastcgi_param SCRIPT_FILENAME $request_filename;
+include fastcgi_params;
+}
+}
+}
\ No newline at end of file
diff --git a/organizr.sh b/organizr.sh
new file mode 100644
index 00000000..4d9d0667
--- /dev/null
+++ b/organizr.sh
@@ -0,0 +1,21 @@
+echo '{"pkgs":["nginx","php72","php72-filter","php72-curl","php72-hash","php72-json","php72-openssl","php72-pdo","php72-pdo_sqlite","php72-session","php72-simplexml","php72-sqlite3","php72-zip","git","ca_root_nss"]}' > /tmp/pkg.json
+iocage create -n "organizr" -p /tmp/pkg.json -r 11.3-RELEASE ip4_addr="vnet0|192.168.10.21/22" defaultrouter="192.168.10.1" vnet="on" allow_raw_sockets="1" boot="on"
+rm /tmp/pkg.json
+iocage exec organizr mkdir -p /config
+iocage fstab -a organizr /mnt/tank/apps/organizr /config nullfs rw 0 0
+iocage exec organizr sed -i '' -e 's?listen = 127.0.0.1:9000?listen = /var/run/php-fpm.sock?g' /usr/local/etc/php-fpm.d/www.conf
+iocage exec organizr sed -i '' -e 's/;listen.owner = www/listen.owner = www/g' /usr/local/etc/php-fpm.d/www.conf
+iocage exec organizr sed -i '' -e 's/;listen.group = www/listen.group = www/g' /usr/local/etc/php-fpm.d/www.conf
+iocage exec organizr sed -i '' -e 's/;listen.mode = 0660/listen.mode = 0600/g' /usr/local/etc/php-fpm.d/www.conf
+iocage exec organizr cp /usr/local/etc/php.ini-production /usr/local/etc/php.ini
+iocage exec organizr sed -i '' -e 's?;date.timezone =?date.timezone = "Universal"?g' /usr/local/etc/php.ini
+iocage exec organizr sed -i '' -e 's?;cgi.fix_pathinfo=1?cgi.fix_pathinfo=0?g' /usr/local/etc/php.ini
+mv /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/nginx.conf /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/nginx.conf.bak
+cp ./organizr-conf/inginx.conf /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/nginx.conf
+iocage exec organizr git clone https://github.com/causefx/Organizr.git /usr/local/www/Organizr
+iocage exec organizr chown -R www:www /usr/local/www /config
+iocage exec organizr ln -s /config/config.php /usr/local/www/Organizr/api/config/config.php
+iocage exec organizr sysrc nginx_enable=YES
+iocage exec organizr sysrc php_fpm_enable=YES
+iocage exec organizr service nginx start
+iocage exec organizr service php-fpm start
\ No newline at end of file
diff --git a/FreeBSD.conf b/plex-conf/FreeBSD.conf
similarity index 100%
rename from FreeBSD.conf
rename to plex-conf/FreeBSD.conf
diff --git a/plex.sh b/plex.sh
index fe48427a..957ce92a 100755
--- a/plex.sh
+++ b/plex.sh
@@ -4,7 +4,7 @@ echo '{"pkgs":["plexmediaserver-plexpass","ca_root_nss","nano"]}' > /tmp/pkg.jso
 iocage create -n "plex" -p /tmp/pkg.json -r 11.3-RELEASE ip4_addr="vnet0|192.168.10.23/24" defaultrouter="192.168.10.1" vnet="on" allow_raw_sockets="1" boot="on"
 rm /tmp/pkg.json
 iocage exec plex "mkdir -p /usr/local/etc/pkg/repos"
-cp ./FreeBSD.conf /mnt/tank/iocage/jails/plex/root/usr/local/etc/pkg/repos/FreeBSD.conf
+cp ./plex-conf/FreeBSD.conf /mnt/tank/iocage/jails/plex/root/usr/local/etc/pkg/repos/FreeBSD.conf
 iocage exec plex mkdir -p /config
 iocage exec plex mkdir -p /mnt/library
 iocage fstab -a plex /mnt/tank/apps/plex /config nullfs rw 0 0
@@ -12,7 +12,7 @@ iocage fstab -a plex /mnt/tank/Library /mnt/library nullfs ro 0 0
 iocage exec plex chown -R plex:plex /config
 iocage exec plex sysrc "plexmediaserver_plexpass_enable=YES"
 iocage exec plex sysrc plexmediaserver_plexpass_support_path="/config"
-iocage exec plex pkg update
-iocage exec plex pkg upgrade
+iocage exec plex pkg update -y
+iocage exec plex pkg upgrade -y
 iocage exec plex chown -R plex:plex /usr/local/share/plexmediaserver-plexpass/
 iocage exec plex service plexmediaserver_plexpass start
\ No newline at end of file

From 0262cc44495a013d56dc520d90f5ade4c07f48ad Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Mon, 24 Feb 2020 16:18:46 +0100
Subject: [PATCH 006/147] start status fix test

---
 plex.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plex.sh b/plex.sh
index 957ce92a..71606187 100755
--- a/plex.sh
+++ b/plex.sh
@@ -15,4 +15,8 @@ iocage exec plex sysrc plexmediaserver_plexpass_support_path="/config"
 iocage exec plex pkg update -y
 iocage exec plex pkg upgrade -y
 iocage exec plex chown -R plex:plex /usr/local/share/plexmediaserver-plexpass/
-iocage exec plex service plexmediaserver_plexpass start
\ No newline at end of file
+iocage exec plex service plexmediaserver_plexpass start
+sleep 20s
+echo "Waiting 20s to start"
+iocage exec plex service plexmediaserver_plexpass start
+iocage exec plex service plexmediaserver_plexpass status

From 58193ec3ae0138049f0517e618d628b435cb257c Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Mon, 24 Feb 2020 16:21:49 +0100
Subject: [PATCH 007/147] add start stop after timeout

---
 plex.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/plex.sh b/plex.sh
index 71606187..1dd04c4e 100755
--- a/plex.sh
+++ b/plex.sh
@@ -16,7 +16,10 @@ iocage exec plex pkg update -y
 iocage exec plex pkg upgrade -y
 iocage exec plex chown -R plex:plex /usr/local/share/plexmediaserver-plexpass/
 iocage exec plex service plexmediaserver_plexpass start
-sleep 20s
-echo "Waiting 20s to start"
-iocage exec plex service plexmediaserver_plexpass start
-iocage exec plex service plexmediaserver_plexpass status
+sleep 10s
+echo "Waiting 20s to stop plex"
+iocage stop plex
+sleep 10s
+echo "Waiting 20s to start plex"
+iocage start plex
+echo "Finished installing plex"
\ No newline at end of file

From c482b9dc80b827ec8394502947fac649bb93345a Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Mon, 24 Feb 2020 16:48:41 +0100
Subject: [PATCH 008/147] enable execution and fallback start for plex

---
 organizr.sh | 0
 plex.sh     | 1 +
 2 files changed, 1 insertion(+)
 mode change 100644 => 100755 organizr.sh

diff --git a/organizr.sh b/organizr.sh
old mode 100644
new mode 100755
diff --git a/plex.sh b/plex.sh
index 1dd04c4e..291046e0 100755
--- a/plex.sh
+++ b/plex.sh
@@ -22,4 +22,5 @@ iocage stop plex
 sleep 10s
 echo "Waiting 20s to start plex"
 iocage start plex
+iocage exec plex service plexmediaserver_plexpass start
 echo "Finished installing plex"
\ No newline at end of file

From 180caa3087bc51dc4fa39a4be9a4a05c08a64cd5 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Mon, 24 Feb 2020 17:38:53 +0100
Subject: [PATCH 009/147] fix typo

---
 organizr.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/organizr.sh b/organizr.sh
index 4d9d0667..c26a9f23 100755
--- a/organizr.sh
+++ b/organizr.sh
@@ -1,5 +1,5 @@
 echo '{"pkgs":["nginx","php72","php72-filter","php72-curl","php72-hash","php72-json","php72-openssl","php72-pdo","php72-pdo_sqlite","php72-session","php72-simplexml","php72-sqlite3","php72-zip","git","ca_root_nss"]}' > /tmp/pkg.json
-iocage create -n "organizr" -p /tmp/pkg.json -r 11.3-RELEASE ip4_addr="vnet0|192.168.10.21/22" defaultrouter="192.168.10.1" vnet="on" allow_raw_sockets="1" boot="on"
+iocage create -n "organizr" -p /tmp/pkg.json -r 11.3-RELEASE ip4_addr="vnet0|192.168.10.21/24" defaultrouter="192.168.10.1" vnet="on" allow_raw_sockets="1" boot="on"
 rm /tmp/pkg.json
 iocage exec organizr mkdir -p /config
 iocage fstab -a organizr /mnt/tank/apps/organizr /config nullfs rw 0 0

From caaa39c2e5574c2bc819f63cb5b9a11ba9f7996f Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Mon, 24 Feb 2020 19:27:12 +0100
Subject: [PATCH 010/147] fix nginx ownership

---
 organizr.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/organizr.sh b/organizr.sh
index c26a9f23..f367e22c 100755
--- a/organizr.sh
+++ b/organizr.sh
@@ -13,7 +13,7 @@ iocage exec organizr sed -i '' -e 's?;cgi.fix_pathinfo=1?cgi.fix_pathinfo=0?g' /
 mv /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/nginx.conf /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/nginx.conf.bak
 cp ./organizr-conf/inginx.conf /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/nginx.conf
 iocage exec organizr git clone https://github.com/causefx/Organizr.git /usr/local/www/Organizr
-iocage exec organizr chown -R www:www /usr/local/www /config
+iocage exec organizr chown -R www:www /usr/local/www /config /usr/local/etc/nginx/nginx.conf
 iocage exec organizr ln -s /config/config.php /usr/local/www/Organizr/api/config/config.php
 iocage exec organizr sysrc nginx_enable=YES
 iocage exec organizr sysrc php_fpm_enable=YES

From cb8eb9ac57b9b020b42ec8074c4e23e4c71e6033 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Mon, 24 Feb 2020 20:48:21 +0100
Subject: [PATCH 011/147] fix inginx

---
 organizr.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/organizr.sh b/organizr.sh
index f367e22c..0c599fe7 100755
--- a/organizr.sh
+++ b/organizr.sh
@@ -11,7 +11,7 @@ iocage exec organizr cp /usr/local/etc/php.ini-production /usr/local/etc/php.ini
 iocage exec organizr sed -i '' -e 's?;date.timezone =?date.timezone = "Universal"?g' /usr/local/etc/php.ini
 iocage exec organizr sed -i '' -e 's?;cgi.fix_pathinfo=1?cgi.fix_pathinfo=0?g' /usr/local/etc/php.ini
 mv /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/nginx.conf /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/nginx.conf.bak
-cp ./organizr-conf/inginx.conf /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/nginx.conf
+cp ./organizr-conf/nginx.conf /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/nginx.conf
 iocage exec organizr git clone https://github.com/causefx/Organizr.git /usr/local/www/Organizr
 iocage exec organizr chown -R www:www /usr/local/www /config /usr/local/etc/nginx/nginx.conf
 iocage exec organizr ln -s /config/config.php /usr/local/www/Organizr/api/config/config.php

From 6dd25f883b03343279f382cf79649fae0db58def Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 27 Feb 2020 15:05:08 +0100
Subject: [PATCH 012/147] Restructuring: - Add Auth_proxy to organiser -
 Shuffle some IP's - Add vlan support - add basic jacket setup

---
 jackett-conf/jackett.rc            |  50 +++++++++++
 jackett.sh                         |  16 ++++
 organizr-conf/custom/organizr.conf | 129 +++++++++++++++++++++++++++++
 organizr-conf/custom/phpblock.conf |   9 ++
 organizr-conf/nginx.conf           |  44 +++++-----
 organizr.sh                        |   2 +-
 plex.sh                            |   2 +-
 7 files changed, 226 insertions(+), 26 deletions(-)
 create mode 100644 jackett-conf/jackett.rc
 create mode 100644 jackett.sh
 create mode 100644 organizr-conf/custom/organizr.conf
 create mode 100644 organizr-conf/custom/phpblock.conf

diff --git a/jackett-conf/jackett.rc b/jackett-conf/jackett.rc
new file mode 100644
index 00000000..bb964794
--- /dev/null
+++ b/jackett-conf/jackett.rc
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+# $FreeBSD$
+#
+# PROVIDE: jackett
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# jackett_enable: Set to YES to enable jackett
+# Default: NO
+# jackett_user: The user account used to run the jackett daemon.
+# This is optional, however do not specifically set this to an
+# empty string as this will cause the daemon to run as root.
+# Default: media
+# jackett_group: The group account used to run the jackett daemon.
+# This is optional, however do not specifically set this to an
+# empty string as this will cause the daemon to run with group wheel.
+# Default: media
+# jackett_data_dir: Directory where jackett configuration
+# data is stored.
+# Default: /var/db/jackett
+
+. /etc/rc.subr
+name=jackett
+rcvar=${name}_enable
+load_rc_config $name
+
+: ${jackett_enable:="NO"}
+: ${jackett_user:="jackett"}
+: ${jackett_group:="jackett"}
+: ${jackett_data_dir:="/config"}
+
+command="/usr/sbin/daemon"
+procname="/usr/local/bin/mono"
+command_args="-p ${jackett_data_dir}/jackett.pid -f ${procname} /usr/local/share/Jackett/JackettConsole.exe -d ${jackett_data_dir}"
+
+start_precmd=jackett_precmd
+jackett_precmd() {
+export USER=${jackett_user}
+if [ ! -d ${jackett_data_dir} ]; then
+install -d -o ${jackett_user} -g ${jackett_group} ${jackett_data_dir}
+fi
+
+export XDG_CONFIG_HOME=${jackett_data_dir}
+}
+
+run_rc_command "$1"
\ No newline at end of file
diff --git a/jackett.sh b/jackett.sh
new file mode 100644
index 00000000..511597d0
--- /dev/null
+++ b/jackett.sh
@@ -0,0 +1,16 @@
+echo '{"pkgs":["mono","curl","ca_root_nss","nano"]}' > /tmp/pkg.json
+iocage create -n "jackett" -p /tmp/pkg.json -r 11.3-RELEASE interfaces="vnet0:bridge30" ip4_addr="vnet0|192.168.30.28/24" defaultrouter="192.168.30.1" vnet="on" allow_raw_sockets="1" boot="on"
+rm /tmp/pkg.json
+iocage exec jackett mkdir -p /config
+iocage fstab -a jackett /mnt/tank/apps/jackett /config nullfs rw 0 0
+iocage exec jackett ln -s /usr/local/bin/mono /usr/bin/mono
+iocage exec jackett "fetch https://github.com/Jackett/Jackett/releases/download/v0.11.502/Jackett.Binaries.Mono.tar.gz -o /usr/local/share"
+iocage exec jackett "tar -xzvf /usr/local/share/Jackett.Binaries.Mono.tar.gz -C /usr/local/share"
+iocage exec jackett rm /usr/local/share/Jackett.Binaries.Mono.tar.gz
+iocage exec jackett "pw user add jackett -c jackett -u 818 -d /nonexistent -s /usr/bin/nologin"
+iocage exec jackett chown -R jackett:jackett /usr/local/share/Jackett /config
+iocage exec jackett mkdir /usr/local/etc/rc.d
+cp ./jackett-conf/jackett.rc /mnt/tank/iocage/jails/jackett/root/usr/local/etc/rc.d/jackett
+iocage exec jackett chmod u+x /usr/local/etc/rc.d/jackett
+iocage exec jackett sysrc "jackett_enable=YES"
+iocage exec jackett service jackett restart
\ No newline at end of file
diff --git a/organizr-conf/custom/organizr.conf b/organizr-conf/custom/organizr.conf
new file mode 100644
index 00000000..d9461920
--- /dev/null
+++ b/organizr-conf/custom/organizr.conf
@@ -0,0 +1,129 @@
+send_timeout 5m;
+proxy_read_timeout 240;
+proxy_send_timeout 240;
+proxy_connect_timeout 240;
+client_header_timeout 240;
+client_body_timeout 240;
+
+location / {
+    root /usr/local/www/Organizr;
+    index index.php index.html index.htm index.nginx-debian.html;
+    location ~ /auth-(.*) {
+	    internal;
+	    rewrite ^/auth-(.*) /api/?v1/auth&group=$1;
+    }
+    error_page 400 401 402 403 404 405 408 500 502 503 504 $scheme://$server_name/?error=$status;
+    location / {try_files $uri $uri/ =404;}
+    include custom/phpblock.conf;  #PHP Block
+  }
+
+location /transmission {
+    auth_request /auth-0;
+    add_header X-Frame-Options "SAMEORIGIN";
+    proxy_pass http://127.0.0.1:9091;
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+  }
+
+location /nzbget {
+    auth_request /auth-0;
+    add_header X-Frame-Options "SAMEORIGIN";
+    proxy_pass http://127.0.0.1:6789;
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+  }
+
+location /nzbhydra/ {
+    auth_request /auth-0;
+    add_header X-Frame-Options "SAMEORIGIN";
+    proxy_pass http://127.0.0.1:5075/nzbhydra/;
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+  }
+
+location /sonarr {
+    auth_request /auth-0;    
+    add_header X-Frame-Options "SAMEORIGIN";
+    proxy_pass http://192.168.30.30:8989;
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+  }
+
+location /radarr {
+    auth_request /auth-0;
+    add_header X-Frame-Options "SAMEORIGIN";
+    proxy_pass http://192.168.30.31:7878;
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+  }
+
+location /jackett {
+    auth_request /auth-0;
+    add_header X-Frame-Options "SAMEORIGIN";
+    proxy_pass http://192.168.30.28:9117;
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
+    proxy_set_header X-Forwarded-Host $http_host;
+    proxy_redirect off;
+  }
+
+location /plex/ {
+    auth_request /auth-4;
+    add_header X-Frame-Options "SAMEORIGIN";
+    proxy_pass http://192.168.30.26:32400/;
+    client_max_body_size 10m;
+    client_body_buffer_size 128k;
+    proxy_bind $server_addr;
+    proxy_buffers 32 4k;
+    #Timeout if the real server is dead
+    proxy_next_upstream error timeout invalid_header http_500 http_502 http_503;
+    # Advanced Proxy Config
+    send_timeout 5m;
+    proxy_read_timeout 240;
+    proxy_send_timeout 240;
+    proxy_connect_timeout 240;
+    proxy_hide_header X-Frame-Options;
+    # Basic Proxy Config
+    proxy_set_header Host $host:$server_port;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto https;
+    proxy_redirect  http://  $scheme://;
+    proxy_http_version 1.1;
+    proxy_set_header Connection "";
+    proxy_no_cache $cookie_session;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "upgrade";  
+  }
+if ($http_referer ~* /plex/) {
+    rewrite ^/web/(.*) /plex/web/$1? redirect;
+  }
+
+location /plexpy {
+    auth_request /auth-4;
+    add_header X-Frame-Options "SAMEORIGIN";
+    proxy_pass http://127.0.0.1:8181;
+    proxy_set_header Host $http_host;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Host $server_name;
+    proxy_set_header X-Forwarded-Proto $scheme;
+    proxy_set_header X-Real-IP $remote_addr;
+  }
+
+location /ombi/ {
+    auth_request /auth-4;
+    add_header X-Frame-Options "SAMEORIGIN";
+    proxy_pass http://127.0.0.1:5000/ombi/;
+    proxy_http_version 1.1;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection keep-alive;
+    proxy_set_header Host $host;
+    proxy_cache_bypass $http_upgrade;
+  }
\ No newline at end of file
diff --git a/organizr-conf/custom/phpblock.conf b/organizr-conf/custom/phpblock.conf
new file mode 100644
index 00000000..f68839fe
--- /dev/null
+++ b/organizr-conf/custom/phpblock.conf
@@ -0,0 +1,9 @@
+fastcgi_read_timeout 240;
+
+location ~ \.php$ {
+			fastcgi_split_path_info ^(.+\.php)(/.+)$;
+			fastcgi_pass unix:/var/run/php-fpm.sock;
+			fastcgi_index index.php;
+			fastcgi_param SCRIPT_FILENAME $request_filename;
+			include fastcgi_params;
+}
\ No newline at end of file
diff --git a/organizr-conf/nginx.conf b/organizr-conf/nginx.conf
index cb049500..dcee90dc 100644
--- a/organizr-conf/nginx.conf
+++ b/organizr-conf/nginx.conf
@@ -1,30 +1,26 @@
 user www;
 worker_processes 1;
+
 events {
-worker_connections 1024;
+	worker_connections 1024;
 }
+
 http {
-include mime.types;
-default_type application/octet-stream;
-sendfile on;
-keepalive_timeout 65;
-server {
-listen 80;
-server_name localhost;
-root /usr/local/www/Organizr;
-location / {
-index index.php index.html index.htm;
-}
-error_page 500 502 503 504 /50x.html;
-location = /50x.html {
-root /usr/local/www/nginx-dist;
-}
-location ~ \.php$ {
-fastcgi_split_path_info ^(.+\.php)(/.+)$;
-fastcgi_pass unix:/var/run/php-fpm.sock;
-fastcgi_index index.php;
-fastcgi_param SCRIPT_FILENAME $request_filename;
-include fastcgi_params;
-}
-}
+	include mime.types;
+	default_type application/octet-stream;
+	sendfile on;
+	keepalive_timeout 65;
+	server {
+		listen 80;
+		server_name organizr.dmz.schouten-lebbing.nl;
+		include custom/organizr.conf;
+	}
+	server {
+		listen 443 ssl;
+		server_name organizr.schouten-lebbing.nl;
+		include custom/organizr.conf;
+		ssl_certificate /config/cert/Organizr-Cert.crt; # Manually Added
+		ssl_certificate_key /config/cert/Organizr-Cert.key; # Manually Added
+	}
+
 }
\ No newline at end of file
diff --git a/organizr.sh b/organizr.sh
index 0c599fe7..29af7493 100755
--- a/organizr.sh
+++ b/organizr.sh
@@ -1,5 +1,5 @@
 echo '{"pkgs":["nginx","php72","php72-filter","php72-curl","php72-hash","php72-json","php72-openssl","php72-pdo","php72-pdo_sqlite","php72-session","php72-simplexml","php72-sqlite3","php72-zip","git","ca_root_nss"]}' > /tmp/pkg.json
-iocage create -n "organizr" -p /tmp/pkg.json -r 11.3-RELEASE ip4_addr="vnet0|192.168.10.21/24" defaultrouter="192.168.10.1" vnet="on" allow_raw_sockets="1" boot="on"
+iocage create -n "organizr" -p /tmp/pkg.json -r 11.3-RELEASE interfaces="vnet0:bridge30" ip4_addr="vnet0|192.168.30.25/24" defaultrouter="192.168.30.1" vnet="on" allow_raw_sockets="1" boot="on"
 rm /tmp/pkg.json
 iocage exec organizr mkdir -p /config
 iocage fstab -a organizr /mnt/tank/apps/organizr /config nullfs rw 0 0
diff --git a/plex.sh b/plex.sh
index 291046e0..6cb88c54 100755
--- a/plex.sh
+++ b/plex.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 echo '{"pkgs":["plexmediaserver-plexpass","ca_root_nss","nano"]}' > /tmp/pkg.json
-iocage create -n "plex" -p /tmp/pkg.json -r 11.3-RELEASE ip4_addr="vnet0|192.168.10.23/24" defaultrouter="192.168.10.1" vnet="on" allow_raw_sockets="1" boot="on"
+iocage create -n "plex" -p /tmp/pkg.json -r 11.3-RELEASE interfaces="vnet0:bridge30" ip4_addr="vnet0|192.168.30.26/24" defaultrouter="192.168.30.1" vnet="on" allow_raw_sockets="1" boot="on"
 rm /tmp/pkg.json
 iocage exec plex "mkdir -p /usr/local/etc/pkg/repos"
 cp ./plex-conf/FreeBSD.conf /mnt/tank/iocage/jails/plex/root/usr/local/etc/pkg/repos/FreeBSD.conf

From 07407621efed01ff60ffab4c051756c3d1ba7a78 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 27 Feb 2020 15:12:16 +0100
Subject: [PATCH 013/147] make executable

---
 jackett.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 jackett.sh

diff --git a/jackett.sh b/jackett.sh
old mode 100644
new mode 100755

From 856b33c3131d0fd2a93030b92cb18cde2126e3ed Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 27 Feb 2020 16:03:12 +0100
Subject: [PATCH 014/147] Organizr tweaks

---
 organizr.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/organizr.sh b/organizr.sh
index 29af7493..8b7f8779 100755
--- a/organizr.sh
+++ b/organizr.sh
@@ -12,8 +12,9 @@ iocage exec organizr sed -i '' -e 's?;date.timezone =?date.timezone = "Universal
 iocage exec organizr sed -i '' -e 's?;cgi.fix_pathinfo=1?cgi.fix_pathinfo=0?g' /usr/local/etc/php.ini
 mv /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/nginx.conf /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/nginx.conf.bak
 cp ./organizr-conf/nginx.conf /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/nginx.conf
+cp ./organizr-conf/custom /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/custom
 iocage exec organizr git clone https://github.com/causefx/Organizr.git /usr/local/www/Organizr
-iocage exec organizr chown -R www:www /usr/local/www /config /usr/local/etc/nginx/nginx.conf
+iocage exec organizr chown -R www:www /usr/local/www /config /usr/local/etc/nginx/nginx.conf /usr/local/etc/nginx/custom
 iocage exec organizr ln -s /config/config.php /usr/local/www/Organizr/api/config/config.php
 iocage exec organizr sysrc nginx_enable=YES
 iocage exec organizr sysrc php_fpm_enable=YES

From ea5db9a0fe5874d7e7fc5120308c46d54b9c2580 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 27 Feb 2020 16:16:12 +0100
Subject: [PATCH 015/147] add tautulli support

---
 tautulli.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 tautulli.sh

diff --git a/tautulli.sh b/tautulli.sh
new file mode 100644
index 00000000..730f7deb
--- /dev/null
+++ b/tautulli.sh
@@ -0,0 +1,13 @@
+echo '{"pkgs":["python2","py27-sqlite3","py27-openssl","ca_root_nss","git","nano"]}' > /tmp/pkg.json
+iocage create -n "tautulli" -p /tmp/pkg.json -r 11.3-RELEASE interfaces="vnet0:bridge30" ip4_addr="vnet0|192.168.30.27/24" defaultrouter="192.168.30.1" vnet="on" allow_raw_sockets="1" boot="on"
+rm /tmp/pkg.json
+iocage exec tautulli mkdir -p /config
+iocage fstab -a tautulli /mnt/tank/apps/tautulli /config nullfs rw 0 0
+iocage exec tautulli git clone https://github.com/Tautulli/Tautulli.git /usr/local/share/Tautulli
+iocage exec tautulli "pw user add tautulli -c tautulli -u 109 -d /nonexistent -s /usr/bin/nologin"
+iocage exec tautulli chown -R tautulli:tautulli /usr/local/share/Tautulli /config
+iocage exec tautulli cp /usr/local/share/Tautulli/init-scripts/init.freenas /usr/local/etc/rc.d/tautulli
+iocage exec tautulli chmod u+x /usr/local/etc/rc.d/tautulli
+iocage exec tautulli sysrc "tautulli_enable=YES"
+iocage exec tautulli sysrc "tautulli_flags=--datadir /config"
+iocage exec tautulli service tautulli start
\ No newline at end of file

From 7360b6a444a1cda51d352498d5a767236c12aa7c Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 27 Feb 2020 16:17:31 +0100
Subject: [PATCH 016/147] make tautulli executable

---
 tautulli.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 tautulli.sh

diff --git a/tautulli.sh b/tautulli.sh
old mode 100644
new mode 100755

From dc4b0aebd5810ac4f755c5322497a322839bbcbf Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 27 Feb 2020 16:23:56 +0100
Subject: [PATCH 017/147] add tautulli support to organizr

---
 organizr-conf/custom/organizr.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/organizr-conf/custom/organizr.conf b/organizr-conf/custom/organizr.conf
index d9461920..d3759b02 100644
--- a/organizr-conf/custom/organizr.conf
+++ b/organizr-conf/custom/organizr.conf
@@ -106,10 +106,10 @@ if ($http_referer ~* /plex/) {
     rewrite ^/web/(.*) /plex/web/$1? redirect;
   }
 
-location /plexpy {
+location /tautulli {
     auth_request /auth-4;
     add_header X-Frame-Options "SAMEORIGIN";
-    proxy_pass http://127.0.0.1:8181;
+    proxy_pass http://192.168.30.27:8181;
     proxy_set_header Host $http_host;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header X-Forwarded-Host $server_name;

From 673df1c2b7152a5fc22478777b0f61c8af7c438e Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 27 Feb 2020 18:12:07 +0100
Subject: [PATCH 018/147] Added -arr services and updates organizr

---
 lidarr-conf/lidarr.rc              | 36 +++++++++++++++++++++
 lidarr.sh                          | 20 ++++++++++++
 organizr-conf/custom/organizr.conf | 29 ++++++++++++++++-
 radarr-conf/radarr.rc              | 50 ++++++++++++++++++++++++++++++
 radarr.sh                          | 20 ++++++++++++
 sonarr-conf/sonarr.rc              | 50 ++++++++++++++++++++++++++++++
 sonarr.sh                          | 20 ++++++++++++
 7 files changed, 224 insertions(+), 1 deletion(-)
 create mode 100644 lidarr-conf/lidarr.rc
 create mode 100644 lidarr.sh
 create mode 100644 radarr-conf/radarr.rc
 create mode 100644 radarr.sh
 create mode 100644 sonarr-conf/sonarr.rc
 create mode 100644 sonarr.sh

diff --git a/lidarr-conf/lidarr.rc b/lidarr-conf/lidarr.rc
new file mode 100644
index 00000000..a47c4d35
--- /dev/null
+++ b/lidarr-conf/lidarr.rc
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+# $FreeBSD$
+#
+# PROVIDE: lidarr
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf to enable lidarr:
+# lidarr_enable="YES"
+
+. /etc/rc.subr
+name=lidarr
+rcvar=${name}_enable
+load_rc_config $name
+
+: ${lidarr_enable="NO"}
+: ${lidarr_user:="lidarr"}
+: ${lidarr_group:="lidarr"}
+: ${lidarr_data_dir:="/config"}
+
+pidfile="${lidarr_data_dir}/lidarr.pid"
+command="/usr/sbin/daemon"
+procname="/usr/local/bin/mono"
+command_args="-f ${procname} /usr/local/share/Lidarr/Lidarr.exe -- data=${lidarr_data_dir} --nobrowser"
+
+start_precmd=lidarr_precmd
+lidarr_precmd() {
+if [ ! -d ${lidarr_data_dir} ]; then
+install -d -o ${lidarr_user} -g ${lidarr_group} ${lidarr_data_dir}
+fi
+
+export XDG_CONFIG_HOME=${lidarr_data_dir}
+}
+
+run_rc_command "$1"
\ No newline at end of file
diff --git a/lidarr.sh b/lidarr.sh
new file mode 100644
index 00000000..c61d530f
--- /dev/null
+++ b/lidarr.sh
@@ -0,0 +1,20 @@
+echo '{"pkgs":["mono","mediainfo","sqlite3","ca_root_nss","curl","chromaprint","nano"]}' > /tmp/pkg.json
+iocage create -n "lidarr" -p /tmp/pkg.json -r 11.3-RELEASE interfaces="vnet0:bridge30" ip4_addr="vnet0|192.168.30.32/24" defaultrouter="192.168.30.1" vnet="on" allow_raw_sockets="1" boot="on"
+rm /tmp/pkg.json
+iocage exec lidarr mkdir -p /config
+iocage exec lidarr mkdir -p /mnt/music
+iocage exec lidarr mkdir -p /mnt/fetched
+iocage fstab -a lidarr /mnt/tank/apps/lidarr /config nullfs rw 0 0
+iocage fstab -a lidarr /mnt/tank/downloads/complete /mnt/fetched nullfs rw 0 0
+iocage fstab -a lidarr /mnt/tank/library/Music /mnt/music nullfs rw 0 0
+iocage exec lidarr ln -s /usr/local/bin/mono /usr/bin/mono
+iocage exec lidarr "fetch https://github.com/lidarr/Lidarr/releases/download/v0.2.0.371/Lidarr.develop.0.2.0.371.linux.tar.gz -o /usr/local/share"
+iocage exec lidarr "tar -xzvf /usr/local/share/Lidarr.develop.*.linux.tar.gz -C /usr/local/share"
+iocage exec lidarr "rm /usr/local/share/Lidarr.*.tar.gz"
+iocage exec lidarr "pw user add lidarr -c lidarr -u 353 -d /nonexistent -s /usr/bin/nologin"
+iocage exec lidarr chown -R lidarr:lidarr /usr/local/share/Lidarr /config
+iocage exec lidarr mkdir /usr/local/etc/rc.d
+cp ./lidarr-conf/lidarr.rc /mnt/tank/iocage/jails/lidarr/root/usr/local/etc/rc.d/lidarr
+iocage exec lidarr chmod u+x /usr/local/etc/rc.d/lidarr
+iocage exec lidarr sysrc "lidarr_enable=YES"
+iocage exec lidarr service lidarr start
\ No newline at end of file
diff --git a/organizr-conf/custom/organizr.conf b/organizr-conf/custom/organizr.conf
index d3759b02..817615c4 100644
--- a/organizr-conf/custom/organizr.conf
+++ b/organizr-conf/custom/organizr.conf
@@ -20,7 +20,7 @@ location / {
 location /transmission {
     auth_request /auth-0;
     add_header X-Frame-Options "SAMEORIGIN";
-    proxy_pass http://127.0.0.1:9091;
+    proxy_pass http://192.168.30.29:9091;
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -61,6 +61,15 @@ location /radarr {
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
   }
+  
+  location /lidarr {
+    auth_request /auth-0;
+    add_header X-Frame-Options "SAMEORIGIN";
+    proxy_pass http://192.168.30.32:7878;
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+  }
 
 location /jackett {
     auth_request /auth-0;
@@ -126,4 +135,22 @@ location /ombi/ {
     proxy_set_header Connection keep-alive;
     proxy_set_header Host $host;
     proxy_cache_bypass $http_upgrade;
+  }
+
+  location /grafana {
+    auth_request /auth-0;
+    add_header X-Frame-Options "SAMEORIGIN";
+    proxy_pass http://192.168.30.34;
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+  }
+  
+  location /bitwarden {
+    auth_request /auth-0;
+    add_header X-Frame-Options "SAMEORIGIN";
+    proxy_pass http://192.168.30.33:8000;
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
   }
\ No newline at end of file
diff --git a/radarr-conf/radarr.rc b/radarr-conf/radarr.rc
new file mode 100644
index 00000000..0c746079
--- /dev/null
+++ b/radarr-conf/radarr.rc
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+# $FreeBSD$
+#
+# PROVIDE: radarr
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# radarr_enable: Set to YES to enable radarr
+# Default: NO
+# radarr_user: The user account used to run the radarr daemon.
+# This is optional, however do not specifically set this to an
+# empty string as this will cause the daemon to run as root.
+# Default: media
+# radarr_group: The group account used to run the radarr daemon.
+# This is optional, however do not specifically set this to an
+# empty string as this will cause the daemon to run with group wheel.
+# Default: media
+# radarr_data_dir: Directory where radarr configuration
+# data is stored.
+# Default: /var/db/radarr
+
+. /etc/rc.subr
+name=radarr
+rcvar=${name}_enable
+load_rc_config $name
+
+: ${radarr_enable:="NO"}
+: ${radarr_user:="radarr"}
+: ${radarr_group:="radarr"}
+: ${radarr_data_dir:="/config"}
+
+pidfile="${radarr_data_dir}/nzbdrone.pid"
+command="/usr/sbin/daemon"
+procname="/usr/local/bin/mono"
+command_args="-f ${procname} /usr/local/share/Radarr/Radarr.exe --data=${radarr_data_dir} --nobrowser"
+
+start_precmd=radarr_precmd
+radarr_precmd() {
+if [ ! -d ${radarr_data_dir} ]; then
+install -d -o ${radarr_user} -g ${radarr_group} ${radarr_data_dir}
+fi
+
+export XDG_CONFIG_HOME=${radarr_data_dir}
+}
+
+run_rc_command "$1"
\ No newline at end of file
diff --git a/radarr.sh b/radarr.sh
new file mode 100644
index 00000000..e3043e4b
--- /dev/null
+++ b/radarr.sh
@@ -0,0 +1,20 @@
+echo '{"pkgs":["mono","mediainfo","sqlite3","ca_root_nss","curl","nano"]}' > /tmp/pkg.json
+iocage create -n "radarr" -p /tmp/pkg.json -r 11.3-RELEASE interfaces="vnet0:bridge30" ip4_addr="vnet0|192.168.30.31/24" defaultrouter="192.168.30.1" vnet="on" allow_raw_sockets="1" boot="on"
+rm /tmp/pkg.json
+iocage exec radarr mkdir -p /config
+iocage exec radarr mkdir -p /mnt/music
+iocage exec radarr mkdir -p /mnt/fetched
+iocage fstab -a radarr /mnt/tank/apps/radarr /config nullfs rw 0 0
+iocage fstab -a radarr /mnt/tank/downloads/complete /mnt/fetched nullfs rw 0 0
+iocage fstab -a radarr /mnt/tank/library/Movies /mnt/movies nullfs rw 0 0
+iocage exec radarr ln -s /usr/local/bin/mono /usr/bin/mono
+iocage exec radarr "fetch https://github.com/Radarr/Radarr/releases/download/v0.2.0.995/Radarr.develop.0.2.0.995.linux.tar.gz -o /usr/local/share"
+iocage exec radarr "tar -xzvf /usr/local/share/Radarr.*.linux.tar.gz -C /usr/local/share"
+iocage exec radarr rm /usr/local/share/Radarr.*.linux.tar.gz
+iocage exec radarr "pw user add radarr -c radarr -u 352 -d /nonexistent -s /usr/bin/nologin"
+iocage exec radarr chown -R radarr:radarr /usr/local/share/Radarr /config
+iocage exec radarr mkdir /usr/local/etc/rc.d
+cp ./radarr-conf/radarr.rc /mnt/tank/iocage/jails/radarr/root/usr/local/etc/rc.d/radarr
+iocage exec radarr chmod u+x /usr/local/etc/rc.d/radarr
+iocage exec radarr sysrc "radarr_enable=YES"
+iocage exec radarr service radarr start
\ No newline at end of file
diff --git a/sonarr-conf/sonarr.rc b/sonarr-conf/sonarr.rc
new file mode 100644
index 00000000..079045bb
--- /dev/null
+++ b/sonarr-conf/sonarr.rc
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+# $FreeBSD$
+#
+# PROVIDE: sonarr
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# sonarr_enable: Set to YES to enable sonarr
+# Default: NO
+# sonarr_user: The user account used to run the sonarr daemon.
+# This is optional, however do not specifically set this to an
+# empty string as this will cause the daemon to run as root.
+# Default: media
+	# sonarr_group: The group account used to run the sonarr daemon.
+# This is optional, however do not specifically set this to an
+# empty string as this will cause the daemon to run with group wheel.
+# Default: media
+# sonarr_data_dir: Directory where sonarr configuration
+# data is stored.
+# Default: /var/db/sonarr
+
+. /etc/rc.subr
+name=sonarr
+rcvar=${name}_enable
+load_rc_config $name
+
+: ${sonarr_enable:="NO"}
+: ${sonarr_user:="sonarr"}
+: ${sonarr_group:="sonarr"}
+: ${sonarr_data_dir:="/config"}
+
+pidfile="${sonarr_data_dir}/nzbdrone.pid"
+command="/usr/sbin/daemon"
+procname="/usr/local/bin/mono"
+command_args="-f ${procname} /usr/local/share/NzbDrone/NzbDrone.exe --data=${sonarr_data_dir} --nobrowser"
+
+start_precmd=sonarr_precmd
+sonarr_precmd() {
+if [ ! -d ${sonarr_data_dir} ]; then
+install -d -o ${sonarr_user} -g ${sonarr_group} ${sonarr_data_dir}
+fi
+
+export XDG_CONFIG_HOME=${sonarr_data_dir}
+}
+
+run_rc_command "$1"
\ No newline at end of file
diff --git a/sonarr.sh b/sonarr.sh
new file mode 100644
index 00000000..e99bd3eb
--- /dev/null
+++ b/sonarr.sh
@@ -0,0 +1,20 @@
+echo '{"pkgs":["mono","mediainfo","sqlite3","ca_root_nss","curl","nano"]}' > /tmp/pkg.json
+iocage create -n "sonarr" -p /tmp/pkg.json -r 11.3-RELEASE interfaces="vnet0:bridge30" ip4_addr="vnet0|192.168.30.30/24" defaultrouter="192.168.30.1" vnet="on" allow_raw_sockets="1" boot="on"
+rm /tmp/pkg.json
+iocage exec sonarr mkdir -p /config
+iocage exec sonarr mkdir -p /mnt/music
+iocage exec sonarr mkdir -p /mnt/fetched
+iocage fstab -a sonarr /mnt/tank/apps/sonarr /config nullfs rw 0 0
+iocage fstab -a sonarr /mnt/tank/downloads/complete /mnt/fetched nullfs rw 0 0
+iocage fstab -a sonarr /mnt/tank/library/Series /mnt/series nullfs rw 0 0
+iocage exec sonarr ln -s /usr/local/bin/mono /usr/bin/mono
+iocage exec sonarr "fetch http://download.sonarr.tv/v2/master/mono/NzbDrone.master.tar.gz -o /usr/local/share"
+iocage exec sonarr "tar -xzvf /usr/local/share/NzbDrone.master.tar.gz -C /usr/local/share"
+iocage exec sonarr rm /usr/local/share/NzbDrone.master.tar.gz
+iocage exec sonarr "pw user add sonarr -c sonarr -u 351 -d /nonexistent -s /usr/bin/nologin"
+iocage exec sonarr chown -R sonarr:sonarr /usr/local/share/NzbDrone /config
+iocage exec sonarr mkdir /usr/local/etc/rc.d
+cp ./sonarr-conf/sonarr.rc /mnt/tank/iocage/jails/sonarr/root/usr/local/etc/rc.d/sonarr
+iocage exec sonarr chmod u+x /usr/local/etc/rc.d/sonarr
+iocage exec sonarr sysrc "sonarr_enable=YES"
+iocage exec sonarr service sonarr start
\ No newline at end of file

From 958164a19c8c125201745a535ca80692922bf17e Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 27 Feb 2020 18:19:46 +0100
Subject: [PATCH 019/147] make executable

---
 lidarr.sh | 0
 radarr.sh | 0
 sonarr.sh | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 lidarr.sh
 mode change 100644 => 100755 radarr.sh
 mode change 100644 => 100755 sonarr.sh

diff --git a/lidarr.sh b/lidarr.sh
old mode 100644
new mode 100755
diff --git a/radarr.sh b/radarr.sh
old mode 100644
new mode 100755
diff --git a/sonarr.sh b/sonarr.sh
old mode 100644
new mode 100755

From 13c12bf77ff098ae70df17cfb331a20733ad7690 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 27 Feb 2020 18:32:14 +0100
Subject: [PATCH 020/147] fix mistake

---
 radarr.sh | 2 +-
 sonarr.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/radarr.sh b/radarr.sh
index e3043e4b..be4fbee0 100755
--- a/radarr.sh
+++ b/radarr.sh
@@ -2,7 +2,7 @@ echo '{"pkgs":["mono","mediainfo","sqlite3","ca_root_nss","curl","nano"]}' > /tm
 iocage create -n "radarr" -p /tmp/pkg.json -r 11.3-RELEASE interfaces="vnet0:bridge30" ip4_addr="vnet0|192.168.30.31/24" defaultrouter="192.168.30.1" vnet="on" allow_raw_sockets="1" boot="on"
 rm /tmp/pkg.json
 iocage exec radarr mkdir -p /config
-iocage exec radarr mkdir -p /mnt/music
+iocage exec radarr mkdir -p /mnt/movies
 iocage exec radarr mkdir -p /mnt/fetched
 iocage fstab -a radarr /mnt/tank/apps/radarr /config nullfs rw 0 0
 iocage fstab -a radarr /mnt/tank/downloads/complete /mnt/fetched nullfs rw 0 0
diff --git a/sonarr.sh b/sonarr.sh
index e99bd3eb..078f8600 100755
--- a/sonarr.sh
+++ b/sonarr.sh
@@ -2,7 +2,7 @@ echo '{"pkgs":["mono","mediainfo","sqlite3","ca_root_nss","curl","nano"]}' > /tm
 iocage create -n "sonarr" -p /tmp/pkg.json -r 11.3-RELEASE interfaces="vnet0:bridge30" ip4_addr="vnet0|192.168.30.30/24" defaultrouter="192.168.30.1" vnet="on" allow_raw_sockets="1" boot="on"
 rm /tmp/pkg.json
 iocage exec sonarr mkdir -p /config
-iocage exec sonarr mkdir -p /mnt/music
+iocage exec sonarr mkdir -p /mnt/series
 iocage exec sonarr mkdir -p /mnt/fetched
 iocage fstab -a sonarr /mnt/tank/apps/sonarr /config nullfs rw 0 0
 iocage fstab -a sonarr /mnt/tank/downloads/complete /mnt/fetched nullfs rw 0 0

From c672a2ea67a44bfca152d11b5dca574a32aac239 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 27 Feb 2020 19:22:45 +0100
Subject: [PATCH 021/147] hardcode download path

---
 radarr.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/radarr.sh b/radarr.sh
index be4fbee0..dff0d8d1 100755
--- a/radarr.sh
+++ b/radarr.sh
@@ -8,9 +8,9 @@ iocage fstab -a radarr /mnt/tank/apps/radarr /config nullfs rw 0 0
 iocage fstab -a radarr /mnt/tank/downloads/complete /mnt/fetched nullfs rw 0 0
 iocage fstab -a radarr /mnt/tank/library/Movies /mnt/movies nullfs rw 0 0
 iocage exec radarr ln -s /usr/local/bin/mono /usr/bin/mono
-iocage exec radarr "fetch https://github.com/Radarr/Radarr/releases/download/v0.2.0.995/Radarr.develop.0.2.0.995.linux.tar.gz -o /usr/local/share"
-iocage exec radarr "tar -xzvf /usr/local/share/Radarr.*.linux.tar.gz -C /usr/local/share"
-iocage exec radarr rm /usr/local/share/Radarr.*.linux.tar.gz
+iocage exec radarr "fetch https://github.com/Radarr/Radarr/releases/download/v0.2.0.1480/Radarr.develop.0.2.0.1480.linux.tar.gz -o /usr/local/share"
+iocage exec radarr "tar -xzvf /usr/local/share/Radarr.develop.0.2.0.1480.linux.tar.gz -C /usr/local/share"
+iocage exec radarr rm /usr/local/share/Radarr.develop.0.2.0.1480.linux.tar.gz
 iocage exec radarr "pw user add radarr -c radarr -u 352 -d /nonexistent -s /usr/bin/nologin"
 iocage exec radarr chown -R radarr:radarr /usr/local/share/Radarr /config
 iocage exec radarr mkdir /usr/local/etc/rc.d

From 2d59584dbc6969c1e58048cffe3fead32bb88e0d Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 27 Feb 2020 19:24:29 +0100
Subject: [PATCH 022/147] hardcode lidarr

---
 lidarr.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lidarr.sh b/lidarr.sh
index c61d530f..cca1a347 100755
--- a/lidarr.sh
+++ b/lidarr.sh
@@ -9,8 +9,8 @@ iocage fstab -a lidarr /mnt/tank/downloads/complete /mnt/fetched nullfs rw 0 0
 iocage fstab -a lidarr /mnt/tank/library/Music /mnt/music nullfs rw 0 0
 iocage exec lidarr ln -s /usr/local/bin/mono /usr/bin/mono
 iocage exec lidarr "fetch https://github.com/lidarr/Lidarr/releases/download/v0.2.0.371/Lidarr.develop.0.2.0.371.linux.tar.gz -o /usr/local/share"
-iocage exec lidarr "tar -xzvf /usr/local/share/Lidarr.develop.*.linux.tar.gz -C /usr/local/share"
-iocage exec lidarr "rm /usr/local/share/Lidarr.*.tar.gz"
+iocage exec lidarr "tar -xzvf /usr/local/share/v0.2.0.371/Lidarr.develop.0.2.0.371.linux.tar.gz -C /usr/local/share"
+iocage exec lidarr "rm /usr/local/share/v0.2.0.371/Lidarr.develop.0.2.0.371.linux.tar.gz"
 iocage exec lidarr "pw user add lidarr -c lidarr -u 353 -d /nonexistent -s /usr/bin/nologin"
 iocage exec lidarr chown -R lidarr:lidarr /usr/local/share/Lidarr /config
 iocage exec lidarr mkdir /usr/local/etc/rc.d

From 16cc33e37ba96b9e58396f6343db332094cd42c7 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 27 Feb 2020 19:58:24 +0100
Subject: [PATCH 023/147] Restructure and add update scripts

---
 {jackett-conf => includes/jackett-conf}/jackett.rc   |  0
 {lidarr-conf => includes/lidarr-conf}/lidarr.rc      |  0
 .../organizr-conf}/custom/organizr.conf              |  0
 .../organizr-conf}/custom/phpblock.conf              |  0
 {organizr-conf => includes/organizr-conf}/nginx.conf |  0
 {plex-conf => includes/plex-conf}/FreeBSD.conf       |  0
 {radarr-conf => includes/radarr-conf}/radarr.rc      |  0
 {sonarr-conf => includes/sonarr-conf}/sonarr.rc      |  0
 jackett.sh => install/jackett.sh                     |  2 +-
 lidarr.sh => install/lidarr.sh                       |  2 +-
 organizr.sh => install/organizr.sh                   |  4 ++--
 plex.sh => install/plex.sh                           |  2 +-
 radarr.sh => install/radarr.sh                       |  2 +-
 sonarr.sh => install/sonarr.sh                       |  2 +-
 tautulli.sh => install/tautulli.sh                   |  0
 update-all.sh                                        |  3 +++
 update/jackett.sh                                    |  9 +++++++++
 update/lidarr.sh                                     |  9 +++++++++
 update/organizr.sh                                   | 11 +++++++++++
 update/plex.sh                                       | 12 ++++++++++++
 update/radarr.sh                                     |  9 +++++++++
 update/sonarr.sh                                     |  9 +++++++++
 update/tautulli.sh                                   |  8 ++++++++
 23 files changed, 77 insertions(+), 7 deletions(-)
 rename {jackett-conf => includes/jackett-conf}/jackett.rc (100%)
 rename {lidarr-conf => includes/lidarr-conf}/lidarr.rc (100%)
 rename {organizr-conf => includes/organizr-conf}/custom/organizr.conf (100%)
 rename {organizr-conf => includes/organizr-conf}/custom/phpblock.conf (100%)
 rename {organizr-conf => includes/organizr-conf}/nginx.conf (100%)
 rename {plex-conf => includes/plex-conf}/FreeBSD.conf (100%)
 rename {radarr-conf => includes/radarr-conf}/radarr.rc (100%)
 rename {sonarr-conf => includes/sonarr-conf}/sonarr.rc (100%)
 rename jackett.sh => install/jackett.sh (91%)
 mode change 100755 => 100644
 rename lidarr.sh => install/lidarr.sh (93%)
 mode change 100755 => 100644
 rename organizr.sh => install/organizr.sh (90%)
 mode change 100755 => 100644
 rename plex.sh => install/plex.sh (91%)
 mode change 100755 => 100644
 rename radarr.sh => install/radarr.sh (93%)
 mode change 100755 => 100644
 rename sonarr.sh => install/sonarr.sh (93%)
 mode change 100755 => 100644
 rename tautulli.sh => install/tautulli.sh (100%)
 mode change 100755 => 100644
 create mode 100644 update-all.sh
 create mode 100644 update/jackett.sh
 create mode 100644 update/lidarr.sh
 create mode 100644 update/organizr.sh
 create mode 100644 update/plex.sh
 create mode 100644 update/radarr.sh
 create mode 100644 update/sonarr.sh
 create mode 100644 update/tautulli.sh

diff --git a/jackett-conf/jackett.rc b/includes/jackett-conf/jackett.rc
similarity index 100%
rename from jackett-conf/jackett.rc
rename to includes/jackett-conf/jackett.rc
diff --git a/lidarr-conf/lidarr.rc b/includes/lidarr-conf/lidarr.rc
similarity index 100%
rename from lidarr-conf/lidarr.rc
rename to includes/lidarr-conf/lidarr.rc
diff --git a/organizr-conf/custom/organizr.conf b/includes/organizr-conf/custom/organizr.conf
similarity index 100%
rename from organizr-conf/custom/organizr.conf
rename to includes/organizr-conf/custom/organizr.conf
diff --git a/organizr-conf/custom/phpblock.conf b/includes/organizr-conf/custom/phpblock.conf
similarity index 100%
rename from organizr-conf/custom/phpblock.conf
rename to includes/organizr-conf/custom/phpblock.conf
diff --git a/organizr-conf/nginx.conf b/includes/organizr-conf/nginx.conf
similarity index 100%
rename from organizr-conf/nginx.conf
rename to includes/organizr-conf/nginx.conf
diff --git a/plex-conf/FreeBSD.conf b/includes/plex-conf/FreeBSD.conf
similarity index 100%
rename from plex-conf/FreeBSD.conf
rename to includes/plex-conf/FreeBSD.conf
diff --git a/radarr-conf/radarr.rc b/includes/radarr-conf/radarr.rc
similarity index 100%
rename from radarr-conf/radarr.rc
rename to includes/radarr-conf/radarr.rc
diff --git a/sonarr-conf/sonarr.rc b/includes/sonarr-conf/sonarr.rc
similarity index 100%
rename from sonarr-conf/sonarr.rc
rename to includes/sonarr-conf/sonarr.rc
diff --git a/jackett.sh b/install/jackett.sh
old mode 100755
new mode 100644
similarity index 91%
rename from jackett.sh
rename to install/jackett.sh
index 511597d0..007f9917
--- a/jackett.sh
+++ b/install/jackett.sh
@@ -10,7 +10,7 @@ iocage exec jackett rm /usr/local/share/Jackett.Binaries.Mono.tar.gz
 iocage exec jackett "pw user add jackett -c jackett -u 818 -d /nonexistent -s /usr/bin/nologin"
 iocage exec jackett chown -R jackett:jackett /usr/local/share/Jackett /config
 iocage exec jackett mkdir /usr/local/etc/rc.d
-cp ./jackett-conf/jackett.rc /mnt/tank/iocage/jails/jackett/root/usr/local/etc/rc.d/jackett
+cp ../includes/jackett-conf/jackett.rc /mnt/tank/iocage/jails/jackett/root/usr/local/etc/rc.d/jackett
 iocage exec jackett chmod u+x /usr/local/etc/rc.d/jackett
 iocage exec jackett sysrc "jackett_enable=YES"
 iocage exec jackett service jackett restart
\ No newline at end of file
diff --git a/lidarr.sh b/install/lidarr.sh
old mode 100755
new mode 100644
similarity index 93%
rename from lidarr.sh
rename to install/lidarr.sh
index cca1a347..1bc44173
--- a/lidarr.sh
+++ b/install/lidarr.sh
@@ -14,7 +14,7 @@ iocage exec lidarr "rm /usr/local/share/v0.2.0.371/Lidarr.develop.0.2.0.371.linu
 iocage exec lidarr "pw user add lidarr -c lidarr -u 353 -d /nonexistent -s /usr/bin/nologin"
 iocage exec lidarr chown -R lidarr:lidarr /usr/local/share/Lidarr /config
 iocage exec lidarr mkdir /usr/local/etc/rc.d
-cp ./lidarr-conf/lidarr.rc /mnt/tank/iocage/jails/lidarr/root/usr/local/etc/rc.d/lidarr
+cp ../includes/lidarr-conf/lidarr.rc /mnt/tank/iocage/jails/lidarr/root/usr/local/etc/rc.d/lidarr
 iocage exec lidarr chmod u+x /usr/local/etc/rc.d/lidarr
 iocage exec lidarr sysrc "lidarr_enable=YES"
 iocage exec lidarr service lidarr start
\ No newline at end of file
diff --git a/organizr.sh b/install/organizr.sh
old mode 100755
new mode 100644
similarity index 90%
rename from organizr.sh
rename to install/organizr.sh
index 8b7f8779..eb0cd1e9
--- a/organizr.sh
+++ b/install/organizr.sh
@@ -11,8 +11,8 @@ iocage exec organizr cp /usr/local/etc/php.ini-production /usr/local/etc/php.ini
 iocage exec organizr sed -i '' -e 's?;date.timezone =?date.timezone = "Universal"?g' /usr/local/etc/php.ini
 iocage exec organizr sed -i '' -e 's?;cgi.fix_pathinfo=1?cgi.fix_pathinfo=0?g' /usr/local/etc/php.ini
 mv /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/nginx.conf /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/nginx.conf.bak
-cp ./organizr-conf/nginx.conf /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/nginx.conf
-cp ./organizr-conf/custom /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/custom
+cp ../includes/organizr-conf/nginx.conf /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/nginx.conf
+cp ../includes/organizr-conf/custom /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/custom
 iocage exec organizr git clone https://github.com/causefx/Organizr.git /usr/local/www/Organizr
 iocage exec organizr chown -R www:www /usr/local/www /config /usr/local/etc/nginx/nginx.conf /usr/local/etc/nginx/custom
 iocage exec organizr ln -s /config/config.php /usr/local/www/Organizr/api/config/config.php
diff --git a/plex.sh b/install/plex.sh
old mode 100755
new mode 100644
similarity index 91%
rename from plex.sh
rename to install/plex.sh
index 6cb88c54..42eac7de
--- a/plex.sh
+++ b/install/plex.sh
@@ -4,7 +4,7 @@ echo '{"pkgs":["plexmediaserver-plexpass","ca_root_nss","nano"]}' > /tmp/pkg.jso
 iocage create -n "plex" -p /tmp/pkg.json -r 11.3-RELEASE interfaces="vnet0:bridge30" ip4_addr="vnet0|192.168.30.26/24" defaultrouter="192.168.30.1" vnet="on" allow_raw_sockets="1" boot="on"
 rm /tmp/pkg.json
 iocage exec plex "mkdir -p /usr/local/etc/pkg/repos"
-cp ./plex-conf/FreeBSD.conf /mnt/tank/iocage/jails/plex/root/usr/local/etc/pkg/repos/FreeBSD.conf
+cp ../includes/plex-conf/FreeBSD.conf /mnt/tank/iocage/jails/plex/root/usr/local/etc/pkg/repos/FreeBSD.conf
 iocage exec plex mkdir -p /config
 iocage exec plex mkdir -p /mnt/library
 iocage fstab -a plex /mnt/tank/apps/plex /config nullfs rw 0 0
diff --git a/radarr.sh b/install/radarr.sh
old mode 100755
new mode 100644
similarity index 93%
rename from radarr.sh
rename to install/radarr.sh
index dff0d8d1..9a4facad
--- a/radarr.sh
+++ b/install/radarr.sh
@@ -14,7 +14,7 @@ iocage exec radarr rm /usr/local/share/Radarr.develop.0.2.0.1480.linux.tar.gz
 iocage exec radarr "pw user add radarr -c radarr -u 352 -d /nonexistent -s /usr/bin/nologin"
 iocage exec radarr chown -R radarr:radarr /usr/local/share/Radarr /config
 iocage exec radarr mkdir /usr/local/etc/rc.d
-cp ./radarr-conf/radarr.rc /mnt/tank/iocage/jails/radarr/root/usr/local/etc/rc.d/radarr
+cp ../includes/radarr-conf/radarr.rc /mnt/tank/iocage/jails/radarr/root/usr/local/etc/rc.d/radarr
 iocage exec radarr chmod u+x /usr/local/etc/rc.d/radarr
 iocage exec radarr sysrc "radarr_enable=YES"
 iocage exec radarr service radarr start
\ No newline at end of file
diff --git a/sonarr.sh b/install/sonarr.sh
old mode 100755
new mode 100644
similarity index 93%
rename from sonarr.sh
rename to install/sonarr.sh
index 078f8600..4ef3722f
--- a/sonarr.sh
+++ b/install/sonarr.sh
@@ -14,7 +14,7 @@ iocage exec sonarr rm /usr/local/share/NzbDrone.master.tar.gz
 iocage exec sonarr "pw user add sonarr -c sonarr -u 351 -d /nonexistent -s /usr/bin/nologin"
 iocage exec sonarr chown -R sonarr:sonarr /usr/local/share/NzbDrone /config
 iocage exec sonarr mkdir /usr/local/etc/rc.d
-cp ./sonarr-conf/sonarr.rc /mnt/tank/iocage/jails/sonarr/root/usr/local/etc/rc.d/sonarr
+cp ../includes/sonarr-conf/sonarr.rc /mnt/tank/iocage/jails/sonarr/root/usr/local/etc/rc.d/sonarr
 iocage exec sonarr chmod u+x /usr/local/etc/rc.d/sonarr
 iocage exec sonarr sysrc "sonarr_enable=YES"
 iocage exec sonarr service sonarr start
\ No newline at end of file
diff --git a/tautulli.sh b/install/tautulli.sh
old mode 100755
new mode 100644
similarity index 100%
rename from tautulli.sh
rename to install/tautulli.sh
diff --git a/update-all.sh b/update-all.sh
new file mode 100644
index 00000000..9cb5f85b
--- /dev/null
+++ b/update-all.sh
@@ -0,0 +1,3 @@
+for f in ./update/*.sh; do
+  bash "$f" -H 
+done
\ No newline at end of file
diff --git a/update/jackett.sh b/update/jackett.sh
new file mode 100644
index 00000000..373f6107
--- /dev/null
+++ b/update/jackett.sh
@@ -0,0 +1,9 @@
+iocage exec jackett service jackett stop
+iocage exec jackett pkg update -y && pkg upgrade -y
+iocage exec jackett "fetch https://github.com/Jackett/Jackett/releases/download/v0.11.502/Jackett.Binaries.Mono.tar.gz -o /usr/local/share"
+iocage exec jackett "tar -xzvf /usr/local/share/Jackett.Binaries.Mono.tar.gz -C /usr/local/share"
+iocage exec jackett rm /usr/local/share/Jackett.Binaries.Mono.tar.gz
+iocage exec jackett chown -R jackett:jackett /usr/local/share/Jackett /config
+cp ../includes/jackett-conf/jackett.rc /mnt/tank/iocage/jails/jackett/root/usr/local/etc/rc.d/jackett
+iocage exec jackett chmod u+x /usr/local/etc/rc.d/jackett
+iocage exec jackett service jackett start
\ No newline at end of file
diff --git a/update/lidarr.sh b/update/lidarr.sh
new file mode 100644
index 00000000..713c5f8c
--- /dev/null
+++ b/update/lidarr.sh
@@ -0,0 +1,9 @@
+iocage exec lidarr service lidarr stop
+iocage exec lidarr pkg update -y && pkg upgrade -y
+iocage exec lidarr "fetch https://github.com/lidarr/Lidarr/releases/download/v0.2.0.371/Lidarr.develop.0.2.0.371.linux.tar.gz -o /usr/local/share"
+iocage exec lidarr "tar -xzvf /usr/local/share/v0.2.0.371/Lidarr.develop.0.2.0.371.linux.tar.gz -C /usr/local/share"
+iocage exec lidarr "rm /usr/local/share/v0.2.0.371/Lidarr.develop.0.2.0.371.linux.tar.gz"
+iocage exec lidarr chown -R lidarr:lidarr /usr/local/share/Lidarr /config
+cp ../includes/lidarr-conf/lidarr.rc /mnt/tank/iocage/jails/lidarr/root/usr/local/etc/rc.d/lidarr
+iocage exec lidarr chmod u+x /usr/local/etc/rc.d/lidarr
+iocage exec lidarr service lidarr start
\ No newline at end of file
diff --git a/update/organizr.sh b/update/organizr.sh
new file mode 100644
index 00000000..983d06f2
--- /dev/null
+++ b/update/organizr.sh
@@ -0,0 +1,11 @@
+iocage exec organizr service nginx stop
+iocage exec organizr service php-fpm stop
+iocage exec organizr pkg update -y && pkg upgrade -y
+mv /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/nginx.conf /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/nginx.conf.bak
+cp ../includes/organizr-conf/nginx.conf /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/nginx.conf
+cp ../includes/organizr-conf/custom /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/custom
+iocage exec tautulli cd /usr/local/www/Organizr
+iocage exec organizr git pull
+iocage exec organizr chown -R www:www /usr/local/www /config /usr/local/etc/nginx/nginx.conf /usr/local/etc/nginx/custom
+iocage exec organizr service nginx start
+iocage exec organizr service php-fpm start
\ No newline at end of file
diff --git a/update/plex.sh b/update/plex.sh
new file mode 100644
index 00000000..546f0646
--- /dev/null
+++ b/update/plex.sh
@@ -0,0 +1,12 @@
+iocage exec plex service plexmediaserver_plexpass stop
+iocage exec plex pkg update -y && pkg upgrade -y
+iocage exec plex chown -R plex:plex /usr/local/share/plexmediaserver-plexpass/
+iocage exec plex service plexmediaserver_plexpass start
+sleep 10s
+echo "Waiting 20s to stop plex"
+iocage stop plex
+sleep 10s
+echo "Waiting 20s to start plex"
+iocage start plex
+iocage exec plex service plexmediaserver_plexpass start
+echo "Finished installing plex"
\ No newline at end of file
diff --git a/update/radarr.sh b/update/radarr.sh
new file mode 100644
index 00000000..e8c4befa
--- /dev/null
+++ b/update/radarr.sh
@@ -0,0 +1,9 @@
+iocage exec radarr service radarr stop
+iocage exec radarr pkg update -y && pkg upgrade -y
+iocage exec radarr "fetch https://github.com/Radarr/Radarr/releases/download/v0.2.0.1480/Radarr.develop.0.2.0.1480.linux.tar.gz -o /usr/local/share"
+iocage exec radarr "tar -xzvf /usr/local/share/Radarr.develop.0.2.0.1480.linux.tar.gz -C /usr/local/share"
+iocage exec radarr rm /usr/local/share/Radarr.develop.0.2.0.1480.linux.tar.gz
+iocage exec radarr chown -R radarr:radarr /usr/local/share/Radarr /config
+cp ../includes/radarr-conf/radarr.rc /mnt/tank/iocage/jails/radarr/root/usr/local/etc/rc.d/radarr
+iocage exec radarr chmod u+x /usr/local/etc/rc.d/radarr
+iocage exec radarr service radarr start
\ No newline at end of file
diff --git a/update/sonarr.sh b/update/sonarr.sh
new file mode 100644
index 00000000..df1e3f8c
--- /dev/null
+++ b/update/sonarr.sh
@@ -0,0 +1,9 @@
+iocage exec sonarr service sonarr stop
+iocage exec sonarr pkg update -y && pkg upgrade -y
+iocage exec sonarr "fetch http://download.sonarr.tv/v2/master/mono/NzbDrone.master.tar.gz -o /usr/local/share"
+iocage exec sonarr "tar -xzvf /usr/local/share/NzbDrone.master.tar.gz -C /usr/local/share"
+iocage exec sonarr rm /usr/local/share/NzbDrone.master.tar.gz
+iocage exec sonarr chown -R sonarr:sonarr /usr/local/share/NzbDrone /config
+cp ../includes/sonarr-conf/sonarr.rc /mnt/tank/iocage/jails/sonarr/root/usr/local/etc/rc.d/sonarr
+iocage exec sonarr chmod u+x /usr/local/etc/rc.d/sonarr
+iocage exec sonarr service sonarr start
\ No newline at end of file
diff --git a/update/tautulli.sh b/update/tautulli.sh
new file mode 100644
index 00000000..85105f40
--- /dev/null
+++ b/update/tautulli.sh
@@ -0,0 +1,8 @@
+iocage exec tautulli service tautulli stop
+iocage exec tautulli pkg update -y && pkg upgrade -y
+iocage exec tautulli cd /usr/local/share/Tautulli
+iocage exec tautulli git pull
+iocage exec tautulli chown -R tautulli:tautulli /usr/local/share/Tautulli /config
+iocage exec tautulli cp /usr/local/share/Tautulli/init-scripts/init.freenas /usr/local/etc/rc.d/tautulli
+iocage exec tautulli chmod u+x /usr/local/etc/rc.d/tautulli
+iocage exec tautulli service tautulli start
\ No newline at end of file

From dde01fd62ba71d81d3ae97f2518d1d8d943a541e Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 27 Feb 2020 19:59:39 +0100
Subject: [PATCH 024/147] make update executable

---
 update-all.sh      | 0
 update/jackett.sh  | 0
 update/lidarr.sh   | 0
 update/organizr.sh | 0
 update/plex.sh     | 0
 update/radarr.sh   | 0
 update/sonarr.sh   | 0
 update/tautulli.sh | 0
 8 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 update-all.sh
 mode change 100644 => 100755 update/jackett.sh
 mode change 100644 => 100755 update/lidarr.sh
 mode change 100644 => 100755 update/organizr.sh
 mode change 100644 => 100755 update/plex.sh
 mode change 100644 => 100755 update/radarr.sh
 mode change 100644 => 100755 update/sonarr.sh
 mode change 100644 => 100755 update/tautulli.sh

diff --git a/update-all.sh b/update-all.sh
old mode 100644
new mode 100755
diff --git a/update/jackett.sh b/update/jackett.sh
old mode 100644
new mode 100755
diff --git a/update/lidarr.sh b/update/lidarr.sh
old mode 100644
new mode 100755
diff --git a/update/organizr.sh b/update/organizr.sh
old mode 100644
new mode 100755
diff --git a/update/plex.sh b/update/plex.sh
old mode 100644
new mode 100755
diff --git a/update/radarr.sh b/update/radarr.sh
old mode 100644
new mode 100755
diff --git a/update/sonarr.sh b/update/sonarr.sh
old mode 100644
new mode 100755
diff --git a/update/tautulli.sh b/update/tautulli.sh
old mode 100644
new mode 100755

From acd23d8798c20fd40fd1d79b6b1c3fe5285f2e25 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 27 Feb 2020 20:02:37 +0100
Subject: [PATCH 025/147] some update fixes

---
 update-all.sh      | 3 ++-
 update/jackett.sh  | 2 +-
 update/lidarr.sh   | 2 +-
 update/organizr.sh | 2 +-
 update/plex.sh     | 2 +-
 update/radarr.sh   | 2 +-
 update/sonarr.sh   | 2 +-
 update/tautulli.sh | 2 +-
 8 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/update-all.sh b/update-all.sh
index 9cb5f85b..d95f2d9d 100755
--- a/update-all.sh
+++ b/update-all.sh
@@ -1,3 +1,4 @@
-for f in ./update/*.sh; do
+cd update
+for f in *.sh; do
   bash "$f" -H 
 done
\ No newline at end of file
diff --git a/update/jackett.sh b/update/jackett.sh
index 373f6107..fb9ffb76 100755
--- a/update/jackett.sh
+++ b/update/jackett.sh
@@ -1,5 +1,5 @@
 iocage exec jackett service jackett stop
-iocage exec jackett pkg update -y && pkg upgrade -y
+iocage exec jackett pkg update && pkg upgrade -y
 iocage exec jackett "fetch https://github.com/Jackett/Jackett/releases/download/v0.11.502/Jackett.Binaries.Mono.tar.gz -o /usr/local/share"
 iocage exec jackett "tar -xzvf /usr/local/share/Jackett.Binaries.Mono.tar.gz -C /usr/local/share"
 iocage exec jackett rm /usr/local/share/Jackett.Binaries.Mono.tar.gz
diff --git a/update/lidarr.sh b/update/lidarr.sh
index 713c5f8c..791500a3 100755
--- a/update/lidarr.sh
+++ b/update/lidarr.sh
@@ -1,5 +1,5 @@
 iocage exec lidarr service lidarr stop
-iocage exec lidarr pkg update -y && pkg upgrade -y
+iocage exec lidarr pkg update && pkg upgrade -y
 iocage exec lidarr "fetch https://github.com/lidarr/Lidarr/releases/download/v0.2.0.371/Lidarr.develop.0.2.0.371.linux.tar.gz -o /usr/local/share"
 iocage exec lidarr "tar -xzvf /usr/local/share/v0.2.0.371/Lidarr.develop.0.2.0.371.linux.tar.gz -C /usr/local/share"
 iocage exec lidarr "rm /usr/local/share/v0.2.0.371/Lidarr.develop.0.2.0.371.linux.tar.gz"
diff --git a/update/organizr.sh b/update/organizr.sh
index 983d06f2..b85fbf45 100755
--- a/update/organizr.sh
+++ b/update/organizr.sh
@@ -1,6 +1,6 @@
 iocage exec organizr service nginx stop
 iocage exec organizr service php-fpm stop
-iocage exec organizr pkg update -y && pkg upgrade -y
+iocage exec organizr pkg update && pkg upgrade -y
 mv /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/nginx.conf /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/nginx.conf.bak
 cp ../includes/organizr-conf/nginx.conf /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/nginx.conf
 cp ../includes/organizr-conf/custom /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/custom
diff --git a/update/plex.sh b/update/plex.sh
index 546f0646..2a733b15 100755
--- a/update/plex.sh
+++ b/update/plex.sh
@@ -1,5 +1,5 @@
 iocage exec plex service plexmediaserver_plexpass stop
-iocage exec plex pkg update -y && pkg upgrade -y
+iocage exec plex pkg update && pkg upgrade -y
 iocage exec plex chown -R plex:plex /usr/local/share/plexmediaserver-plexpass/
 iocage exec plex service plexmediaserver_plexpass start
 sleep 10s
diff --git a/update/radarr.sh b/update/radarr.sh
index e8c4befa..cc2431ba 100755
--- a/update/radarr.sh
+++ b/update/radarr.sh
@@ -1,5 +1,5 @@
 iocage exec radarr service radarr stop
-iocage exec radarr pkg update -y && pkg upgrade -y
+iocage exec radarr pkg update && pkg upgrade -y
 iocage exec radarr "fetch https://github.com/Radarr/Radarr/releases/download/v0.2.0.1480/Radarr.develop.0.2.0.1480.linux.tar.gz -o /usr/local/share"
 iocage exec radarr "tar -xzvf /usr/local/share/Radarr.develop.0.2.0.1480.linux.tar.gz -C /usr/local/share"
 iocage exec radarr rm /usr/local/share/Radarr.develop.0.2.0.1480.linux.tar.gz
diff --git a/update/sonarr.sh b/update/sonarr.sh
index df1e3f8c..6ea47df0 100755
--- a/update/sonarr.sh
+++ b/update/sonarr.sh
@@ -1,5 +1,5 @@
 iocage exec sonarr service sonarr stop
-iocage exec sonarr pkg update -y && pkg upgrade -y
+iocage exec sonarr pkg update && pkg upgrade -y
 iocage exec sonarr "fetch http://download.sonarr.tv/v2/master/mono/NzbDrone.master.tar.gz -o /usr/local/share"
 iocage exec sonarr "tar -xzvf /usr/local/share/NzbDrone.master.tar.gz -C /usr/local/share"
 iocage exec sonarr rm /usr/local/share/NzbDrone.master.tar.gz
diff --git a/update/tautulli.sh b/update/tautulli.sh
index 85105f40..6cbda4c1 100755
--- a/update/tautulli.sh
+++ b/update/tautulli.sh
@@ -1,5 +1,5 @@
 iocage exec tautulli service tautulli stop
-iocage exec tautulli pkg update -y && pkg upgrade -y
+iocage exec tautulli pkg update && pkg upgrade -y
 iocage exec tautulli cd /usr/local/share/Tautulli
 iocage exec tautulli git pull
 iocage exec tautulli chown -R tautulli:tautulli /usr/local/share/Tautulli /config

From 5f78bd56159da64ceb8f133de9aadc46a98b66e7 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 27 Feb 2020 20:06:16 +0100
Subject: [PATCH 026/147] use iocage update

---
 update/jackett.sh  | 2 +-
 update/lidarr.sh   | 2 +-
 update/organizr.sh | 2 +-
 update/plex.sh     | 2 +-
 update/radarr.sh   | 2 +-
 update/sonarr.sh   | 2 +-
 update/tautulli.sh | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/update/jackett.sh b/update/jackett.sh
index fb9ffb76..e4b25080 100755
--- a/update/jackett.sh
+++ b/update/jackett.sh
@@ -1,5 +1,5 @@
 iocage exec jackett service jackett stop
-iocage exec jackett pkg update && pkg upgrade -y
+iocage update jackett
 iocage exec jackett "fetch https://github.com/Jackett/Jackett/releases/download/v0.11.502/Jackett.Binaries.Mono.tar.gz -o /usr/local/share"
 iocage exec jackett "tar -xzvf /usr/local/share/Jackett.Binaries.Mono.tar.gz -C /usr/local/share"
 iocage exec jackett rm /usr/local/share/Jackett.Binaries.Mono.tar.gz
diff --git a/update/lidarr.sh b/update/lidarr.sh
index 791500a3..11f6688f 100755
--- a/update/lidarr.sh
+++ b/update/lidarr.sh
@@ -1,5 +1,5 @@
 iocage exec lidarr service lidarr stop
-iocage exec lidarr pkg update && pkg upgrade -y
+iocage update lidarr
 iocage exec lidarr "fetch https://github.com/lidarr/Lidarr/releases/download/v0.2.0.371/Lidarr.develop.0.2.0.371.linux.tar.gz -o /usr/local/share"
 iocage exec lidarr "tar -xzvf /usr/local/share/v0.2.0.371/Lidarr.develop.0.2.0.371.linux.tar.gz -C /usr/local/share"
 iocage exec lidarr "rm /usr/local/share/v0.2.0.371/Lidarr.develop.0.2.0.371.linux.tar.gz"
diff --git a/update/organizr.sh b/update/organizr.sh
index b85fbf45..d313fd82 100755
--- a/update/organizr.sh
+++ b/update/organizr.sh
@@ -1,6 +1,6 @@
 iocage exec organizr service nginx stop
 iocage exec organizr service php-fpm stop
-iocage exec organizr pkg update && pkg upgrade -y
+iocage update organizr
 mv /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/nginx.conf /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/nginx.conf.bak
 cp ../includes/organizr-conf/nginx.conf /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/nginx.conf
 cp ../includes/organizr-conf/custom /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/custom
diff --git a/update/plex.sh b/update/plex.sh
index 2a733b15..fb607688 100755
--- a/update/plex.sh
+++ b/update/plex.sh
@@ -1,5 +1,5 @@
 iocage exec plex service plexmediaserver_plexpass stop
-iocage exec plex pkg update && pkg upgrade -y
+iocage update plex
 iocage exec plex chown -R plex:plex /usr/local/share/plexmediaserver-plexpass/
 iocage exec plex service plexmediaserver_plexpass start
 sleep 10s
diff --git a/update/radarr.sh b/update/radarr.sh
index cc2431ba..652a1930 100755
--- a/update/radarr.sh
+++ b/update/radarr.sh
@@ -1,5 +1,5 @@
 iocage exec radarr service radarr stop
-iocage exec radarr pkg update && pkg upgrade -y
+iocage update radarr
 iocage exec radarr "fetch https://github.com/Radarr/Radarr/releases/download/v0.2.0.1480/Radarr.develop.0.2.0.1480.linux.tar.gz -o /usr/local/share"
 iocage exec radarr "tar -xzvf /usr/local/share/Radarr.develop.0.2.0.1480.linux.tar.gz -C /usr/local/share"
 iocage exec radarr rm /usr/local/share/Radarr.develop.0.2.0.1480.linux.tar.gz
diff --git a/update/sonarr.sh b/update/sonarr.sh
index 6ea47df0..d90688e1 100755
--- a/update/sonarr.sh
+++ b/update/sonarr.sh
@@ -1,5 +1,5 @@
 iocage exec sonarr service sonarr stop
-iocage exec sonarr pkg update && pkg upgrade -y
+iocage update sonarr
 iocage exec sonarr "fetch http://download.sonarr.tv/v2/master/mono/NzbDrone.master.tar.gz -o /usr/local/share"
 iocage exec sonarr "tar -xzvf /usr/local/share/NzbDrone.master.tar.gz -C /usr/local/share"
 iocage exec sonarr rm /usr/local/share/NzbDrone.master.tar.gz
diff --git a/update/tautulli.sh b/update/tautulli.sh
index 6cbda4c1..53c45322 100755
--- a/update/tautulli.sh
+++ b/update/tautulli.sh
@@ -1,5 +1,5 @@
 iocage exec tautulli service tautulli stop
-iocage exec tautulli pkg update && pkg upgrade -y
+iocage update tautulli
 iocage exec tautulli cd /usr/local/share/Tautulli
 iocage exec tautulli git pull
 iocage exec tautulli chown -R tautulli:tautulli /usr/local/share/Tautulli /config

From 3fbe0adcf59318ec025ee7021d70294705226c7b Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 27 Feb 2020 20:10:10 +0100
Subject: [PATCH 027/147] sh?

---
 update-all.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/update-all.sh b/update-all.sh
index d95f2d9d..06d23294 100755
--- a/update-all.sh
+++ b/update-all.sh
@@ -1,4 +1,4 @@
 cd update
 for f in *.sh; do
-  bash "$f" -H 
+  sh "$f"
 done
\ No newline at end of file

From 40336033fc9962d491b03fc977cccc8019dcf66b Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 27 Feb 2020 20:16:19 +0100
Subject: [PATCH 028/147] also pkg the right way

---
 update/jackett.sh  | 1 +
 update/lidarr.sh   | 1 +
 update/organizr.sh | 1 +
 update/plex.sh     | 1 +
 update/radarr.sh   | 1 +
 update/sonarr.sh   | 1 +
 update/tautulli.sh | 1 +
 7 files changed, 7 insertions(+)

diff --git a/update/jackett.sh b/update/jackett.sh
index e4b25080..3a7d8c22 100755
--- a/update/jackett.sh
+++ b/update/jackett.sh
@@ -1,5 +1,6 @@
 iocage exec jackett service jackett stop
 iocage update jackett
+iocage exec jackett "pkg update && pkg upgrade -y"
 iocage exec jackett "fetch https://github.com/Jackett/Jackett/releases/download/v0.11.502/Jackett.Binaries.Mono.tar.gz -o /usr/local/share"
 iocage exec jackett "tar -xzvf /usr/local/share/Jackett.Binaries.Mono.tar.gz -C /usr/local/share"
 iocage exec jackett rm /usr/local/share/Jackett.Binaries.Mono.tar.gz
diff --git a/update/lidarr.sh b/update/lidarr.sh
index 11f6688f..a88b69d9 100755
--- a/update/lidarr.sh
+++ b/update/lidarr.sh
@@ -1,5 +1,6 @@
 iocage exec lidarr service lidarr stop
 iocage update lidarr
+iocage exec lidarr "pkg update && pkg upgrade -y"
 iocage exec lidarr "fetch https://github.com/lidarr/Lidarr/releases/download/v0.2.0.371/Lidarr.develop.0.2.0.371.linux.tar.gz -o /usr/local/share"
 iocage exec lidarr "tar -xzvf /usr/local/share/v0.2.0.371/Lidarr.develop.0.2.0.371.linux.tar.gz -C /usr/local/share"
 iocage exec lidarr "rm /usr/local/share/v0.2.0.371/Lidarr.develop.0.2.0.371.linux.tar.gz"
diff --git a/update/organizr.sh b/update/organizr.sh
index d313fd82..aa02652c 100755
--- a/update/organizr.sh
+++ b/update/organizr.sh
@@ -1,6 +1,7 @@
 iocage exec organizr service nginx stop
 iocage exec organizr service php-fpm stop
 iocage update organizr
+iocage exec organizr "pkg update && pkg upgrade -y"
 mv /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/nginx.conf /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/nginx.conf.bak
 cp ../includes/organizr-conf/nginx.conf /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/nginx.conf
 cp ../includes/organizr-conf/custom /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/custom
diff --git a/update/plex.sh b/update/plex.sh
index fb607688..e0ed9634 100755
--- a/update/plex.sh
+++ b/update/plex.sh
@@ -1,5 +1,6 @@
 iocage exec plex service plexmediaserver_plexpass stop
 iocage update plex
+iocage exec plex "pkg update && pkg upgrade -y"
 iocage exec plex chown -R plex:plex /usr/local/share/plexmediaserver-plexpass/
 iocage exec plex service plexmediaserver_plexpass start
 sleep 10s
diff --git a/update/radarr.sh b/update/radarr.sh
index 652a1930..7efc1334 100755
--- a/update/radarr.sh
+++ b/update/radarr.sh
@@ -1,5 +1,6 @@
 iocage exec radarr service radarr stop
 iocage update radarr
+iocage exec radarr "pkg update && pkg upgrade -y"
 iocage exec radarr "fetch https://github.com/Radarr/Radarr/releases/download/v0.2.0.1480/Radarr.develop.0.2.0.1480.linux.tar.gz -o /usr/local/share"
 iocage exec radarr "tar -xzvf /usr/local/share/Radarr.develop.0.2.0.1480.linux.tar.gz -C /usr/local/share"
 iocage exec radarr rm /usr/local/share/Radarr.develop.0.2.0.1480.linux.tar.gz
diff --git a/update/sonarr.sh b/update/sonarr.sh
index d90688e1..a3b4f3c2 100755
--- a/update/sonarr.sh
+++ b/update/sonarr.sh
@@ -1,5 +1,6 @@
 iocage exec sonarr service sonarr stop
 iocage update sonarr
+iocage exec sonarr "pkg update && pkg upgrade -y"
 iocage exec sonarr "fetch http://download.sonarr.tv/v2/master/mono/NzbDrone.master.tar.gz -o /usr/local/share"
 iocage exec sonarr "tar -xzvf /usr/local/share/NzbDrone.master.tar.gz -C /usr/local/share"
 iocage exec sonarr rm /usr/local/share/NzbDrone.master.tar.gz
diff --git a/update/tautulli.sh b/update/tautulli.sh
index 53c45322..5f357e6a 100755
--- a/update/tautulli.sh
+++ b/update/tautulli.sh
@@ -1,5 +1,6 @@
 iocage exec tautulli service tautulli stop
 iocage update tautulli
+iocage exec tautulli "pkg update && pkg upgrade -y"
 iocage exec tautulli cd /usr/local/share/Tautulli
 iocage exec tautulli git pull
 iocage exec tautulli chown -R tautulli:tautulli /usr/local/share/Tautulli /config

From 7f24bd993821e747f9b308dee85992209698cb47 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 27 Feb 2020 20:30:33 +0100
Subject: [PATCH 029/147] bug fixes

---
 update/lidarr.sh   | 2 +-
 update/organizr.sh | 6 ++----
 update/tautulli.sh | 3 +--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/update/lidarr.sh b/update/lidarr.sh
index a88b69d9..12003d49 100755
--- a/update/lidarr.sh
+++ b/update/lidarr.sh
@@ -2,7 +2,7 @@ iocage exec lidarr service lidarr stop
 iocage update lidarr
 iocage exec lidarr "pkg update && pkg upgrade -y"
 iocage exec lidarr "fetch https://github.com/lidarr/Lidarr/releases/download/v0.2.0.371/Lidarr.develop.0.2.0.371.linux.tar.gz -o /usr/local/share"
-iocage exec lidarr "tar -xzvf /usr/local/share/v0.2.0.371/Lidarr.develop.0.2.0.371.linux.tar.gz -C /usr/local/share"
+iocage exec lidarr "tar -xzvf /usr/local/share/Lidarr.develop.0.2.0.371.linux.tar.gz -C /usr/local/share"
 iocage exec lidarr "rm /usr/local/share/v0.2.0.371/Lidarr.develop.0.2.0.371.linux.tar.gz"
 iocage exec lidarr chown -R lidarr:lidarr /usr/local/share/Lidarr /config
 cp ../includes/lidarr-conf/lidarr.rc /mnt/tank/iocage/jails/lidarr/root/usr/local/etc/rc.d/lidarr
diff --git a/update/organizr.sh b/update/organizr.sh
index aa02652c..3e053cee 100755
--- a/update/organizr.sh
+++ b/update/organizr.sh
@@ -2,11 +2,9 @@ iocage exec organizr service nginx stop
 iocage exec organizr service php-fpm stop
 iocage update organizr
 iocage exec organizr "pkg update && pkg upgrade -y"
-mv /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/nginx.conf /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/nginx.conf.bak
 cp ../includes/organizr-conf/nginx.conf /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/nginx.conf
-cp ../includes/organizr-conf/custom /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/custom
-iocage exec tautulli cd /usr/local/www/Organizr
-iocage exec organizr git pull
+cp ../includes/organizr-conf/custom/*.* /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/custom/
+iocage exec organizr "cd /usr/local/www/Organizr && git pull"
 iocage exec organizr chown -R www:www /usr/local/www /config /usr/local/etc/nginx/nginx.conf /usr/local/etc/nginx/custom
 iocage exec organizr service nginx start
 iocage exec organizr service php-fpm start
\ No newline at end of file
diff --git a/update/tautulli.sh b/update/tautulli.sh
index 5f357e6a..a31bcab1 100755
--- a/update/tautulli.sh
+++ b/update/tautulli.sh
@@ -1,8 +1,7 @@
 iocage exec tautulli service tautulli stop
 iocage update tautulli
 iocage exec tautulli "pkg update && pkg upgrade -y"
-iocage exec tautulli cd /usr/local/share/Tautulli
-iocage exec tautulli git pull
+iocage exec tautulli "cd /usr/local/share/Tautulli && git pull"
 iocage exec tautulli chown -R tautulli:tautulli /usr/local/share/Tautulli /config
 iocage exec tautulli cp /usr/local/share/Tautulli/init-scripts/init.freenas /usr/local/etc/rc.d/tautulli
 iocage exec tautulli chmod u+x /usr/local/etc/rc.d/tautulli

From c3669c5d30953bfb5f02892524ec7dc7029080fd Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 27 Feb 2020 20:42:01 +0100
Subject: [PATCH 030/147] remove update from apps with in-app updater

---
 update/jackett.sh  | 5 +----
 update/lidarr.sh   | 5 +----
 update/plex.sh     | 9 ++-------
 update/radarr.sh   | 5 +----
 update/sonarr.sh   | 5 +----
 update/tautulli.sh | 3 +--
 6 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/update/jackett.sh b/update/jackett.sh
index 3a7d8c22..1c594b8a 100755
--- a/update/jackett.sh
+++ b/update/jackett.sh
@@ -1,10 +1,7 @@
 iocage exec jackett service jackett stop
 iocage update jackett
 iocage exec jackett "pkg update && pkg upgrade -y"
-iocage exec jackett "fetch https://github.com/Jackett/Jackett/releases/download/v0.11.502/Jackett.Binaries.Mono.tar.gz -o /usr/local/share"
-iocage exec jackett "tar -xzvf /usr/local/share/Jackett.Binaries.Mono.tar.gz -C /usr/local/share"
-iocage exec jackett rm /usr/local/share/Jackett.Binaries.Mono.tar.gz
 iocage exec jackett chown -R jackett:jackett /usr/local/share/Jackett /config
 cp ../includes/jackett-conf/jackett.rc /mnt/tank/iocage/jails/jackett/root/usr/local/etc/rc.d/jackett
 iocage exec jackett chmod u+x /usr/local/etc/rc.d/jackett
-iocage exec jackett service jackett start
\ No newline at end of file
+iocage exec jackett service jackett restart
\ No newline at end of file
diff --git a/update/lidarr.sh b/update/lidarr.sh
index 12003d49..77199c20 100755
--- a/update/lidarr.sh
+++ b/update/lidarr.sh
@@ -1,10 +1,7 @@
 iocage exec lidarr service lidarr stop
 iocage update lidarr
 iocage exec lidarr "pkg update && pkg upgrade -y"
-iocage exec lidarr "fetch https://github.com/lidarr/Lidarr/releases/download/v0.2.0.371/Lidarr.develop.0.2.0.371.linux.tar.gz -o /usr/local/share"
-iocage exec lidarr "tar -xzvf /usr/local/share/Lidarr.develop.0.2.0.371.linux.tar.gz -C /usr/local/share"
-iocage exec lidarr "rm /usr/local/share/v0.2.0.371/Lidarr.develop.0.2.0.371.linux.tar.gz"
 iocage exec lidarr chown -R lidarr:lidarr /usr/local/share/Lidarr /config
 cp ../includes/lidarr-conf/lidarr.rc /mnt/tank/iocage/jails/lidarr/root/usr/local/etc/rc.d/lidarr
 iocage exec lidarr chmod u+x /usr/local/etc/rc.d/lidarr
-iocage exec lidarr service lidarr start
\ No newline at end of file
+iocage exec lidarr service lidarr restart
\ No newline at end of file
diff --git a/update/plex.sh b/update/plex.sh
index e0ed9634..4a184251 100755
--- a/update/plex.sh
+++ b/update/plex.sh
@@ -2,12 +2,7 @@ iocage exec plex service plexmediaserver_plexpass stop
 iocage update plex
 iocage exec plex "pkg update && pkg upgrade -y"
 iocage exec plex chown -R plex:plex /usr/local/share/plexmediaserver-plexpass/
-iocage exec plex service plexmediaserver_plexpass start
+iocage exec plex service plexmediaserver_plexpass restart
 sleep 10s
-echo "Waiting 20s to stop plex"
-iocage stop plex
-sleep 10s
-echo "Waiting 20s to start plex"
-iocage start plex
 iocage exec plex service plexmediaserver_plexpass start
-echo "Finished installing plex"
\ No newline at end of file
+echo "Finished updating plex"
\ No newline at end of file
diff --git a/update/radarr.sh b/update/radarr.sh
index 7efc1334..3844aac4 100755
--- a/update/radarr.sh
+++ b/update/radarr.sh
@@ -1,10 +1,7 @@
 iocage exec radarr service radarr stop
 iocage update radarr
 iocage exec radarr "pkg update && pkg upgrade -y"
-iocage exec radarr "fetch https://github.com/Radarr/Radarr/releases/download/v0.2.0.1480/Radarr.develop.0.2.0.1480.linux.tar.gz -o /usr/local/share"
-iocage exec radarr "tar -xzvf /usr/local/share/Radarr.develop.0.2.0.1480.linux.tar.gz -C /usr/local/share"
-iocage exec radarr rm /usr/local/share/Radarr.develop.0.2.0.1480.linux.tar.gz
 iocage exec radarr chown -R radarr:radarr /usr/local/share/Radarr /config
 cp ../includes/radarr-conf/radarr.rc /mnt/tank/iocage/jails/radarr/root/usr/local/etc/rc.d/radarr
 iocage exec radarr chmod u+x /usr/local/etc/rc.d/radarr
-iocage exec radarr service radarr start
\ No newline at end of file
+iocage exec radarr service radarr restart
\ No newline at end of file
diff --git a/update/sonarr.sh b/update/sonarr.sh
index a3b4f3c2..ea80f064 100755
--- a/update/sonarr.sh
+++ b/update/sonarr.sh
@@ -1,10 +1,7 @@
 iocage exec sonarr service sonarr stop
 iocage update sonarr
 iocage exec sonarr "pkg update && pkg upgrade -y"
-iocage exec sonarr "fetch http://download.sonarr.tv/v2/master/mono/NzbDrone.master.tar.gz -o /usr/local/share"
-iocage exec sonarr "tar -xzvf /usr/local/share/NzbDrone.master.tar.gz -C /usr/local/share"
-iocage exec sonarr rm /usr/local/share/NzbDrone.master.tar.gz
 iocage exec sonarr chown -R sonarr:sonarr /usr/local/share/NzbDrone /config
 cp ../includes/sonarr-conf/sonarr.rc /mnt/tank/iocage/jails/sonarr/root/usr/local/etc/rc.d/sonarr
 iocage exec sonarr chmod u+x /usr/local/etc/rc.d/sonarr
-iocage exec sonarr service sonarr start
\ No newline at end of file
+iocage exec sonarr service sonarr restart
\ No newline at end of file
diff --git a/update/tautulli.sh b/update/tautulli.sh
index a31bcab1..7a2576b8 100755
--- a/update/tautulli.sh
+++ b/update/tautulli.sh
@@ -1,8 +1,7 @@
 iocage exec tautulli service tautulli stop
 iocage update tautulli
 iocage exec tautulli "pkg update && pkg upgrade -y"
-iocage exec tautulli "cd /usr/local/share/Tautulli && git pull"
 iocage exec tautulli chown -R tautulli:tautulli /usr/local/share/Tautulli /config
 iocage exec tautulli cp /usr/local/share/Tautulli/init-scripts/init.freenas /usr/local/etc/rc.d/tautulli
 iocage exec tautulli chmod u+x /usr/local/etc/rc.d/tautulli
-iocage exec tautulli service tautulli start
\ No newline at end of file
+iocage exec tautulli service tautulli restart
\ No newline at end of file

From 3b3f22f557f05ed68e9f1f2afaf7099dce914bab Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 27 Feb 2020 20:47:01 +0100
Subject: [PATCH 031/147] bugz

---
 install/lidarr.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/lidarr.sh b/install/lidarr.sh
index 1bc44173..b99ea2f8 100644
--- a/install/lidarr.sh
+++ b/install/lidarr.sh
@@ -9,8 +9,8 @@ iocage fstab -a lidarr /mnt/tank/downloads/complete /mnt/fetched nullfs rw 0 0
 iocage fstab -a lidarr /mnt/tank/library/Music /mnt/music nullfs rw 0 0
 iocage exec lidarr ln -s /usr/local/bin/mono /usr/bin/mono
 iocage exec lidarr "fetch https://github.com/lidarr/Lidarr/releases/download/v0.2.0.371/Lidarr.develop.0.2.0.371.linux.tar.gz -o /usr/local/share"
-iocage exec lidarr "tar -xzvf /usr/local/share/v0.2.0.371/Lidarr.develop.0.2.0.371.linux.tar.gz -C /usr/local/share"
-iocage exec lidarr "rm /usr/local/share/v0.2.0.371/Lidarr.develop.0.2.0.371.linux.tar.gz"
+iocage exec lidarr "tar -xzvf /usr/local/share/Lidarr.develop.0.2.0.371.linux.tar.gz -C /usr/local/share"
+iocage exec lidarr "rm /usr/local/share/Lidarr.develop.0.2.0.371.linux.tar.gz"
 iocage exec lidarr "pw user add lidarr -c lidarr -u 353 -d /nonexistent -s /usr/bin/nologin"
 iocage exec lidarr chown -R lidarr:lidarr /usr/local/share/Lidarr /config
 iocage exec lidarr mkdir /usr/local/etc/rc.d

From 6a4fc731d621899f50e56cb2889c1dd5741a2992 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 27 Feb 2020 20:48:16 +0100
Subject: [PATCH 032/147] make install executable

---
 install/jackett.sh  | 0
 install/lidarr.sh   | 0
 install/organizr.sh | 0
 install/plex.sh     | 0
 install/radarr.sh   | 0
 install/sonarr.sh   | 0
 install/tautulli.sh | 0
 7 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 install/jackett.sh
 mode change 100644 => 100755 install/lidarr.sh
 mode change 100644 => 100755 install/organizr.sh
 mode change 100644 => 100755 install/plex.sh
 mode change 100644 => 100755 install/radarr.sh
 mode change 100644 => 100755 install/sonarr.sh
 mode change 100644 => 100755 install/tautulli.sh

diff --git a/install/jackett.sh b/install/jackett.sh
old mode 100644
new mode 100755
diff --git a/install/lidarr.sh b/install/lidarr.sh
old mode 100644
new mode 100755
diff --git a/install/organizr.sh b/install/organizr.sh
old mode 100644
new mode 100755
diff --git a/install/plex.sh b/install/plex.sh
old mode 100644
new mode 100755
diff --git a/install/radarr.sh b/install/radarr.sh
old mode 100644
new mode 100755
diff --git a/install/sonarr.sh b/install/sonarr.sh
old mode 100644
new mode 100755
diff --git a/install/tautulli.sh b/install/tautulli.sh
old mode 100644
new mode 100755

From df95a33acdeeacd9b2d344cc2550554d886eaa7e Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 27 Feb 2020 21:45:39 +0100
Subject: [PATCH 033/147] restructure IP's

---
 includes/organizr-conf/custom/organizr.conf | 10 +++++-----
 install/jackett.sh                          |  2 +-
 install/lidarr.sh                           |  2 +-
 install/radarr.sh                           |  2 +-
 install/sonarr.sh                           |  2 +-
 install/tautulli.sh                         |  2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/includes/organizr-conf/custom/organizr.conf b/includes/organizr-conf/custom/organizr.conf
index 817615c4..ad9cb378 100644
--- a/includes/organizr-conf/custom/organizr.conf
+++ b/includes/organizr-conf/custom/organizr.conf
@@ -47,7 +47,7 @@ location /nzbhydra/ {
 location /sonarr {
     auth_request /auth-0;    
     add_header X-Frame-Options "SAMEORIGIN";
-    proxy_pass http://192.168.30.30:8989;
+    proxy_pass http://192.168.31.23:8989;
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -56,7 +56,7 @@ location /sonarr {
 location /radarr {
     auth_request /auth-0;
     add_header X-Frame-Options "SAMEORIGIN";
-    proxy_pass http://192.168.30.31:7878;
+    proxy_pass http://192.168.31.24:7878;
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -65,7 +65,7 @@ location /radarr {
   location /lidarr {
     auth_request /auth-0;
     add_header X-Frame-Options "SAMEORIGIN";
-    proxy_pass http://192.168.30.32:7878;
+    proxy_pass http://192.168.31.25:7878;
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -74,7 +74,7 @@ location /radarr {
 location /jackett {
     auth_request /auth-0;
     add_header X-Frame-Options "SAMEORIGIN";
-    proxy_pass http://192.168.30.28:9117;
+    proxy_pass http://192.168.31.21:9117;
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -118,7 +118,7 @@ if ($http_referer ~* /plex/) {
 location /tautulli {
     auth_request /auth-4;
     add_header X-Frame-Options "SAMEORIGIN";
-    proxy_pass http://192.168.30.27:8181;
+    proxy_pass http://192.168.31.26:8181;
     proxy_set_header Host $http_host;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header X-Forwarded-Host $server_name;
diff --git a/install/jackett.sh b/install/jackett.sh
index 007f9917..cc550003 100755
--- a/install/jackett.sh
+++ b/install/jackett.sh
@@ -1,5 +1,5 @@
 echo '{"pkgs":["mono","curl","ca_root_nss","nano"]}' > /tmp/pkg.json
-iocage create -n "jackett" -p /tmp/pkg.json -r 11.3-RELEASE interfaces="vnet0:bridge30" ip4_addr="vnet0|192.168.30.28/24" defaultrouter="192.168.30.1" vnet="on" allow_raw_sockets="1" boot="on"
+iocage create -n "jackett" -p /tmp/pkg.json -r 11.3-RELEASE interfaces="vnet0:bridge31" ip4_addr="vnet0|192.168.31.30/24" defaultrouter="192.168.21.1" vnet="on" allow_raw_sockets="1" boot="on"
 rm /tmp/pkg.json
 iocage exec jackett mkdir -p /config
 iocage fstab -a jackett /mnt/tank/apps/jackett /config nullfs rw 0 0
diff --git a/install/lidarr.sh b/install/lidarr.sh
index b99ea2f8..cb5d6411 100755
--- a/install/lidarr.sh
+++ b/install/lidarr.sh
@@ -1,5 +1,5 @@
 echo '{"pkgs":["mono","mediainfo","sqlite3","ca_root_nss","curl","chromaprint","nano"]}' > /tmp/pkg.json
-iocage create -n "lidarr" -p /tmp/pkg.json -r 11.3-RELEASE interfaces="vnet0:bridge30" ip4_addr="vnet0|192.168.30.32/24" defaultrouter="192.168.30.1" vnet="on" allow_raw_sockets="1" boot="on"
+iocage create -n "lidarr" -p /tmp/pkg.json -r 11.3-RELEASE interfaces="vnet0:bridge31" ip4_addr="vnet0|192.168.31.25/24" defaultrouter="192.168.31.1" vnet="on" allow_raw_sockets="1" boot="on"
 rm /tmp/pkg.json
 iocage exec lidarr mkdir -p /config
 iocage exec lidarr mkdir -p /mnt/music
diff --git a/install/radarr.sh b/install/radarr.sh
index 9a4facad..a8301d4e 100755
--- a/install/radarr.sh
+++ b/install/radarr.sh
@@ -1,5 +1,5 @@
 echo '{"pkgs":["mono","mediainfo","sqlite3","ca_root_nss","curl","nano"]}' > /tmp/pkg.json
-iocage create -n "radarr" -p /tmp/pkg.json -r 11.3-RELEASE interfaces="vnet0:bridge30" ip4_addr="vnet0|192.168.30.31/24" defaultrouter="192.168.30.1" vnet="on" allow_raw_sockets="1" boot="on"
+iocage create -n "radarr" -p /tmp/pkg.json -r 11.3-RELEASE interfaces="vnet0:bridge31" ip4_addr="vnet0|192.168.31.24/24" defaultrouter="192.168.31.1" vnet="on" allow_raw_sockets="1" boot="on"
 rm /tmp/pkg.json
 iocage exec radarr mkdir -p /config
 iocage exec radarr mkdir -p /mnt/movies
diff --git a/install/sonarr.sh b/install/sonarr.sh
index 4ef3722f..3cde9083 100755
--- a/install/sonarr.sh
+++ b/install/sonarr.sh
@@ -1,5 +1,5 @@
 echo '{"pkgs":["mono","mediainfo","sqlite3","ca_root_nss","curl","nano"]}' > /tmp/pkg.json
-iocage create -n "sonarr" -p /tmp/pkg.json -r 11.3-RELEASE interfaces="vnet0:bridge30" ip4_addr="vnet0|192.168.30.30/24" defaultrouter="192.168.30.1" vnet="on" allow_raw_sockets="1" boot="on"
+iocage create -n "sonarr" -p /tmp/pkg.json -r 11.3-RELEASE interfaces="vnet0:bridge31" ip4_addr="vnet0|192.168.31.23/24" defaultrouter="192.168.31.1" vnet="on" allow_raw_sockets="1" boot="on"
 rm /tmp/pkg.json
 iocage exec sonarr mkdir -p /config
 iocage exec sonarr mkdir -p /mnt/series
diff --git a/install/tautulli.sh b/install/tautulli.sh
index 730f7deb..ebf1f459 100755
--- a/install/tautulli.sh
+++ b/install/tautulli.sh
@@ -1,5 +1,5 @@
 echo '{"pkgs":["python2","py27-sqlite3","py27-openssl","ca_root_nss","git","nano"]}' > /tmp/pkg.json
-iocage create -n "tautulli" -p /tmp/pkg.json -r 11.3-RELEASE interfaces="vnet0:bridge30" ip4_addr="vnet0|192.168.30.27/24" defaultrouter="192.168.30.1" vnet="on" allow_raw_sockets="1" boot="on"
+iocage create -n "tautulli" -p /tmp/pkg.json -r 11.3-RELEASE interfaces="vnet0:bridge31" ip4_addr="vnet0|192.168.31.26/24" defaultrouter="192.168.31.1" vnet="on" allow_raw_sockets="1" boot="on"
 rm /tmp/pkg.json
 iocage exec tautulli mkdir -p /config
 iocage fstab -a tautulli /mnt/tank/apps/tautulli /config nullfs rw 0 0

From 61bc8e8de2553602fc727ad804fb1f752f7a794e Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 27 Feb 2020 22:20:21 +0100
Subject: [PATCH 034/147] move plex

---
 includes/organizr-conf/custom/organizr.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/organizr-conf/custom/organizr.conf b/includes/organizr-conf/custom/organizr.conf
index ad9cb378..2dfc9560 100644
--- a/includes/organizr-conf/custom/organizr.conf
+++ b/includes/organizr-conf/custom/organizr.conf
@@ -86,7 +86,7 @@ location /jackett {
 location /plex/ {
     auth_request /auth-4;
     add_header X-Frame-Options "SAMEORIGIN";
-    proxy_pass http://192.168.30.26:32400/;
+    proxy_pass http://192.168.30.27:32400/;
     client_max_body_size 10m;
     client_body_buffer_size 128k;
     proxy_bind $server_addr;

From ce6fc7df71cce92c8a0ad00a2b6f1d7b0fc4e1ce Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 27 Feb 2020 22:25:33 +0100
Subject: [PATCH 035/147] test synthax change

---
 includes/organizr-conf/custom/organizr.conf | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/includes/organizr-conf/custom/organizr.conf b/includes/organizr-conf/custom/organizr.conf
index 2dfc9560..e7112267 100644
--- a/includes/organizr-conf/custom/organizr.conf
+++ b/includes/organizr-conf/custom/organizr.conf
@@ -17,7 +17,7 @@ location / {
     include custom/phpblock.conf;  #PHP Block
   }
 
-location /transmission {
+location /transmission/ {
     auth_request /auth-0;
     add_header X-Frame-Options "SAMEORIGIN";
     proxy_pass http://192.168.30.29:9091;
@@ -26,7 +26,7 @@ location /transmission {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
   }
 
-location /nzbget {
+location /nzbget/ {
     auth_request /auth-0;
     add_header X-Frame-Options "SAMEORIGIN";
     proxy_pass http://127.0.0.1:6789;
@@ -44,7 +44,7 @@ location /nzbhydra/ {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
   }
 
-location /sonarr {
+location /sonarr/ {
     auth_request /auth-0;    
     add_header X-Frame-Options "SAMEORIGIN";
     proxy_pass http://192.168.31.23:8989;
@@ -53,7 +53,7 @@ location /sonarr {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
   }
 
-location /radarr {
+location /radarr/ {
     auth_request /auth-0;
     add_header X-Frame-Options "SAMEORIGIN";
     proxy_pass http://192.168.31.24:7878;
@@ -62,7 +62,7 @@ location /radarr {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
   }
   
-  location /lidarr {
+  location /lidarr/ {
     auth_request /auth-0;
     add_header X-Frame-Options "SAMEORIGIN";
     proxy_pass http://192.168.31.25:7878;
@@ -71,7 +71,7 @@ location /radarr {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
   }
 
-location /jackett {
+location /jackett/ {
     auth_request /auth-0;
     add_header X-Frame-Options "SAMEORIGIN";
     proxy_pass http://192.168.31.21:9117;
@@ -115,7 +115,7 @@ if ($http_referer ~* /plex/) {
     rewrite ^/web/(.*) /plex/web/$1? redirect;
   }
 
-location /tautulli {
+location /tautulli/ {
     auth_request /auth-4;
     add_header X-Frame-Options "SAMEORIGIN";
     proxy_pass http://192.168.31.26:8181;
@@ -137,7 +137,7 @@ location /ombi/ {
     proxy_cache_bypass $http_upgrade;
   }
 
-  location /grafana {
+  location /grafana/ {
     auth_request /auth-0;
     add_header X-Frame-Options "SAMEORIGIN";
     proxy_pass http://192.168.30.34;
@@ -146,7 +146,7 @@ location /ombi/ {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
   }
   
-  location /bitwarden {
+  location /bitwarden/ {
     auth_request /auth-0;
     add_header X-Frame-Options "SAMEORIGIN";
     proxy_pass http://192.168.30.33:8000;

From f85ef5f6fb854e1e36d321ebc3f5c01a56afa90f Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 27 Feb 2020 22:29:58 +0100
Subject: [PATCH 036/147] test

---
 includes/organizr-conf/custom/organizr.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/organizr-conf/custom/organizr.conf b/includes/organizr-conf/custom/organizr.conf
index e7112267..785178a6 100644
--- a/includes/organizr-conf/custom/organizr.conf
+++ b/includes/organizr-conf/custom/organizr.conf
@@ -115,10 +115,10 @@ if ($http_referer ~* /plex/) {
     rewrite ^/web/(.*) /plex/web/$1? redirect;
   }
 
-location /tautulli/ {
+location /tautulli {
     auth_request /auth-4;
     add_header X-Frame-Options "SAMEORIGIN";
-    proxy_pass http://192.168.31.26:8181;
+    proxy_pass http://192.168.31.26:8181/;
     proxy_set_header Host $http_host;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header X-Forwarded-Host $server_name;

From 7d83cce04eac825f9c9830cdd503cf411703e416 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 27 Feb 2020 22:37:07 +0100
Subject: [PATCH 037/147] test3

---
 includes/organizr-conf/custom/organizr.conf | 30 ++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/includes/organizr-conf/custom/organizr.conf b/includes/organizr-conf/custom/organizr.conf
index 785178a6..c97065a5 100644
--- a/includes/organizr-conf/custom/organizr.conf
+++ b/includes/organizr-conf/custom/organizr.conf
@@ -20,7 +20,7 @@ location / {
 location /transmission/ {
     auth_request /auth-0;
     add_header X-Frame-Options "SAMEORIGIN";
-    proxy_pass http://192.168.30.29:9091;
+    proxy_pass https://192.168.30.29:9091;
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -29,7 +29,7 @@ location /transmission/ {
 location /nzbget/ {
     auth_request /auth-0;
     add_header X-Frame-Options "SAMEORIGIN";
-    proxy_pass http://127.0.0.1:6789;
+    proxy_pass https://127.0.0.1:6789;
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -38,7 +38,7 @@ location /nzbget/ {
 location /nzbhydra/ {
     auth_request /auth-0;
     add_header X-Frame-Options "SAMEORIGIN";
-    proxy_pass http://127.0.0.1:5075/nzbhydra/;
+    proxy_pass https://127.0.0.1:5075/nzbhydra/;
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -47,7 +47,7 @@ location /nzbhydra/ {
 location /sonarr/ {
     auth_request /auth-0;    
     add_header X-Frame-Options "SAMEORIGIN";
-    proxy_pass http://192.168.31.23:8989;
+    proxy_pass https://192.168.31.23:8989;
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -56,7 +56,7 @@ location /sonarr/ {
 location /radarr/ {
     auth_request /auth-0;
     add_header X-Frame-Options "SAMEORIGIN";
-    proxy_pass http://192.168.31.24:7878;
+    proxy_pass https://192.168.31.24:7878;
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -65,7 +65,7 @@ location /radarr/ {
   location /lidarr/ {
     auth_request /auth-0;
     add_header X-Frame-Options "SAMEORIGIN";
-    proxy_pass http://192.168.31.25:7878;
+    proxy_pass https://192.168.31.25:7878;
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -74,7 +74,7 @@ location /radarr/ {
 location /jackett/ {
     auth_request /auth-0;
     add_header X-Frame-Options "SAMEORIGIN";
-    proxy_pass http://192.168.31.21:9117;
+    proxy_pass https://192.168.31.21:9117;
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -86,7 +86,7 @@ location /jackett/ {
 location /plex/ {
     auth_request /auth-4;
     add_header X-Frame-Options "SAMEORIGIN";
-    proxy_pass http://192.168.30.27:32400/;
+    proxy_pass https://192.168.30.27:32400/;
     client_max_body_size 10m;
     client_body_buffer_size 128k;
     proxy_bind $server_addr;
@@ -122,14 +122,14 @@ location /tautulli {
     proxy_set_header Host $http_host;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header X-Forwarded-Host $server_name;
-    proxy_set_header X-Forwarded-Proto $scheme;
+    proxy_set_header X-Forwarded-Proto https;
     proxy_set_header X-Real-IP $remote_addr;
   }
 
-location /ombi/ {
+location /ombi {
     auth_request /auth-4;
     add_header X-Frame-Options "SAMEORIGIN";
-    proxy_pass http://127.0.0.1:5000/ombi/;
+    proxy_pass https://127.0.0.1:5000/ombi/;
     proxy_http_version 1.1;
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection keep-alive;
@@ -137,19 +137,19 @@ location /ombi/ {
     proxy_cache_bypass $http_upgrade;
   }
 
-  location /grafana/ {
+  location /grafana {
     auth_request /auth-0;
     add_header X-Frame-Options "SAMEORIGIN";
-    proxy_pass http://192.168.30.34;
+    proxy_pass https://192.168.30.34/;
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
   }
   
-  location /bitwarden/ {
+  location /bitwarden {
     auth_request /auth-0;
     add_header X-Frame-Options "SAMEORIGIN";
-    proxy_pass http://192.168.30.33:8000;
+    proxy_pass https://bitwarden.schouten-lebbing.nl/;
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

From 71efd71cad9a69bc13f8ca4715bdbbdfbc1acf83 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 27 Feb 2020 22:43:48 +0100
Subject: [PATCH 038/147] from man

---
 includes/organizr-conf/custom/organizr.conf | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/includes/organizr-conf/custom/organizr.conf b/includes/organizr-conf/custom/organizr.conf
index c97065a5..c4a7649e 100644
--- a/includes/organizr-conf/custom/organizr.conf
+++ b/includes/organizr-conf/custom/organizr.conf
@@ -115,16 +115,23 @@ if ($http_referer ~* /plex/) {
     rewrite ^/web/(.*) /plex/web/$1? redirect;
   }
 
-location /tautulli {
+location /tautulli/ {
     auth_request /auth-4;
     add_header X-Frame-Options "SAMEORIGIN";
     proxy_pass http://192.168.31.26:8181/;
-    proxy_set_header Host $http_host;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header Host $host;
     proxy_set_header X-Forwarded-Host $server_name;
-    proxy_set_header X-Forwarded-Proto https;
     proxy_set_header X-Real-IP $remote_addr;
-  }
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_read_timeout 90;
+    proxy_set_header X-Forwarded-Proto $scheme;
+    set $xforwardedssl "off";
+    if ($scheme = https) {
+            set $xforwardedssl "on";
+    }
+    proxy_set_header X-Forwarded-Ssl $xforwardedssl;
+    proxy_redirect ~^(http(?:s)?://)([^:/]+)(?::\d+)?(/.*)?$ $1$2:$server_port$3;
+}
 
 location /ombi {
     auth_request /auth-4;

From 9de24612837717189bded0f0b06c57190bf5dd07 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 27 Feb 2020 22:51:16 +0100
Subject: [PATCH 039/147] last

---
 includes/organizr-conf/custom/organizr.conf | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/includes/organizr-conf/custom/organizr.conf b/includes/organizr-conf/custom/organizr.conf
index c4a7649e..4b8e76b3 100644
--- a/includes/organizr-conf/custom/organizr.conf
+++ b/includes/organizr-conf/custom/organizr.conf
@@ -118,19 +118,14 @@ if ($http_referer ~* /plex/) {
 location /tautulli/ {
     auth_request /auth-4;
     add_header X-Frame-Options "SAMEORIGIN";
-    proxy_pass http://192.168.31.26:8181/;
+    proxy_pass https://192.168.31.26:8181/;
     proxy_set_header Host $host;
     proxy_set_header X-Forwarded-Host $server_name;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_read_timeout 90;
     proxy_set_header X-Forwarded-Proto $scheme;
-    set $xforwardedssl "off";
-    if ($scheme = https) {
-            set $xforwardedssl "on";
-    }
-    proxy_set_header X-Forwarded-Ssl $xforwardedssl;
-    proxy_redirect ~^(http(?:s)?://)([^:/]+)(?::\d+)?(/.*)?$ $1$2:$server_port$3;
+    proxy_set_header X-Forwarded-Ssl on;
 }
 
 location /ombi {

From 69c1654e33c5b4579fca4df3a5e085ca7627e029 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 27 Feb 2020 22:53:09 +0100
Subject: [PATCH 040/147] one more

---
 includes/organizr-conf/custom/organizr.conf | 28 ++++++++++++++++-----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/includes/organizr-conf/custom/organizr.conf b/includes/organizr-conf/custom/organizr.conf
index 4b8e76b3..6f4e6778 100644
--- a/includes/organizr-conf/custom/organizr.conf
+++ b/includes/organizr-conf/custom/organizr.conf
@@ -119,14 +119,30 @@ location /tautulli/ {
     auth_request /auth-4;
     add_header X-Frame-Options "SAMEORIGIN";
     proxy_pass https://192.168.31.26:8181/;
-    proxy_set_header Host $host;
-    proxy_set_header X-Forwarded-Host $server_name;
+    client_max_body_size 10m;
+    client_body_buffer_size 128k;
+    proxy_bind $server_addr;
+    proxy_buffers 32 4k;
+    #Timeout if the real server is dead
+    proxy_next_upstream error timeout invalid_header http_500 http_502 http_503;
+    # Advanced Proxy Config
+    send_timeout 5m;
+    proxy_read_timeout 240;
+    proxy_send_timeout 240;
+    proxy_connect_timeout 240;
+    proxy_hide_header X-Frame-Options;
+    # Basic Proxy Config
+    proxy_set_header Host $host:$server_port;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_read_timeout 90;
-    proxy_set_header X-Forwarded-Proto $scheme;
-    proxy_set_header X-Forwarded-Ssl on;
-}
+    proxy_set_header X-Forwarded-Proto https;
+    proxy_redirect  http://  $scheme://;
+    proxy_http_version 1.1;
+    proxy_set_header Connection "";
+    proxy_no_cache $cookie_session;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "upgrade";  
+  }
 
 location /ombi {
     auth_request /auth-4;

From 5d7b460156f2d2cefa5dfa26a0c68e8aa9a0e899 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 27 Feb 2020 22:56:51 +0100
Subject: [PATCH 041/147] back

---
 includes/organizr-conf/custom/organizr.conf | 28 +++++----------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/includes/organizr-conf/custom/organizr.conf b/includes/organizr-conf/custom/organizr.conf
index 6f4e6778..4b8e76b3 100644
--- a/includes/organizr-conf/custom/organizr.conf
+++ b/includes/organizr-conf/custom/organizr.conf
@@ -119,30 +119,14 @@ location /tautulli/ {
     auth_request /auth-4;
     add_header X-Frame-Options "SAMEORIGIN";
     proxy_pass https://192.168.31.26:8181/;
-    client_max_body_size 10m;
-    client_body_buffer_size 128k;
-    proxy_bind $server_addr;
-    proxy_buffers 32 4k;
-    #Timeout if the real server is dead
-    proxy_next_upstream error timeout invalid_header http_500 http_502 http_503;
-    # Advanced Proxy Config
-    send_timeout 5m;
-    proxy_read_timeout 240;
-    proxy_send_timeout 240;
-    proxy_connect_timeout 240;
-    proxy_hide_header X-Frame-Options;
-    # Basic Proxy Config
-    proxy_set_header Host $host:$server_port;
+    proxy_set_header Host $host;
+    proxy_set_header X-Forwarded-Host $server_name;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header X-Forwarded-Proto https;
-    proxy_redirect  http://  $scheme://;
-    proxy_http_version 1.1;
-    proxy_set_header Connection "";
-    proxy_no_cache $cookie_session;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";  
-  }
+    proxy_read_timeout 90;
+    proxy_set_header X-Forwarded-Proto $scheme;
+    proxy_set_header X-Forwarded-Ssl on;
+}
 
 location /ombi {
     auth_request /auth-4;

From f44d8c49ffcb6eeb6c578934a7dce3d48fc9185a Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 27 Feb 2020 23:02:09 +0100
Subject: [PATCH 042/147] rd

---
 includes/organizr-conf/custom/organizr.conf | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/includes/organizr-conf/custom/organizr.conf b/includes/organizr-conf/custom/organizr.conf
index 4b8e76b3..93810e1a 100644
--- a/includes/organizr-conf/custom/organizr.conf
+++ b/includes/organizr-conf/custom/organizr.conf
@@ -119,14 +119,14 @@ location /tautulli/ {
     auth_request /auth-4;
     add_header X-Frame-Options "SAMEORIGIN";
     proxy_pass https://192.168.31.26:8181/;
-    proxy_set_header Host $host;
-    proxy_set_header X-Forwarded-Host $server_name;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_read_timeout 90;
-    proxy_set_header X-Forwarded-Proto $scheme;
-    proxy_set_header X-Forwarded-Ssl on;
-}
+    proxy_set_header    Host                $host;
+    proxy_set_header    X-Real-IP           $remote_addr;
+    proxy_set_header    X-Forwarded-Host    $server_name;
+    proxy_set_header    X-Forwarded-For     $proxy_add_x_forwarded_for;
+    # SSL proxying headers
+    proxy_set_header    X-Forwarded-Proto   $scheme;
+    proxy_set_header    X-Forwarded-Ssl     on;
+    }
 
 location /ombi {
     auth_request /auth-4;

From dd11e4800378698ceaf70c72b655726cd9e70d23 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 27 Feb 2020 23:08:49 +0100
Subject: [PATCH 043/147] ok

---
 includes/organizr-conf/custom/organizr.conf | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/includes/organizr-conf/custom/organizr.conf b/includes/organizr-conf/custom/organizr.conf
index 93810e1a..eb8188c4 100644
--- a/includes/organizr-conf/custom/organizr.conf
+++ b/includes/organizr-conf/custom/organizr.conf
@@ -119,13 +119,9 @@ location /tautulli/ {
     auth_request /auth-4;
     add_header X-Frame-Options "SAMEORIGIN";
     proxy_pass https://192.168.31.26:8181/;
-    proxy_set_header    Host                $host;
-    proxy_set_header    X-Real-IP           $remote_addr;
-    proxy_set_header    X-Forwarded-Host    $server_name;
-    proxy_set_header    X-Forwarded-For     $proxy_add_x_forwarded_for;
-    # SSL proxying headers
-    proxy_set_header    X-Forwarded-Proto   $scheme;
-    proxy_set_header    X-Forwarded-Ssl     on;
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     }
 
 location /ombi {

From afcb672ee9694aef72d34a65ac7fb501617950d5 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 27 Feb 2020 23:11:07 +0100
Subject: [PATCH 044/147] unsec

---
 includes/organizr-conf/custom/organizr.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/organizr-conf/custom/organizr.conf b/includes/organizr-conf/custom/organizr.conf
index eb8188c4..aa03de06 100644
--- a/includes/organizr-conf/custom/organizr.conf
+++ b/includes/organizr-conf/custom/organizr.conf
@@ -118,7 +118,7 @@ if ($http_referer ~* /plex/) {
 location /tautulli/ {
     auth_request /auth-4;
     add_header X-Frame-Options "SAMEORIGIN";
-    proxy_pass https://192.168.31.26:8181/;
+    proxy_pass http://192.168.31.26:8181/;
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

From c5d8d4921469fe24d073c57e2f025810cac1536a Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Fri, 28 Feb 2020 11:12:06 +0100
Subject: [PATCH 045/147] Enable test jackett

---
 includes/organizr-conf/custom/organizr.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/organizr-conf/custom/organizr.conf b/includes/organizr-conf/custom/organizr.conf
index aa03de06..527ca322 100644
--- a/includes/organizr-conf/custom/organizr.conf
+++ b/includes/organizr-conf/custom/organizr.conf
@@ -74,7 +74,7 @@ location /radarr/ {
 location /jackett/ {
     auth_request /auth-0;
     add_header X-Frame-Options "SAMEORIGIN";
-    proxy_pass https://192.168.31.21:9117;
+    proxy_pass http://192.168.31.21:9117/;
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

From c2211a7b5230111114d6b71268094176c03c2000 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Fri, 28 Feb 2020 11:25:03 +0100
Subject: [PATCH 046/147] less headers

---
 includes/organizr-conf/custom/organizr.conf | 2 --
 1 file changed, 2 deletions(-)

diff --git a/includes/organizr-conf/custom/organizr.conf b/includes/organizr-conf/custom/organizr.conf
index 527ca322..5c4e3cd9 100644
--- a/includes/organizr-conf/custom/organizr.conf
+++ b/includes/organizr-conf/custom/organizr.conf
@@ -78,8 +78,6 @@ location /jackett/ {
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header X-Forwarded-Proto $scheme;
-    proxy_set_header X-Forwarded-Host $http_host;
     proxy_redirect off;
   }
 

From 9510f1f5f71bd86b7d3bfc283ffec7d6167dbdcf Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Fri, 28 Feb 2020 11:44:13 +0100
Subject: [PATCH 047/147] man

---
 includes/organizr-conf/custom/organizr.conf | 13 ++++++++-----
 includes/organizr-conf/nginx.conf           |  5 -----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/includes/organizr-conf/custom/organizr.conf b/includes/organizr-conf/custom/organizr.conf
index 5c4e3cd9..526fadb3 100644
--- a/includes/organizr-conf/custom/organizr.conf
+++ b/includes/organizr-conf/custom/organizr.conf
@@ -75,11 +75,14 @@ location /jackett/ {
     auth_request /auth-0;
     add_header X-Frame-Options "SAMEORIGIN";
     proxy_pass http://192.168.31.21:9117/;
-    proxy_set_header Host $host;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_redirect off;
-  }
+    proxy_http_version 1.1;
+    proxy_set_header   Upgrade $http_upgrade;
+    proxy_set_header   Connection keep-alive;
+    proxy_cache_bypass $http_upgrade;
+    proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header   X-Forwarded-Proto $scheme;
+    proxy_set_header   X-Forwarded-Host $http_host;
+}
 
 location /plex/ {
     auth_request /auth-4;
diff --git a/includes/organizr-conf/nginx.conf b/includes/organizr-conf/nginx.conf
index dcee90dc..6a654306 100644
--- a/includes/organizr-conf/nginx.conf
+++ b/includes/organizr-conf/nginx.conf
@@ -10,11 +10,6 @@ http {
 	default_type application/octet-stream;
 	sendfile on;
 	keepalive_timeout 65;
-	server {
-		listen 80;
-		server_name organizr.dmz.schouten-lebbing.nl;
-		include custom/organizr.conf;
-	}
 	server {
 		listen 443 ssl;
 		server_name organizr.schouten-lebbing.nl;

From 0870c6c8abf37b934011405db62d173584e3c6a4 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Fri, 28 Feb 2020 12:34:48 +0100
Subject: [PATCH 048/147] all working except lidarr

---
 includes/organizr-conf/custom/organizr.conf | 25 ++++++++++++++-------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/includes/organizr-conf/custom/organizr.conf b/includes/organizr-conf/custom/organizr.conf
index 526fadb3..6e209b03 100644
--- a/includes/organizr-conf/custom/organizr.conf
+++ b/includes/organizr-conf/custom/organizr.conf
@@ -45,27 +45,28 @@ location /nzbhydra/ {
   }
 
 location /sonarr/ {
-    auth_request /auth-0;    
+    auth_request /auth-0;
     add_header X-Frame-Options "SAMEORIGIN";
-    proxy_pass https://192.168.31.23:8989;
+    proxy_pass http://192.168.31.23:8989;
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
   }
 
+
 location /radarr/ {
     auth_request /auth-0;
     add_header X-Frame-Options "SAMEORIGIN";
-    proxy_pass https://192.168.31.24:7878;
+    proxy_pass http://192.168.31.24:7878;
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
   }
-  
+
   location /lidarr/ {
     auth_request /auth-0;
     add_header X-Frame-Options "SAMEORIGIN";
-    proxy_pass https://192.168.31.25:7878;
+    proxy_pass http://192.168.31.25:7878;
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -74,7 +75,7 @@ location /radarr/ {
 location /jackett/ {
     auth_request /auth-0;
     add_header X-Frame-Options "SAMEORIGIN";
-    proxy_pass http://192.168.31.21:9117/;
+    proxy_pass http://192.168.31.21:9117;
     proxy_http_version 1.1;
     proxy_set_header   Upgrade $http_upgrade;
     proxy_set_header   Connection keep-alive;
@@ -84,6 +85,7 @@ location /jackett/ {
     proxy_set_header   X-Forwarded-Host $http_host;
 }
 
+
 location /plex/ {
     auth_request /auth-4;
     add_header X-Frame-Options "SAMEORIGIN";
@@ -119,11 +121,18 @@ if ($http_referer ~* /plex/) {
 location /tautulli/ {
     auth_request /auth-4;
     add_header X-Frame-Options "SAMEORIGIN";
-    proxy_pass http://192.168.31.26:8181/;
+    proxy_pass http://192.168.31.26:8181;
     proxy_set_header Host $host;
+    proxy_set_header X-Forwarded-Host $server_name;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    }
+    proxy_read_timeout 90;
+    proxy_set_header X-Forwarded-Proto https;
+    proxy_set_header X-Forwarded-Ssl on;
+    #proxy_redirect ~^(http(?:s)?://)([^:/]+)(?::\d+)?(/.*)?$ $1$2:$server_port$3;
+    proxy_redirect off;
+}
+
 
 location /ombi {
     auth_request /auth-4;

From 3cbec21bfcbbacb7492c92f10db287aeea78484d Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Fri, 28 Feb 2020 16:21:57 +0100
Subject: [PATCH 049/147] add transmission fix lidar bugs remove nzb shizzle

---
 includes/organizr-conf/custom/organizr.conf | 22 ++-------------------
 install/transmission.sh                     | 13 ++++++++++++
 2 files changed, 15 insertions(+), 20 deletions(-)
 create mode 100644 install/transmission.sh

diff --git a/includes/organizr-conf/custom/organizr.conf b/includes/organizr-conf/custom/organizr.conf
index 6e209b03..9ba8569b 100644
--- a/includes/organizr-conf/custom/organizr.conf
+++ b/includes/organizr-conf/custom/organizr.conf
@@ -20,25 +20,7 @@ location / {
 location /transmission/ {
     auth_request /auth-0;
     add_header X-Frame-Options "SAMEORIGIN";
-    proxy_pass https://192.168.30.29:9091;
-    proxy_set_header Host $host;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-  }
-
-location /nzbget/ {
-    auth_request /auth-0;
-    add_header X-Frame-Options "SAMEORIGIN";
-    proxy_pass https://127.0.0.1:6789;
-    proxy_set_header Host $host;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-  }
-
-location /nzbhydra/ {
-    auth_request /auth-0;
-    add_header X-Frame-Options "SAMEORIGIN";
-    proxy_pass https://127.0.0.1:5075/nzbhydra/;
+    proxy_pass http://192.168.31.22:9091;
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -66,7 +48,7 @@ location /radarr/ {
   location /lidarr/ {
     auth_request /auth-0;
     add_header X-Frame-Options "SAMEORIGIN";
-    proxy_pass http://192.168.31.25:7878;
+    proxy_pass http://192.168.31.25:8686;
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
diff --git a/install/transmission.sh b/install/transmission.sh
new file mode 100644
index 00000000..9c27cc65
--- /dev/null
+++ b/install/transmission.sh
@@ -0,0 +1,13 @@
+echo '{"pkgs":["bash","unzip","unrar","transmission","ca_root_nss","nano"]}' > /tmp/pkg.json
+iocage create -n "transmission" -p /tmp/pkg.json -r 11.3-RELEASE interfaces="vnet0:bridge31" ip4_addr="vnet0|192.168.31.22/24" defaultrouter="192.168.31.1" vnet="on" allow_raw_sockets="1" boot="on"
+rm /tmp/pkg.json
+iocage exec transmission mkdir -p /config
+iocage exec transmission mkdir -p /mnt/downloads
+iocage fstab -a transmission /mnt/tank/apps/transmission /config nullfs rw 0 0
+iocage fstab -a transmission /mnt/tank/downloads /mnt/downloads nullfs rw 0 0
+iocage exec transmission mkdir -p /config
+iocage exec transmission chown -R transmission:transmission /config
+iocage exec transmission sysrc "transmission_enable=YES"
+iocage exec transmission sysrc "transmission_conf_dir=/confige"
+iocage exec transmission sysrc "transmission_download_dir=/mnt/downloads/complete"
+iocage exec transmission service transmission start
\ No newline at end of file

From b419cbab7c030f8df8a4a264a9021472414a63ef Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Fri, 28 Feb 2020 16:36:51 +0100
Subject: [PATCH 050/147] make executable

---
 install/transmission.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 install/transmission.sh

diff --git a/install/transmission.sh b/install/transmission.sh
old mode 100644
new mode 100755

From 813eafcfbdb65e5a8dfb154d24140c36eec182aa Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Fri, 28 Feb 2020 21:33:40 +0100
Subject: [PATCH 051/147] Add transmission

---
 includes/organizr-conf/custom/organizr.conf |  9 +--
 includes/transmission-conf/settings.json    | 69 +++++++++++++++++++++
 install/transmission.sh                     |  6 +-
 3 files changed, 77 insertions(+), 7 deletions(-)
 create mode 100644 includes/transmission-conf/settings.json

diff --git a/includes/organizr-conf/custom/organizr.conf b/includes/organizr-conf/custom/organizr.conf
index 9ba8569b..4f024104 100644
--- a/includes/organizr-conf/custom/organizr.conf
+++ b/includes/organizr-conf/custom/organizr.conf
@@ -27,7 +27,7 @@ location /transmission/ {
   }
 
 location /sonarr/ {
-    auth_request /auth-0;
+    auth_request /auth-0;    
     add_header X-Frame-Options "SAMEORIGIN";
     proxy_pass http://192.168.31.23:8989;
     proxy_set_header Host $host;
@@ -35,7 +35,6 @@ location /sonarr/ {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
   }
 
-
 location /radarr/ {
     auth_request /auth-0;
     add_header X-Frame-Options "SAMEORIGIN";
@@ -44,7 +43,7 @@ location /radarr/ {
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
   }
-
+  
   location /lidarr/ {
     auth_request /auth-0;
     add_header X-Frame-Options "SAMEORIGIN";
@@ -67,7 +66,6 @@ location /jackett/ {
     proxy_set_header   X-Forwarded-Host $http_host;
 }
 
-
 location /plex/ {
     auth_request /auth-4;
     add_header X-Frame-Options "SAMEORIGIN";
@@ -115,7 +113,6 @@ location /tautulli/ {
     proxy_redirect off;
 }
 
-
 location /ombi {
     auth_request /auth-4;
     add_header X-Frame-Options "SAMEORIGIN";
@@ -143,4 +140,4 @@ location /ombi {
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-  }
\ No newline at end of file
+  }
diff --git a/includes/transmission-conf/settings.json b/includes/transmission-conf/settings.json
new file mode 100644
index 00000000..e8c8a728
--- /dev/null
+++ b/includes/transmission-conf/settings.json
@@ -0,0 +1,69 @@
+{
+    "alt-speed-down": 10000,
+    "alt-speed-enabled": true,
+    "alt-speed-time-begin": 420,
+    "alt-speed-time-day": 127,
+    "alt-speed-time-enabled": true,
+    "alt-speed-time-end": 1260,
+    "alt-speed-up": 5000,
+    "bind-address-ipv4": "0.0.0.0",
+    "bind-address-ipv6": "::",
+    "blocklist-enabled": false,
+    "blocklist-url": "http://www.example.com/blocklist",
+    "cache-size-mb": 200,
+    "dht-enabled": true,
+    "download-dir": "/mnt/downloads/complete",
+    "download-queue-enabled": false,
+    "download-queue-size": 50,
+    "encryption": 1,
+    "idle-seeding-limit": 1,
+    "idle-seeding-limit-enabled": true,
+    "incomplete-dir": "/mnt/downloads/incomplete",
+    "incomplete-dir-enabled": true,
+    "lpd-enabled": false,
+    "message-level": 2,
+    "peer-congestion-algorithm": "",
+    "peer-id-ttl-hours": 6,
+    "peer-limit-global": 1000,
+    "peer-limit-per-torrent": 100,
+    "peer-port": 51413,
+    "peer-port-random-high": 65535,
+    "peer-port-random-low": 49152,
+    "peer-port-random-on-start": false,
+    "peer-socket-tos": "default",
+    "pex-enabled": true,
+    "pidfile": "/var/run/transmission/daemon.pid",
+    "port-forwarding-enabled": false,
+    "preallocation": 0,
+    "prefetch-enabled": true,
+    "queue-stalled-enabled": true,
+    "queue-stalled-minutes": 1,
+    "ratio-limit": 0,
+    "ratio-limit-enabled": true,
+    "rename-partial-files": true,
+    "rpc-authentication-required": false,
+    "rpc-bind-address": "0.0.0.0",
+    "rpc-enabled": true,
+    "rpc-host-whitelist": "",
+    "rpc-host-whitelist-enabled": false,
+    "rpc-password": "{4274e8c504b23f3cd52c7128d4838282019b83bbUtfhD/5d",
+    "rpc-port": 9091,
+    "rpc-url": "/transmission/",
+    "rpc-username": "",
+    "rpc-whitelist": "127.0.0.1",
+    "rpc-whitelist-enabled": false,
+    "scrape-paused-torrents-enabled": true,
+    "script-torrent-done-enabled": false,
+    "script-torrent-done-filename": "",
+    "seed-queue-enabled": false,
+    "seed-queue-size": 10,
+    "speed-limit-down": 100,
+    "speed-limit-down-enabled": false,
+    "speed-limit-up": 100,
+    "speed-limit-up-enabled": false,
+    "start-added-torrents": true,
+    "trash-original-torrent-files": false,
+    "umask": 0,
+    "upload-slots-per-torrent": 14,
+    "utp-enabled": true
+}
diff --git a/install/transmission.sh b/install/transmission.sh
index 9c27cc65..a3dcff74 100755
--- a/install/transmission.sh
+++ b/install/transmission.sh
@@ -3,11 +3,15 @@ iocage create -n "transmission" -p /tmp/pkg.json -r 11.3-RELEASE interfaces="vne
 rm /tmp/pkg.json
 iocage exec transmission mkdir -p /config
 iocage exec transmission mkdir -p /mnt/downloads
+iocage exec transmission mkdir -p /mnt/downloads/complete
+iocage exec transmission mkdir -p /mnt/downloads/incomplete
 iocage fstab -a transmission /mnt/tank/apps/transmission /config nullfs rw 0 0
 iocage fstab -a transmission /mnt/tank/downloads /mnt/downloads nullfs rw 0 0
+iocage fstab -a transmission /mnt/tank/downloads/complete /mnt/downloads/complete nullfs rw 0 0
+iocage fstab -a transmission /mnt/tank/downloads/incomplete /mnt/downloads/incomplete nullfs rw 0 0
 iocage exec transmission mkdir -p /config
 iocage exec transmission chown -R transmission:transmission /config
 iocage exec transmission sysrc "transmission_enable=YES"
-iocage exec transmission sysrc "transmission_conf_dir=/confige"
+iocage exec transmission sysrc "transmission_conf_dir=/config"
 iocage exec transmission sysrc "transmission_download_dir=/mnt/downloads/complete"
 iocage exec transmission service transmission start
\ No newline at end of file

From ba923083e97f91753686f2680174cf9c04017688 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sat, 29 Feb 2020 17:26:27 +0100
Subject: [PATCH 052/147] - Cleaned organizr - Added py-kms windows activation
 server

---
 includes/organizr-conf/custom/organizr.conf |  2 ++
 includes/py-kms-conf/py_kms.rc              | 38 +++++++++++++++++++++
 install/kms.sh                              | 13 +++++++
 3 files changed, 53 insertions(+)
 create mode 100644 includes/py-kms-conf/py_kms.rc
 create mode 100644 install/kms.sh

diff --git a/includes/organizr-conf/custom/organizr.conf b/includes/organizr-conf/custom/organizr.conf
index 4f024104..a5643b4d 100644
--- a/includes/organizr-conf/custom/organizr.conf
+++ b/includes/organizr-conf/custom/organizr.conf
@@ -5,6 +5,7 @@ proxy_connect_timeout 240;
 client_header_timeout 240;
 client_body_timeout 240;
 
+
 location / {
     root /usr/local/www/Organizr;
     index index.php index.html index.htm index.nginx-debian.html;
@@ -17,6 +18,7 @@ location / {
     include custom/phpblock.conf;  #PHP Block
   }
 
+
 location /transmission/ {
     auth_request /auth-0;
     add_header X-Frame-Options "SAMEORIGIN";
diff --git a/includes/py-kms-conf/py_kms.rc b/includes/py-kms-conf/py_kms.rc
new file mode 100644
index 00000000..3509f3dc
--- /dev/null
+++ b/includes/py-kms-conf/py_kms.rc
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+# $FreeBSD$
+#
+# PROVIDE: py_kms
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# py-kms_enable: Set to YES to enable py-kms
+# Default: NO
+# py-kms_user: The user account used to run the py-kms daemon.
+# This is optional, however do not specifically set this to an
+# empty string as this will cause the daemon to run as root.
+# Default: media
+# py-kms_group: The group account used to run the py-kms daemon.
+# This is optional, however do not specifically set this to an
+# empty string as this will cause the daemon to run with group wheel.
+# Default: media
+# py-kms_data_dir: Directory where py-kms configuration
+# data is stored.
+
+. /etc/rc.subr
+name=py_kms
+rcvar=${name}_enable
+load_rc_config $name
+
+: ${py_kms_enable:="NO"}
+: ${py_kms_user:="kms"}
+: ${py_kms_group:="kms"}
+: ${py_kms_data_dir:="/config"}
+
+command="/usr/local/bin/python3.7"
+command_args="/usr/local/share/py-kms/pykms_Server.py 0.0.0.0 1688 -F ${py_kms_data_dir}/py-kms.log etrigan start --etrigan-pid/etrigan.pid"
+
+run_rc_command "$1"
\ No newline at end of file
diff --git a/install/kms.sh b/install/kms.sh
new file mode 100644
index 00000000..c921b914
--- /dev/null
+++ b/install/kms.sh
@@ -0,0 +1,13 @@
+echo '{"pkgs":["bash","ca_root_nss","nano","py37-tkinter","py37-pip","py37-sqlite3","git"]}' > /tmp/pkg.json
+iocage create -n "kms" -p /tmp/pkg.json -r 11.3-RELEASE interfaces="vnet0:bridge10" ip4_addr="vnet0|192.168.10.43/24" defaultrouter="192.168.10.1" vnet="on" allow_raw_sockets="1" boot="on"
+rm /tmp/pkg.json
+iocage exec kms mkdir -p /config
+iocage fstab -a kms /mnt/tank/apps/kms /config nullfs rw 0 0
+iocage exec kms svn checkout https://github.com/SystemRage/py-kms/trunk/py-kms /usr/local/share/py-kms
+iocage exec kms "pw user add kms -c kms -u 666 -d /nonexistent -s /usr/bin/nologin"
+iocage exec kms chown -R kms:kms /usr/local/share/py-kms /config
+iocage exec kms mkdir /usr/local/etc/rc.d
+cp ../includes/py-kms-conf/py_kms.rc /mnt/tank/iocage/jails/kms/root/usr/local/etc/rc.d/py_kms
+iocage exec kms chmod u+x /usr/local/etc/rc.d/py_kms
+iocage exec kms sysrc "py_kms_enable=YES"
+iocage exec kms service py_kms start
\ No newline at end of file

From 46c1c90d272471d21e09762c4bf5931a311e91fd Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sat, 29 Feb 2020 17:27:50 +0100
Subject: [PATCH 053/147] make executable

---
 install/kms.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 install/kms.sh

diff --git a/install/kms.sh b/install/kms.sh
old mode 100644
new mode 100755

From ab76445c11627bfce34ffcad2a82981884e566c1 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sat, 29 Feb 2020 17:36:12 +0100
Subject: [PATCH 054/147] fix bug

---
 includes/py-kms-conf/py_kms.rc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/py-kms-conf/py_kms.rc b/includes/py-kms-conf/py_kms.rc
index 3509f3dc..c993af18 100644
--- a/includes/py-kms-conf/py_kms.rc
+++ b/includes/py-kms-conf/py_kms.rc
@@ -33,6 +33,6 @@ load_rc_config $name
 : ${py_kms_data_dir:="/config"}
 
 command="/usr/local/bin/python3.7"
-command_args="/usr/local/share/py-kms/pykms_Server.py 0.0.0.0 1688 -F ${py_kms_data_dir}/py-kms.log etrigan start --etrigan-pid/etrigan.pid"
+command_args="/usr/local/share/py-kms/pykms_Server.py 0.0.0.0 1688 -F ${py_kms_data_dir}/py-kms.log etrigan start --etrigan-pid ${py_kms_data_dir}/etrigan.pid"
 
 run_rc_command "$1"
\ No newline at end of file

From 731d687935313bfcabab76d3a88dc5e545ce96d7 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sat, 29 Feb 2020 17:55:38 +0100
Subject: [PATCH 055/147] Add windows 10 setup

---
 includes/py-kms-conf/Setup_Windows_10_Pro.bat | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 includes/py-kms-conf/Setup_Windows_10_Pro.bat

diff --git a/includes/py-kms-conf/Setup_Windows_10_Pro.bat b/includes/py-kms-conf/Setup_Windows_10_Pro.bat
new file mode 100644
index 00000000..97471a45
--- /dev/null
+++ b/includes/py-kms-conf/Setup_Windows_10_Pro.bat
@@ -0,0 +1,4 @@
+cscript slmgr.vbs /upk
+cscript slmgr.vbs /ipk W269N-WFGWX-YVC9B-4J6C9-T83GX
+cscript slmgr.vbs /skms 192.168.10.43:1688
+cscript slmgr.vbs /ato
\ No newline at end of file

From 32a40713505048db28e87bec4a96e3c69c3c9588 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sat, 29 Feb 2020 19:39:37 +0100
Subject: [PATCH 056/147] Add activation guide/data

---
 .../py-kms-conf/Activate_Office_2019_Pro.bat  |  7 +++
 ...10_Pro.bat => Activate_Windows_10_Pro.bat} |  0
 .../Office-2019-Pro-VLK-Config.xml            | 43 +++++++++++++++++++
 includes/py-kms-conf/Readme.md                | 11 +++++
 4 files changed, 61 insertions(+)
 create mode 100644 includes/py-kms-conf/Activate_Office_2019_Pro.bat
 rename includes/py-kms-conf/{Setup_Windows_10_Pro.bat => Activate_Windows_10_Pro.bat} (100%)
 create mode 100644 includes/py-kms-conf/Office-2019-Pro-VLK-Config.xml
 create mode 100644 includes/py-kms-conf/Readme.md

diff --git a/includes/py-kms-conf/Activate_Office_2019_Pro.bat b/includes/py-kms-conf/Activate_Office_2019_Pro.bat
new file mode 100644
index 00000000..3a8a7616
--- /dev/null
+++ b/includes/py-kms-conf/Activate_Office_2019_Pro.bat
@@ -0,0 +1,7 @@
+cd C:\Program Files\Microsoft Office\Office16
+cscript ospp.vbs /dstatus
+cscript ospp.vbs /inpkey:VQ9DP-NVHPH-T9HJC-J9PDT-KTQRG
+cscript ospp.vbs /sethst:192.168.10.43
+cscript ospp.vbs /setprt:1688
+cscript ospp.vbs /act
+cscript ospp.vbs /dstatus
\ No newline at end of file
diff --git a/includes/py-kms-conf/Setup_Windows_10_Pro.bat b/includes/py-kms-conf/Activate_Windows_10_Pro.bat
similarity index 100%
rename from includes/py-kms-conf/Setup_Windows_10_Pro.bat
rename to includes/py-kms-conf/Activate_Windows_10_Pro.bat
diff --git a/includes/py-kms-conf/Office-2019-Pro-VLK-Config.xml b/includes/py-kms-conf/Office-2019-Pro-VLK-Config.xml
new file mode 100644
index 00000000..dac58dc2
--- /dev/null
+++ b/includes/py-kms-conf/Office-2019-Pro-VLK-Config.xml
@@ -0,0 +1,43 @@
+<Configuration ID="0b261046-a220-4392-88d4-2cfd462c90b3">
+  <Add OfficeClientEdition="64" Channel="PerpetualVL2019">
+    <Product ID="ProPlus2019Volume" PIDKEY="NMMKJ-6RK4F-KMJVX-8D9MJ-6MWKP">
+      <Language ID="en-us" />
+      <Language ID="nl-nl" />
+      <Language ID="MatchPreviousMSI" />
+      <ExcludeApp ID="Groove" />
+      <ExcludeApp ID="Lync" />
+      <ExcludeApp ID="OneDrive" />
+      <ExcludeApp ID="OneNote" />
+    </Product>
+    <Product ID="LanguagePack">
+      <Language ID="en-us" />
+      <Language ID="nl-nl" />
+      <Language ID="MatchPreviousMSI" />
+      <ExcludeApp ID="Groove" />
+      <ExcludeApp ID="Lync" />
+      <ExcludeApp ID="OneDrive" />
+      <ExcludeApp ID="OneNote" />
+    </Product>
+    <Product ID="ProofingTools">
+      <Language ID="nl-nl" />
+      <Language ID="en-us" />
+      <Language ID="fr-fr" />
+      <Language ID="de-de" />
+    </Product>
+  </Add>
+  <Property Name="SharedComputerLicensing" Value="0" />
+  <Property Name="PinIconsToTaskbar" Value="TRUE" />
+  <Property Name="SCLCacheOverride" Value="0" />
+  <Property Name="AUTOACTIVATE" Value="0" />
+  <Property Name="FORCEAPPSHUTDOWN" Value="TRUE" />
+  <Property Name="DeviceBasedLicensing" Value="0" />
+  <Updates Enabled="TRUE" />
+  <RemoveMSI />
+  <AppSettings>
+    <User Key="software\microsoft\office\16.0\excel\options" Name="defaultformat" Value="51" Type="REG_DWORD" App="excel16" Id="L_SaveExcelfilesas" />
+    <User Key="software\microsoft\office\16.0\powerpoint\options" Name="defaultformat" Value="27" Type="REG_DWORD" App="ppt16" Id="L_SavePowerPointfilesas" />
+    <User Key="software\microsoft\office\16.0\word\options" Name="defaultformat" Value="" Type="REG_SZ" App="word16" Id="L_SaveWordfilesas" />
+  </AppSettings>
+  <Display Level="Full" AcceptEULA="TRUE" />
+  <Logging Level="Off" />
+</Configuration>
\ No newline at end of file
diff --git a/includes/py-kms-conf/Readme.md b/includes/py-kms-conf/Readme.md
new file mode 100644
index 00000000..a1226f1f
--- /dev/null
+++ b/includes/py-kms-conf/Readme.md
@@ -0,0 +1,11 @@
+## Office 2019 pro
+
+All CMD commands are expected to be run from an elevated (administrator) command prompt (cmd)
+
+1. Download office 2019 deployment tool
+2. Extract the tool
+3. Copy Office-2019-Pro-VLK-Config.xml to folder you extracted the tool in
+4. CMD: cd *Path to extracted tool and xml*
+5. CMD: setup /configure Office-2019-Pro-VLK-Config.xml
+6. CMD: cd *path to this config file*
+7. CMD: Activate_Office_2019_Pro.bat
\ No newline at end of file

From d3d95566dcab8213fe099227854fcf1cd3ebdd11 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sat, 29 Feb 2020 19:45:37 +0100
Subject: [PATCH 057/147] add readme

---
 Readme.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 Readme.md

diff --git a/Readme.md b/Readme.md
new file mode 100644
index 00000000..09e33b93
--- /dev/null
+++ b/Readme.md
@@ -0,0 +1,19 @@
+## Intro
+
+This Repo are my personal install and update scripts I use (or have used and still support) for my freenas jails and (some) other network services.
+They will be grossly undercommented and underdocumented, but there are some nice gems if you know where to look.
+
+## Currently Supported Services
+
+### General
+- Organizr
+- Py-KMS (Windows Activation)
+
+### Media
+
+- Plex
+- Tautulli
+- Transmission
+- Sonarr
+- Radarr
+- Lidarr
\ No newline at end of file

From e5a1130fb2a00916e2680cc60f82b4283deb863a Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sat, 29 Feb 2020 20:05:04 +0100
Subject: [PATCH 058/147] Add script for Server 2019 Standard

---
 .../py-kms-conf/Activate_Windows_Server_2019_Standard.bat     | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 includes/py-kms-conf/Activate_Windows_Server_2019_Standard.bat

diff --git a/includes/py-kms-conf/Activate_Windows_Server_2019_Standard.bat b/includes/py-kms-conf/Activate_Windows_Server_2019_Standard.bat
new file mode 100644
index 00000000..0c410ba3
--- /dev/null
+++ b/includes/py-kms-conf/Activate_Windows_Server_2019_Standard.bat
@@ -0,0 +1,4 @@
+cscript slmgr.vbs /upk
+cscript slmgr.vbs /ipk N69G4-B89J2-4G8F4-WWYCC-J464C
+cscript slmgr.vbs /skms 192.168.10.43:1688
+cscript slmgr.vbs /ato
\ No newline at end of file

From 0821f9b9b7aef63c0146c4743465983a54e54226 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sat, 29 Feb 2020 20:14:47 +0100
Subject: [PATCH 059/147] replace wrong product key

---
 includes/py-kms-conf/Setup_Office_2019_Pro.txt | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 includes/py-kms-conf/Setup_Office_2019_Pro.txt

diff --git a/includes/py-kms-conf/Setup_Office_2019_Pro.txt b/includes/py-kms-conf/Setup_Office_2019_Pro.txt
new file mode 100644
index 00000000..39e168b3
--- /dev/null
+++ b/includes/py-kms-conf/Setup_Office_2019_Pro.txt
@@ -0,0 +1,7 @@
+cd C:\Program Files\Microsoft Office\Office16
+cscript ospp.vbs /dstatus
+cscript ospp.vbs /inpkey:NMMKJ-6RK4F-KMJVX-8D9MJ-6MWKP
+cscript ospp.vbs /sethst:192.168.10.43
+cscript ospp.vbs /setprt:1688
+cscript ospp.vbs /act
+cscript ospp.vbs /dstatus
\ No newline at end of file

From 65bd3805c9b5e6a26019c1a59628c9a1282d39d3 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sun, 1 Mar 2020 14:15:09 +0100
Subject: [PATCH 060/147] Fixing paths and eval bug

---
 .../Activate_Windows_Server_2019_Standard.bat          | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/includes/py-kms-conf/Activate_Windows_Server_2019_Standard.bat b/includes/py-kms-conf/Activate_Windows_Server_2019_Standard.bat
index 0c410ba3..e544df67 100644
--- a/includes/py-kms-conf/Activate_Windows_Server_2019_Standard.bat
+++ b/includes/py-kms-conf/Activate_Windows_Server_2019_Standard.bat
@@ -1,4 +1,6 @@
-cscript slmgr.vbs /upk
-cscript slmgr.vbs /ipk N69G4-B89J2-4G8F4-WWYCC-J464C
-cscript slmgr.vbs /skms 192.168.10.43:1688
-cscript slmgr.vbs /ato
\ No newline at end of file
+%windir%\system32\DISM.exe /Online /Get-TargetEditions
+%windir%\system32\DISM /online /Set-Edition:ServerStandard /ProductKey:N69G4-B89J2-4G8F4-WWYCC-J464C /AcceptEula
+cscript %windir%\system32\slmgr.vbs /upk
+cscript %windir%\system32\slmgr.vbs /ipk N69G4-B89J2-4G8F4-WWYCC-J464C
+cscript %windir%\system32\slmgr.vbs /skms 192.168.10.43:1688
+cscript %windir%\system32\slmgr.vbs /ato
\ No newline at end of file

From fbe7ce58ab94234d28dae162bd154592b624fba8 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Mon, 2 Mar 2020 23:50:12 +0100
Subject: [PATCH 061/147] initial ombi setup

---
 includes/ombi-conf/ombi.rc                  | 49 +++++++++++++++++++++
 includes/organizr-conf/custom/organizr.conf |  4 +-
 install/ombi.sh                             | 28 ++++++++++++
 3 files changed, 79 insertions(+), 2 deletions(-)
 create mode 100644 includes/ombi-conf/ombi.rc
 create mode 100644 install/ombi.sh

diff --git a/includes/ombi-conf/ombi.rc b/includes/ombi-conf/ombi.rc
new file mode 100644
index 00000000..a31da860
--- /dev/null
+++ b/includes/ombi-conf/ombi.rc
@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: ombi
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# ombi_enable (bool): Set to NO by default.
+# Set it to YES to enable it.
+# ombi_user: The user account ombi daemon runs as what
+# you want it to be. It uses 'ombi' user by
+# default. Do not sets it as empty or it will run
+# as root.
+# ombi_group: The group account ombi daemon runs as what
+# you want it to be. It uses 'ombi' group by
+# default. Do not sets it as empty or it will run
+# as wheel.
+# ombi_data_dir: Directory where ombi configuration
+# data is stored.
+# Default: /usr/local/share/ombi
+
+. /etc/rc.subr
+
+name=ombi
+rcvar=ombi_enable
+load_rc_config ${name}
+
+: ${ombi_enable:=NO}
+: ${ombi_user:=ombi}
+: ${ombi_group:=ombi}
+: ${ombi_data_dir:="/config"}
+
+procname="/usr/local/bin/mono"
+command="/usr/sbin/daemon"
+command_args="-f ${procname} /usr/local/share/ombi/Ombi.exe"
+
+start_precmd=ombi_precmd
+ombi_precmd() {
+if [ ! -d ${ombi_data_dir} ];
+then install -d -o ${ombi_user} -g ${ombi_group} ${ombi_data_dir}
+fi
+export XDG_CONFIG_HOME=${ombi_data_dir}
+}
+
+run_rc_command "$1"
\ No newline at end of file
diff --git a/includes/organizr-conf/custom/organizr.conf b/includes/organizr-conf/custom/organizr.conf
index a5643b4d..47357211 100644
--- a/includes/organizr-conf/custom/organizr.conf
+++ b/includes/organizr-conf/custom/organizr.conf
@@ -115,10 +115,10 @@ location /tautulli/ {
     proxy_redirect off;
 }
 
-location /ombi {
+location /ombi/ {
     auth_request /auth-4;
     add_header X-Frame-Options "SAMEORIGIN";
-    proxy_pass https://127.0.0.1:5000/ombi/;
+    proxy_pass https://192.168.31.27:3579/;
     proxy_http_version 1.1;
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection keep-alive;
diff --git a/install/ombi.sh b/install/ombi.sh
new file mode 100644
index 00000000..6b6d60c8
--- /dev/null
+++ b/install/ombi.sh
@@ -0,0 +1,28 @@
+echo '{"pkgs":["mono","ca_root_nss","unzip","sqlite3","nano"]}' > /tmp/pkg.json
+iocage create -n "ombi" -p /tmp/pkg.json -r 11.3-RELEASE interfaces="vnet0:bridge31" ip4_addr="vnet0|192.168.31.27/24" defaultrouter="192.168.31.1" vnet="on" allow_raw_sockets="1" boot="on"
+rm /tmp/pkg.json
+iocage fstab -a ombi /mnt/tank/apps/ombi /config nullfs rw 0 0
+iocage exec ombi ln -s /usr/local/bin/mono /usr/bin/mono
+iocage exec ombi "fetch https://github.com/tidusjar/Ombi/releases/download/v2.2.1/Ombi.zip -o /usr/local/share"
+iocage exec ombi "unzip -d /usr/local/share /usr/local/share/Ombi.zip"
+iocage exec ombi mv /usr/local/share/Release /usr/local/share/ombi
+iocage exec ombi rm /usr/local/share/Ombi.zip
+ 
+if [ -f "/config/Ombi.sqlite" ];
+then
+   echo "Ombi.sqlite exist."
+else
+   echo "Ombi.sqlite does not exist, creating..." >&2
+   iocage exec ombi sqlite3 /config/Ombi.sqlite "create table aTable(field1 int); drop table aTable;"
+   iocage exec ombi mkdir -p /config/Backups
+fi
+
+iocage exec ombi ln -s /config/Ombi.sqlite /usr/local/share/ombi/Ombi.sqlite
+iocage exec ombi ln -s /config/Backups /usr/local/share/ombi/Backups
+iocage exec ombi "pw user add ombi -c ombi -u 819 -d /nonexistent -s /usr/bin/nologin"
+iocage exec ombi chown -R ombi:ombi /usr/local/share/ombi /config
+iocage exec ombi mkdir /usr/local/etc/rc.d
+cp ../includes/ombi-conf/ombi.rc /mnt/tank/iocage/jails/ombi/root/usr/local/etc/rc.d/ombi
+iocage exec ombi chmod u+x /usr/local/etc/rc.d/ombi
+iocage exec ombi sysrc ombi_enable=YES
+iocage exec ombi service ombi start
\ No newline at end of file

From bbc8ea9add44bb7d269a64d35ccdb3c8c9c6d68a Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Mon, 2 Mar 2020 23:51:33 +0100
Subject: [PATCH 062/147] make executable

---
 install/ombi.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 install/ombi.sh

diff --git a/install/ombi.sh b/install/ombi.sh
old mode 100644
new mode 100755

From d129808e2ab744e1b79688f62712a8fe80d8efdd Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Tue, 3 Mar 2020 00:38:07 +0100
Subject: [PATCH 063/147] bug fix

---
 install/ombi.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install/ombi.sh b/install/ombi.sh
index 6b6d60c8..6cf864bc 100755
--- a/install/ombi.sh
+++ b/install/ombi.sh
@@ -1,6 +1,7 @@
 echo '{"pkgs":["mono","ca_root_nss","unzip","sqlite3","nano"]}' > /tmp/pkg.json
 iocage create -n "ombi" -p /tmp/pkg.json -r 11.3-RELEASE interfaces="vnet0:bridge31" ip4_addr="vnet0|192.168.31.27/24" defaultrouter="192.168.31.1" vnet="on" allow_raw_sockets="1" boot="on"
 rm /tmp/pkg.json
+iocage exec ombi mkdir -p /config
 iocage fstab -a ombi /mnt/tank/apps/ombi /config nullfs rw 0 0
 iocage exec ombi ln -s /usr/local/bin/mono /usr/bin/mono
 iocage exec ombi "fetch https://github.com/tidusjar/Ombi/releases/download/v2.2.1/Ombi.zip -o /usr/local/share"

From 4c09ea840cced2651cbfe89af1f36ef0d3e2aed5 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Fri, 6 Mar 2020 21:32:55 +0100
Subject: [PATCH 064/147] The Birth of JailMan (#2)

* move ex (+25 squashed commit)

Squashed commit:

[e5e9c57] verb

[16b023f] exp

[e0299d9] easier

[67fcf93] no message

[404687f] different

[bd82e7c] test

[14b91d9] mod

[f2bb227] test again

[a9d5ad0] again

[0dcb106] with bash

[7324c15] more

[8ec72d5] another test

[0933fdc] again

[a5247df] test more

[ee61137] temp test

[c90aa90] add some more tests

[9f8e47a] make executable

[ac84788] rename part 2

[890c3ca] rename part 1

[f17e571] test create

[9bd8ecd] typo aqgain

[eb865a7] test2

[fb57e28] typo

[595d9e9] make executable

[5d1ae75] first steps

* test5 (+22 squashed commit)

Squashed commit:

[f059ada] tweaks

[5c325de] again

[9f59aa6] ip4

[9990a77] Standardised creation

[0a6fa7f] whoops

[620d07c] no message

[2a98559] error

[62e9c39] hmmm

[9f8e4df] no message

[d1e9025] puzzle

[73aa99b] substitution try 1

[117e75e] other sub

[7c080b0] more flexible

[a0778f4] testzoveel

[739a3bf] fix

[f881425] no message

[1962b83] oops

[994692c] no message

[b6dd2a2] test

[6713186] echo

[6d8d95a] test

[f8c3740] quote processing

* small update fix (+18 squashed commit)

Squashed commit:

[8f0c2aa] Basic update

[c44eae5] simplification

[b1e9314] define basic pkgs

[1a55a85] define global pkgs

[6829d30] dirtest

[5d2a215] checking for install script existance

[d936df3] 1

[fcc7403] hmm

[08e7e07] exit 0

[380da4d] jail interfaces

[634f12e] make all executable

[0f2728c] add first test jail

[8320d77] restructure individual install scripts

[752b375] Standardise

[cbab837] itterate through jails

[37ecc1d] if array is without elements

[0a9e899] moving it to arrays

[cc356ee] mockup jailman

* moving docs,fixing test thingy (+27 squashed commit)

Squashed commit:

[76e856b] rc.d pathing

[4e1b178] fixing some pathing bugs

[e9e9648] quotes

[7c5aa9e] test10 fixes

[e8858cc] sonarr first steps

[0cb1efe] exit on invalid option

[e3451da] exit on unknown option

[60a1f9c] exit

[0536c11] test idea

[81d3465] hmm

[cb3b935] work on h

[1311fea] enable help

[aa8d55a] space?

[5ef67e0] add comment to global

[61be2fa] Add commenting and in-script help

[aac8557] Testing broken config

[ecc1142] oops

[e0059be] condition fix

[9628297] Add check for missing network settings

[44be2bc] Creating DHCP option, working on default example config.

[b0fe910] Adding documentation, setting up Jackett

[0045b2b] strucutre

[fbe3d20] includes first

[a1b032d] gitupdate space

[1b503b5] update fix

[512f597] add update feature

[e9b8359] add initial upgrade script

* Create LICENSE (#1)

* to 30

* move back kms includes readme, add config.yml to gitignore, add kms to config.yml.example (+24 squashed commit)

Squashed commit:

[095aa36] added py ks to readme

[28526d8] Setup KMS

[82f7bfa] Exeuction fix

[89de700] finish organizr and setup first steps of kms

[0624952] Add dummy cert generation

[2583e39] slight nginx mod

[3b3da6a] fixed again

[7f5807b] Readme and fix for wrong copy

[6cab6ca] Make tautulli permanent and prepare organizr

[6801447] Tautulli setup, plex to permanent

[6198469] also fix update if

[49cff5d] if fix 2

[4c436c4] fixing plex if

[1adf56f] Add first go at plex support

[446dff6] fixing some linking and dataset creation

[6dee179] forgot to set yaml files

[4e767de] settings file is not needed at all

[8ff9d73] setup lidarr, begin setup for transmission

[8f8d9ee] Fixing wrong echo's, adding *arr to readme

[7aab5f0] lidarr test setup, making radarr final, yaml restructure

[3113f71] some dataset creation tweaks

[286437b] movies, much

[181cf3e] test setup

[6477b74] Sonarr done, radarr next

* set to master and make executable
---
 .gitignore                                    |   1 +
 Readme.md                                     |  19 -
 config.yml.example                            |  51 +++
 docs/LICENSE                                  |  25 ++
 docs/LICENSE.BSD2                             |  25 ++
 docs/LICENSE.GPLV2                            | 339 ++++++++++++++++++
 docs/Readme.md                                |  83 +++++
 global.sh                                     |  39 ++
 includes/ombi-conf/ombi.rc                    |  49 ---
 includes/organizr-conf/nginx.conf             |  21 --
 includes/transmission-conf/settings.json      |  69 ----
 install/kms.sh                                |  13 -
 install/lidarr.sh                             |  20 --
 install/ombi.sh                               |  29 --
 install/plex.sh                               |  26 --
 install/radarr.sh                             |  20 --
 install/sonarr.sh                             |  20 --
 install/transmission.sh                       |  17 -
 jailcreate.sh                                 |  53 +++
 jailman.sh                                    | 170 +++++++++
 .../jackett/includes}/jackett.rc              |   0
 .../jackett.sh => jails/jackett/install.sh    |  12 +-
 jails/jackett/readme.md                       |   6 +
 jails/jackett/update.sh                       |   9 +
 .../includes}/Activate_Office_2019_Pro.bat    |   0
 .../kms/includes}/Activate_Windows_10_Pro.bat |   0
 .../Activate_Windows_Server_2019_Standard.bat |   0
 .../includes}/Office-2019-Pro-VLK-Config.xml  |   0
 .../kms/includes}/Readme.md                   |   0
 .../kms/includes}/Setup_Office_2019_Pro.txt   |   0
 .../kms/includes}/py_kms.rc                   |   0
 jails/kms/install.sh                          |  12 +
 jails/kms/update.sh                           |   9 +
 .../lidarr/includes}/lidarr.rc                |   0
 jails/lidarr/install.sh                       |  44 +++
 jails/lidarr/update.sh                        |   9 +
 .../organizr/includes}/custom/organizr.conf   |   0
 .../organizr/includes}/custom/phpblock.conf   |   0
 jails/organizr/includes/nginx.conf            |  25 ++
 .../organizr.sh => jails/organizr/install.sh  |  30 +-
 .../organizr.sh => jails/organizr/update.sh   |  10 +-
 .../plex/includes}/FreeBSD.conf               |   0
 jails/plex/install.sh                         |  65 ++++
 jails/plex/update.sh                          |  22 ++
 .../radarr/includes}/radarr.rc                |   0
 jails/radarr/install.sh                       |  43 +++
 jails/radarr/update.sh                        |   9 +
 .../sonarr/includes}/sonarr.rc                |   0
 jails/sonarr/install.sh                       |  44 +++
 jails/sonarr/update.sh                        |   9 +
 .../tautulli.sh => jails/tautulli/install.sh  |   9 +-
 .../tautulli.sh => jails/tautulli/update.sh   |   6 +-
 jails/transmission/install.sh                 |  38 ++
 jails/transmission/update.sh                  |   7 +
 update-all.sh                                 |   4 -
 update/jackett.sh                             |   7 -
 update/lidarr.sh                              |   7 -
 update/plex.sh                                |   8 -
 update/radarr.sh                              |   7 -
 update/sonarr.sh                              |   7 -
 60 files changed, 1177 insertions(+), 370 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 Readme.md
 create mode 100644 config.yml.example
 create mode 100644 docs/LICENSE
 create mode 100644 docs/LICENSE.BSD2
 create mode 100644 docs/LICENSE.GPLV2
 create mode 100644 docs/Readme.md
 create mode 100755 global.sh
 delete mode 100644 includes/ombi-conf/ombi.rc
 delete mode 100644 includes/organizr-conf/nginx.conf
 delete mode 100644 includes/transmission-conf/settings.json
 delete mode 100755 install/kms.sh
 delete mode 100755 install/lidarr.sh
 delete mode 100755 install/ombi.sh
 delete mode 100755 install/plex.sh
 delete mode 100755 install/radarr.sh
 delete mode 100755 install/sonarr.sh
 delete mode 100755 install/transmission.sh
 create mode 100755 jailcreate.sh
 create mode 100755 jailman.sh
 rename {includes/jackett-conf => jails/jackett/includes}/jackett.rc (100%)
 rename install/jackett.sh => jails/jackett/install.sh (56%)
 create mode 100644 jails/jackett/readme.md
 create mode 100755 jails/jackett/update.sh
 rename {includes/py-kms-conf => jails/kms/includes}/Activate_Office_2019_Pro.bat (100%)
 rename {includes/py-kms-conf => jails/kms/includes}/Activate_Windows_10_Pro.bat (100%)
 rename {includes/py-kms-conf => jails/kms/includes}/Activate_Windows_Server_2019_Standard.bat (100%)
 rename {includes/py-kms-conf => jails/kms/includes}/Office-2019-Pro-VLK-Config.xml (100%)
 rename {includes/py-kms-conf => jails/kms/includes}/Readme.md (100%)
 rename {includes/py-kms-conf => jails/kms/includes}/Setup_Office_2019_Pro.txt (100%)
 rename {includes/py-kms-conf => jails/kms/includes}/py_kms.rc (100%)
 create mode 100755 jails/kms/install.sh
 create mode 100755 jails/kms/update.sh
 rename {includes/lidarr-conf => jails/lidarr/includes}/lidarr.rc (100%)
 create mode 100755 jails/lidarr/install.sh
 create mode 100755 jails/lidarr/update.sh
 rename {includes/organizr-conf => jails/organizr/includes}/custom/organizr.conf (100%)
 rename {includes/organizr-conf => jails/organizr/includes}/custom/phpblock.conf (100%)
 create mode 100644 jails/organizr/includes/nginx.conf
 rename install/organizr.sh => jails/organizr/install.sh (50%)
 rename update/organizr.sh => jails/organizr/update.sh (54%)
 rename {includes/plex-conf => jails/plex/includes}/FreeBSD.conf (100%)
 create mode 100755 jails/plex/install.sh
 create mode 100755 jails/plex/update.sh
 rename {includes/radarr-conf => jails/radarr/includes}/radarr.rc (100%)
 create mode 100755 jails/radarr/install.sh
 create mode 100755 jails/radarr/update.sh
 rename {includes/sonarr-conf => jails/sonarr/includes}/sonarr.rc (100%)
 create mode 100755 jails/sonarr/install.sh
 create mode 100755 jails/sonarr/update.sh
 rename install/tautulli.sh => jails/tautulli/install.sh (58%)
 rename update/tautulli.sh => jails/tautulli/update.sh (69%)
 create mode 100755 jails/transmission/install.sh
 create mode 100755 jails/transmission/update.sh
 delete mode 100755 update-all.sh
 delete mode 100755 update/jackett.sh
 delete mode 100755 update/lidarr.sh
 delete mode 100755 update/plex.sh
 delete mode 100755 update/radarr.sh
 delete mode 100755 update/sonarr.sh

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..e9abc7f6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+config.yml
\ No newline at end of file
diff --git a/Readme.md b/Readme.md
deleted file mode 100644
index 09e33b93..00000000
--- a/Readme.md
+++ /dev/null
@@ -1,19 +0,0 @@
-## Intro
-
-This Repo are my personal install and update scripts I use (or have used and still support) for my freenas jails and (some) other network services.
-They will be grossly undercommented and underdocumented, but there are some nice gems if you know where to look.
-
-## Currently Supported Services
-
-### General
-- Organizr
-- Py-KMS (Windows Activation)
-
-### Media
-
-- Plex
-- Tautulli
-- Transmission
-- Sonarr
-- Radarr
-- Lidarr
\ No newline at end of file
diff --git a/config.yml.example b/config.yml.example
new file mode 100644
index 00000000..1a4f3ba0
--- /dev/null
+++ b/config.yml.example
@@ -0,0 +1,51 @@
+global:
+  # Relevant dataset paths, please use the ZFS dataset syntax such as: tank/apps
+  dataset:
+   config: tank/apps
+   iocage: tank/iocage
+  jails:
+   # jail version to install
+   version: 11.3-RELEASE
+   # Global pkgs to install in all jails.
+   # Please use standard space delimited pkg install syntax.
+   pkgs: curl ca_root_nss
+
+
+# Example configuration, showing how to customise network config.
+# Ese the same jailname on both sides of this variable example: example
+example: example
+  #interfaces is optional and will be autmatically replace with vnet0:bridge0 if not present
+  interfaces: vnet0:bridge0
+  ip4_addr: 192.168.1.99/24
+  gateway: 192.168.1.1
+  # Jail specific pkgs. 
+  # Please use standard space delimited pkg install syntax.
+  pkgs: mono
+ 
+jackett: jackett
+  pkgs: mono
+ 
+radarr: radarr
+  pkgs: mono
+ 
+sonarr: sonarr
+  pkgs: mono
+ 
+lidarr: lidarr
+  pkgs: mono
+ 
+transmission: transmission
+  pkgs: bash unzip unrar transmission
+  
+plex: plex
+  plexpass: false
+  pkgs: plexmediaserver
+  
+tautulli: tautulli
+  pkgs: python2 py27-sqlite3 py27-openssl git
+  
+organizr: organizr
+  pkgs: nginx php72 php72-filter php72-curl php72-hash php72-json php72-openssl php72-pdo php72-pdo_sqlite php72-session php72-simplexml php72-sqlite3 php72-zip git
+  
+kms: kms
+  pkgs: bash py37-tkinter py37-pip py37-sqlite3 git
diff --git a/docs/LICENSE b/docs/LICENSE
new file mode 100644
index 00000000..3c91742b
--- /dev/null
+++ b/docs/LICENSE
@@ -0,0 +1,25 @@
+BSD 2-Clause License
+
+Copyright (c) 2020, Kjeld Schouten-Lebbing
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+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 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
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/LICENSE.BSD2 b/docs/LICENSE.BSD2
new file mode 100644
index 00000000..c7394569
--- /dev/null
+++ b/docs/LICENSE.BSD2
@@ -0,0 +1,25 @@
+BSD 2-Clause License
+
+Copyright (c) 2019, Kjeld Schouten-Lebbing
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+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 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
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/docs/LICENSE.GPLV2 b/docs/LICENSE.GPLV2
new file mode 100644
index 00000000..d159169d
--- /dev/null
+++ b/docs/LICENSE.GPLV2
@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/docs/Readme.md b/docs/Readme.md
new file mode 100644
index 00000000..de3d4ff3
--- /dev/null
+++ b/docs/Readme.md
@@ -0,0 +1,83 @@
+## Intro
+
+JailMan is a collection of shell scripts designed to make it easier to install iocage Jails on FreeNAS and/or TrueNAS core.
+Inspirations for this script are: Docker, FreeNAS plugins, Pentaflake's guide and "freenas-iocage-nextcloud" by danb35.
+The updater is inspired by the updater designed for ZFS-Compression-Test by Ornias1993.
+
+The goal of this project is to be able to install, update, reinstall, upgrade and delete most of your services by just running a single command.
+While doing this we aim for a "docker like" scenario, where the jail is completely disposable and all configuration is saved outside of the jail.
+
+Example: 
+If something goes wrong with Jackett, you just use:
+'jailman -r jackett' 
+
+
+## Install
+- `git clone https://github.com/Ornias1993/jailman.git`
+- `cp config.yml.ex. config.yml`
+- edit config.yml to reflect your personal settings
+
+Thats all.
+
+
+## Update
+This script includes an autoupdate feature which checks if changes to the script has been posted to github.
+
+## Use
+Replace $jailname with the name of the jail you want to install.
+For supported jails, please see this readme or config.yml.example
+
+- Install:
+`jailman.sh -i $jailname`
+
+- ReInstall:
+`jailman.sh -r $jailname`
+
+- Destroy
+`jailman.sh -d $jailname`
+
+This installs the jail, creates the config dataset if needed, installs all packages and sets them up for you.
+Only thing you need to do is do the setup of the packages in their respective GUI.
+All settings for the applications inside the jails are persistent across reinstalls, so don't worry reinstalling!
+
+config.yml.example includes basic configuration for all jails.
+Basic means: The same setup as a FreeNAS plugin would've, DHCP on bridge0.
+
+## Currently Supported Services
+
+### General
+
+- organizr
+- py-kms
+
+### Downloads
+
+- transmission
+- jackett
+
+### Media
+
+- plex
+- tautulli
+- sonarr
+- radarr
+- lidarr
+
+## References
+
+- Pentaflake's guide:
+https://www.ixsystems.com/community/resources/fn11-3-iocage-jails-plex-tautulli-sonarr-radarr-lidarr-jackett-transmission-organizr.58/
+
+- "freenas-iocage-nextcloud" by danb35:
+https://github.com/danb35/freenas-iocage-nextcloud
+
+- "ZFS-Compression-Test" by Ornias1993:
+https://github.com/Ornias1993/zfs-compression-test
+
+- "py-kms" by SystemRage and others:
+https://github.com/SystemRage/py-kms
+
+
+
+### LICENCE
+This work is dual licenced under GPLv2 and BSD-2 clause
\ No newline at end of file
diff --git a/global.sh b/global.sh
new file mode 100755
index 00000000..9211b7c0
--- /dev/null
+++ b/global.sh
@@ -0,0 +1,39 @@
+#!/usr/local/bin/bash
+# shellcheck disable=SC1003
+
+# yml Parser function
+# Based on https://gist.github.com/pkuczynski/8665367
+parse_yaml() {
+   local prefix=$2
+   local s='[[:space:]]*' w='[a-zA-Z0-9_]*' fs=$(echo @|tr @ '\034')
+   sed -ne "s|^\($s\)\($w\)$s:$s\"\(.*\)\"$s\$|\1$fs\2$fs\3|p" \
+        -e "s|^\($s\)\($w\)$s:$s\(.*\)$s\$|\1$fs\2$fs\3|p"  $1 |
+   awk -F$fs '{
+      indent = length($1)/2;
+      vname[indent] = $2;
+      for (i in vname) {if (i > indent) {delete vname[i]}}
+      if (length($3) > 0) {
+         vn=""; for (i=0; i<indent; i++) {vn=(vn)(vname[i])("_")}
+         printf("export %s%s%s=\"%s\"\n", "'$prefix'",vn, $2, $3);
+      }
+   }'
+}
+
+# automatic update function
+gitupdate() {
+echo "checking for updates using Branch: $1"
+git fetch
+git update-index -q --refresh
+CHANGED=$(git diff --name-only origin/$1)
+if [ ! -z "$CHANGED" ];
+then
+    echo "script requires update"
+    git reset --hard
+    git checkout $1
+    git pull
+    echo "script updated"
+    exit 1
+else
+    echo "script up-to-date"
+fi
+}
diff --git a/includes/ombi-conf/ombi.rc b/includes/ombi-conf/ombi.rc
deleted file mode 100644
index a31da860..00000000
--- a/includes/ombi-conf/ombi.rc
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: ombi
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-# ombi_enable (bool): Set to NO by default.
-# Set it to YES to enable it.
-# ombi_user: The user account ombi daemon runs as what
-# you want it to be. It uses 'ombi' user by
-# default. Do not sets it as empty or it will run
-# as root.
-# ombi_group: The group account ombi daemon runs as what
-# you want it to be. It uses 'ombi' group by
-# default. Do not sets it as empty or it will run
-# as wheel.
-# ombi_data_dir: Directory where ombi configuration
-# data is stored.
-# Default: /usr/local/share/ombi
-
-. /etc/rc.subr
-
-name=ombi
-rcvar=ombi_enable
-load_rc_config ${name}
-
-: ${ombi_enable:=NO}
-: ${ombi_user:=ombi}
-: ${ombi_group:=ombi}
-: ${ombi_data_dir:="/config"}
-
-procname="/usr/local/bin/mono"
-command="/usr/sbin/daemon"
-command_args="-f ${procname} /usr/local/share/ombi/Ombi.exe"
-
-start_precmd=ombi_precmd
-ombi_precmd() {
-if [ ! -d ${ombi_data_dir} ];
-then install -d -o ${ombi_user} -g ${ombi_group} ${ombi_data_dir}
-fi
-export XDG_CONFIG_HOME=${ombi_data_dir}
-}
-
-run_rc_command "$1"
\ No newline at end of file
diff --git a/includes/organizr-conf/nginx.conf b/includes/organizr-conf/nginx.conf
deleted file mode 100644
index 6a654306..00000000
--- a/includes/organizr-conf/nginx.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-user www;
-worker_processes 1;
-
-events {
-	worker_connections 1024;
-}
-
-http {
-	include mime.types;
-	default_type application/octet-stream;
-	sendfile on;
-	keepalive_timeout 65;
-	server {
-		listen 443 ssl;
-		server_name organizr.schouten-lebbing.nl;
-		include custom/organizr.conf;
-		ssl_certificate /config/cert/Organizr-Cert.crt; # Manually Added
-		ssl_certificate_key /config/cert/Organizr-Cert.key; # Manually Added
-	}
-
-}
\ No newline at end of file
diff --git a/includes/transmission-conf/settings.json b/includes/transmission-conf/settings.json
deleted file mode 100644
index e8c8a728..00000000
--- a/includes/transmission-conf/settings.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-    "alt-speed-down": 10000,
-    "alt-speed-enabled": true,
-    "alt-speed-time-begin": 420,
-    "alt-speed-time-day": 127,
-    "alt-speed-time-enabled": true,
-    "alt-speed-time-end": 1260,
-    "alt-speed-up": 5000,
-    "bind-address-ipv4": "0.0.0.0",
-    "bind-address-ipv6": "::",
-    "blocklist-enabled": false,
-    "blocklist-url": "http://www.example.com/blocklist",
-    "cache-size-mb": 200,
-    "dht-enabled": true,
-    "download-dir": "/mnt/downloads/complete",
-    "download-queue-enabled": false,
-    "download-queue-size": 50,
-    "encryption": 1,
-    "idle-seeding-limit": 1,
-    "idle-seeding-limit-enabled": true,
-    "incomplete-dir": "/mnt/downloads/incomplete",
-    "incomplete-dir-enabled": true,
-    "lpd-enabled": false,
-    "message-level": 2,
-    "peer-congestion-algorithm": "",
-    "peer-id-ttl-hours": 6,
-    "peer-limit-global": 1000,
-    "peer-limit-per-torrent": 100,
-    "peer-port": 51413,
-    "peer-port-random-high": 65535,
-    "peer-port-random-low": 49152,
-    "peer-port-random-on-start": false,
-    "peer-socket-tos": "default",
-    "pex-enabled": true,
-    "pidfile": "/var/run/transmission/daemon.pid",
-    "port-forwarding-enabled": false,
-    "preallocation": 0,
-    "prefetch-enabled": true,
-    "queue-stalled-enabled": true,
-    "queue-stalled-minutes": 1,
-    "ratio-limit": 0,
-    "ratio-limit-enabled": true,
-    "rename-partial-files": true,
-    "rpc-authentication-required": false,
-    "rpc-bind-address": "0.0.0.0",
-    "rpc-enabled": true,
-    "rpc-host-whitelist": "",
-    "rpc-host-whitelist-enabled": false,
-    "rpc-password": "{4274e8c504b23f3cd52c7128d4838282019b83bbUtfhD/5d",
-    "rpc-port": 9091,
-    "rpc-url": "/transmission/",
-    "rpc-username": "",
-    "rpc-whitelist": "127.0.0.1",
-    "rpc-whitelist-enabled": false,
-    "scrape-paused-torrents-enabled": true,
-    "script-torrent-done-enabled": false,
-    "script-torrent-done-filename": "",
-    "seed-queue-enabled": false,
-    "seed-queue-size": 10,
-    "speed-limit-down": 100,
-    "speed-limit-down-enabled": false,
-    "speed-limit-up": 100,
-    "speed-limit-up-enabled": false,
-    "start-added-torrents": true,
-    "trash-original-torrent-files": false,
-    "umask": 0,
-    "upload-slots-per-torrent": 14,
-    "utp-enabled": true
-}
diff --git a/install/kms.sh b/install/kms.sh
deleted file mode 100755
index c921b914..00000000
--- a/install/kms.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-echo '{"pkgs":["bash","ca_root_nss","nano","py37-tkinter","py37-pip","py37-sqlite3","git"]}' > /tmp/pkg.json
-iocage create -n "kms" -p /tmp/pkg.json -r 11.3-RELEASE interfaces="vnet0:bridge10" ip4_addr="vnet0|192.168.10.43/24" defaultrouter="192.168.10.1" vnet="on" allow_raw_sockets="1" boot="on"
-rm /tmp/pkg.json
-iocage exec kms mkdir -p /config
-iocage fstab -a kms /mnt/tank/apps/kms /config nullfs rw 0 0
-iocage exec kms svn checkout https://github.com/SystemRage/py-kms/trunk/py-kms /usr/local/share/py-kms
-iocage exec kms "pw user add kms -c kms -u 666 -d /nonexistent -s /usr/bin/nologin"
-iocage exec kms chown -R kms:kms /usr/local/share/py-kms /config
-iocage exec kms mkdir /usr/local/etc/rc.d
-cp ../includes/py-kms-conf/py_kms.rc /mnt/tank/iocage/jails/kms/root/usr/local/etc/rc.d/py_kms
-iocage exec kms chmod u+x /usr/local/etc/rc.d/py_kms
-iocage exec kms sysrc "py_kms_enable=YES"
-iocage exec kms service py_kms start
\ No newline at end of file
diff --git a/install/lidarr.sh b/install/lidarr.sh
deleted file mode 100755
index cb5d6411..00000000
--- a/install/lidarr.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-echo '{"pkgs":["mono","mediainfo","sqlite3","ca_root_nss","curl","chromaprint","nano"]}' > /tmp/pkg.json
-iocage create -n "lidarr" -p /tmp/pkg.json -r 11.3-RELEASE interfaces="vnet0:bridge31" ip4_addr="vnet0|192.168.31.25/24" defaultrouter="192.168.31.1" vnet="on" allow_raw_sockets="1" boot="on"
-rm /tmp/pkg.json
-iocage exec lidarr mkdir -p /config
-iocage exec lidarr mkdir -p /mnt/music
-iocage exec lidarr mkdir -p /mnt/fetched
-iocage fstab -a lidarr /mnt/tank/apps/lidarr /config nullfs rw 0 0
-iocage fstab -a lidarr /mnt/tank/downloads/complete /mnt/fetched nullfs rw 0 0
-iocage fstab -a lidarr /mnt/tank/library/Music /mnt/music nullfs rw 0 0
-iocage exec lidarr ln -s /usr/local/bin/mono /usr/bin/mono
-iocage exec lidarr "fetch https://github.com/lidarr/Lidarr/releases/download/v0.2.0.371/Lidarr.develop.0.2.0.371.linux.tar.gz -o /usr/local/share"
-iocage exec lidarr "tar -xzvf /usr/local/share/Lidarr.develop.0.2.0.371.linux.tar.gz -C /usr/local/share"
-iocage exec lidarr "rm /usr/local/share/Lidarr.develop.0.2.0.371.linux.tar.gz"
-iocage exec lidarr "pw user add lidarr -c lidarr -u 353 -d /nonexistent -s /usr/bin/nologin"
-iocage exec lidarr chown -R lidarr:lidarr /usr/local/share/Lidarr /config
-iocage exec lidarr mkdir /usr/local/etc/rc.d
-cp ../includes/lidarr-conf/lidarr.rc /mnt/tank/iocage/jails/lidarr/root/usr/local/etc/rc.d/lidarr
-iocage exec lidarr chmod u+x /usr/local/etc/rc.d/lidarr
-iocage exec lidarr sysrc "lidarr_enable=YES"
-iocage exec lidarr service lidarr start
\ No newline at end of file
diff --git a/install/ombi.sh b/install/ombi.sh
deleted file mode 100755
index 6cf864bc..00000000
--- a/install/ombi.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-echo '{"pkgs":["mono","ca_root_nss","unzip","sqlite3","nano"]}' > /tmp/pkg.json
-iocage create -n "ombi" -p /tmp/pkg.json -r 11.3-RELEASE interfaces="vnet0:bridge31" ip4_addr="vnet0|192.168.31.27/24" defaultrouter="192.168.31.1" vnet="on" allow_raw_sockets="1" boot="on"
-rm /tmp/pkg.json
-iocage exec ombi mkdir -p /config
-iocage fstab -a ombi /mnt/tank/apps/ombi /config nullfs rw 0 0
-iocage exec ombi ln -s /usr/local/bin/mono /usr/bin/mono
-iocage exec ombi "fetch https://github.com/tidusjar/Ombi/releases/download/v2.2.1/Ombi.zip -o /usr/local/share"
-iocage exec ombi "unzip -d /usr/local/share /usr/local/share/Ombi.zip"
-iocage exec ombi mv /usr/local/share/Release /usr/local/share/ombi
-iocage exec ombi rm /usr/local/share/Ombi.zip
- 
-if [ -f "/config/Ombi.sqlite" ];
-then
-   echo "Ombi.sqlite exist."
-else
-   echo "Ombi.sqlite does not exist, creating..." >&2
-   iocage exec ombi sqlite3 /config/Ombi.sqlite "create table aTable(field1 int); drop table aTable;"
-   iocage exec ombi mkdir -p /config/Backups
-fi
-
-iocage exec ombi ln -s /config/Ombi.sqlite /usr/local/share/ombi/Ombi.sqlite
-iocage exec ombi ln -s /config/Backups /usr/local/share/ombi/Backups
-iocage exec ombi "pw user add ombi -c ombi -u 819 -d /nonexistent -s /usr/bin/nologin"
-iocage exec ombi chown -R ombi:ombi /usr/local/share/ombi /config
-iocage exec ombi mkdir /usr/local/etc/rc.d
-cp ../includes/ombi-conf/ombi.rc /mnt/tank/iocage/jails/ombi/root/usr/local/etc/rc.d/ombi
-iocage exec ombi chmod u+x /usr/local/etc/rc.d/ombi
-iocage exec ombi sysrc ombi_enable=YES
-iocage exec ombi service ombi start
\ No newline at end of file
diff --git a/install/plex.sh b/install/plex.sh
deleted file mode 100755
index 42eac7de..00000000
--- a/install/plex.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-echo '{"pkgs":["plexmediaserver-plexpass","ca_root_nss","nano"]}' > /tmp/pkg.json
-iocage create -n "plex" -p /tmp/pkg.json -r 11.3-RELEASE interfaces="vnet0:bridge30" ip4_addr="vnet0|192.168.30.26/24" defaultrouter="192.168.30.1" vnet="on" allow_raw_sockets="1" boot="on"
-rm /tmp/pkg.json
-iocage exec plex "mkdir -p /usr/local/etc/pkg/repos"
-cp ../includes/plex-conf/FreeBSD.conf /mnt/tank/iocage/jails/plex/root/usr/local/etc/pkg/repos/FreeBSD.conf
-iocage exec plex mkdir -p /config
-iocage exec plex mkdir -p /mnt/library
-iocage fstab -a plex /mnt/tank/apps/plex /config nullfs rw 0 0
-iocage fstab -a plex /mnt/tank/Library /mnt/library nullfs ro 0 0
-iocage exec plex chown -R plex:plex /config
-iocage exec plex sysrc "plexmediaserver_plexpass_enable=YES"
-iocage exec plex sysrc plexmediaserver_plexpass_support_path="/config"
-iocage exec plex pkg update -y
-iocage exec plex pkg upgrade -y
-iocage exec plex chown -R plex:plex /usr/local/share/plexmediaserver-plexpass/
-iocage exec plex service plexmediaserver_plexpass start
-sleep 10s
-echo "Waiting 20s to stop plex"
-iocage stop plex
-sleep 10s
-echo "Waiting 20s to start plex"
-iocage start plex
-iocage exec plex service plexmediaserver_plexpass start
-echo "Finished installing plex"
\ No newline at end of file
diff --git a/install/radarr.sh b/install/radarr.sh
deleted file mode 100755
index a8301d4e..00000000
--- a/install/radarr.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-echo '{"pkgs":["mono","mediainfo","sqlite3","ca_root_nss","curl","nano"]}' > /tmp/pkg.json
-iocage create -n "radarr" -p /tmp/pkg.json -r 11.3-RELEASE interfaces="vnet0:bridge31" ip4_addr="vnet0|192.168.31.24/24" defaultrouter="192.168.31.1" vnet="on" allow_raw_sockets="1" boot="on"
-rm /tmp/pkg.json
-iocage exec radarr mkdir -p /config
-iocage exec radarr mkdir -p /mnt/movies
-iocage exec radarr mkdir -p /mnt/fetched
-iocage fstab -a radarr /mnt/tank/apps/radarr /config nullfs rw 0 0
-iocage fstab -a radarr /mnt/tank/downloads/complete /mnt/fetched nullfs rw 0 0
-iocage fstab -a radarr /mnt/tank/library/Movies /mnt/movies nullfs rw 0 0
-iocage exec radarr ln -s /usr/local/bin/mono /usr/bin/mono
-iocage exec radarr "fetch https://github.com/Radarr/Radarr/releases/download/v0.2.0.1480/Radarr.develop.0.2.0.1480.linux.tar.gz -o /usr/local/share"
-iocage exec radarr "tar -xzvf /usr/local/share/Radarr.develop.0.2.0.1480.linux.tar.gz -C /usr/local/share"
-iocage exec radarr rm /usr/local/share/Radarr.develop.0.2.0.1480.linux.tar.gz
-iocage exec radarr "pw user add radarr -c radarr -u 352 -d /nonexistent -s /usr/bin/nologin"
-iocage exec radarr chown -R radarr:radarr /usr/local/share/Radarr /config
-iocage exec radarr mkdir /usr/local/etc/rc.d
-cp ../includes/radarr-conf/radarr.rc /mnt/tank/iocage/jails/radarr/root/usr/local/etc/rc.d/radarr
-iocage exec radarr chmod u+x /usr/local/etc/rc.d/radarr
-iocage exec radarr sysrc "radarr_enable=YES"
-iocage exec radarr service radarr start
\ No newline at end of file
diff --git a/install/sonarr.sh b/install/sonarr.sh
deleted file mode 100755
index 3cde9083..00000000
--- a/install/sonarr.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-echo '{"pkgs":["mono","mediainfo","sqlite3","ca_root_nss","curl","nano"]}' > /tmp/pkg.json
-iocage create -n "sonarr" -p /tmp/pkg.json -r 11.3-RELEASE interfaces="vnet0:bridge31" ip4_addr="vnet0|192.168.31.23/24" defaultrouter="192.168.31.1" vnet="on" allow_raw_sockets="1" boot="on"
-rm /tmp/pkg.json
-iocage exec sonarr mkdir -p /config
-iocage exec sonarr mkdir -p /mnt/series
-iocage exec sonarr mkdir -p /mnt/fetched
-iocage fstab -a sonarr /mnt/tank/apps/sonarr /config nullfs rw 0 0
-iocage fstab -a sonarr /mnt/tank/downloads/complete /mnt/fetched nullfs rw 0 0
-iocage fstab -a sonarr /mnt/tank/library/Series /mnt/series nullfs rw 0 0
-iocage exec sonarr ln -s /usr/local/bin/mono /usr/bin/mono
-iocage exec sonarr "fetch http://download.sonarr.tv/v2/master/mono/NzbDrone.master.tar.gz -o /usr/local/share"
-iocage exec sonarr "tar -xzvf /usr/local/share/NzbDrone.master.tar.gz -C /usr/local/share"
-iocage exec sonarr rm /usr/local/share/NzbDrone.master.tar.gz
-iocage exec sonarr "pw user add sonarr -c sonarr -u 351 -d /nonexistent -s /usr/bin/nologin"
-iocage exec sonarr chown -R sonarr:sonarr /usr/local/share/NzbDrone /config
-iocage exec sonarr mkdir /usr/local/etc/rc.d
-cp ../includes/sonarr-conf/sonarr.rc /mnt/tank/iocage/jails/sonarr/root/usr/local/etc/rc.d/sonarr
-iocage exec sonarr chmod u+x /usr/local/etc/rc.d/sonarr
-iocage exec sonarr sysrc "sonarr_enable=YES"
-iocage exec sonarr service sonarr start
\ No newline at end of file
diff --git a/install/transmission.sh b/install/transmission.sh
deleted file mode 100755
index a3dcff74..00000000
--- a/install/transmission.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-echo '{"pkgs":["bash","unzip","unrar","transmission","ca_root_nss","nano"]}' > /tmp/pkg.json
-iocage create -n "transmission" -p /tmp/pkg.json -r 11.3-RELEASE interfaces="vnet0:bridge31" ip4_addr="vnet0|192.168.31.22/24" defaultrouter="192.168.31.1" vnet="on" allow_raw_sockets="1" boot="on"
-rm /tmp/pkg.json
-iocage exec transmission mkdir -p /config
-iocage exec transmission mkdir -p /mnt/downloads
-iocage exec transmission mkdir -p /mnt/downloads/complete
-iocage exec transmission mkdir -p /mnt/downloads/incomplete
-iocage fstab -a transmission /mnt/tank/apps/transmission /config nullfs rw 0 0
-iocage fstab -a transmission /mnt/tank/downloads /mnt/downloads nullfs rw 0 0
-iocage fstab -a transmission /mnt/tank/downloads/complete /mnt/downloads/complete nullfs rw 0 0
-iocage fstab -a transmission /mnt/tank/downloads/incomplete /mnt/downloads/incomplete nullfs rw 0 0
-iocage exec transmission mkdir -p /config
-iocage exec transmission chown -R transmission:transmission /config
-iocage exec transmission sysrc "transmission_enable=YES"
-iocage exec transmission sysrc "transmission_conf_dir=/config"
-iocage exec transmission sysrc "transmission_download_dir=/mnt/downloads/complete"
-iocage exec transmission service transmission start
\ No newline at end of file
diff --git a/jailcreate.sh b/jailcreate.sh
new file mode 100755
index 00000000..735c0187
--- /dev/null
+++ b/jailcreate.sh
@@ -0,0 +1,53 @@
+#!/usr/local/bin/bash
+
+echo "Checking config..."
+jailname="${1}"
+jailpkgs="${1}_pkgs"
+jailinterfaces="${1}_interfaces"
+jailip4="${1}_ip4_addr"
+jailgateway="${1}_gateway"
+jaildhcp="${1}_dhcp"
+setdhcp=${!jaildhcp}
+
+if [ -z "${!jailinterfaces}" ]; then 
+	jailinterfaces="vnet0:bridge0"
+else
+	jailinterfaces=${!jailinterfaces}
+fi
+
+if [ -z "${setdhcp}" ] && [ -z "${!jailip4}" ] && [ -z "${!jailgateway}" ]; then 
+	echo 'no network settings specified in config.yml, defaulting to dhcp="on"'
+	setdhcp="on"
+fi
+
+if [ -z "${!jailname}" ]; then 
+	echo "ERROR, jail not defined in config.yml"
+	exit 1
+else
+	echo "Creating jail for $1"
+	pkgs="$(sed 's/[^[:space:]]\{1,\}/"&"/g;s/ /,/g' <<<"${!jailpkgs} ${global_jails_pkgs}")"
+	echo '{"pkgs":['${pkgs}']}' > /tmp/pkg.json
+	if [ "${setdhcp}" == "on" ]
+	then
+		iocage create -n "${1}" -p /tmp/pkg.json -r ${global_jails_version} interfaces="${jailinterfaces}" dhcp="on" vnet="on" allow_raw_sockets="1" boot="on"
+	else
+		iocage create -n "${1}" -p /tmp/pkg.json -r ${global_jails_version} interfaces="${jailinterfaces}" ip4_addr="vnet0|${!jailip4}" defaultrouter="${!jailgateway}" vnet="on" allow_raw_sockets="1" boot="on"
+	fi
+
+	rm /tmp/pkg.json
+	echo "creating jail config directory"
+	iocage exec $1 mkdir -p /config
+
+	if [ ! -d "/mnt/${global_dataset_config}" ]; then
+		echo "Config root dataset does not exist... Creating... ${global_dataset_config}"
+		zfs create ${global_dataset_config}
+	fi
+	
+	if [ ! -d "/mnt/${global_dataset_config}/$1" ]; then
+		echo "Config dataset does not exist... Creating... ${global_dataset_config}/$1"
+		zfs create ${global_dataset_config}/$1
+	fi
+	
+	iocage fstab -a $1 /mnt/${global_dataset_config}/$1 /config nullfs rw 0 0
+	echo "Jail creation completed for $1"
+fi
diff --git a/jailman.sh b/jailman.sh
new file mode 100755
index 00000000..784a6661
--- /dev/null
+++ b/jailman.sh
@@ -0,0 +1,170 @@
+#!/usr/local/bin/bash
+
+# Important defines:
+export SCRIPT_NAME=$(basename $(test -L "${BASH_SOURCE[0]}" && readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}"));
+export SCRIPT_DIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd);
+echo "Working directory for jailman.sh is: ${SCRIPT_DIR}"
+
+#Includes
+source ${SCRIPT_DIR}/global.sh
+
+# Check for root privileges
+if ! [ $(id -u) = 0 ]; then
+   echo "This script must be run with root privileges"
+   exit 1
+fi
+
+# Auto Update
+BRANCH="master"
+gitupdate ${BRANCH}
+
+# If no option is given, point to the help menu
+if [ $# -eq 0 ]
+then
+        echo "Missing options!"
+        echo "(run $0 -h for help)"
+        echo ""
+        exit 0
+fi
+
+# Go through the options and put the jails requested in an array
+unset -v sub
+while getopts ":i:r:u:d:g:h" opt
+   do
+     case $opt in
+        i ) installjails=("$OPTARG")
+            until [[ $(eval "echo \${$OPTIND}") =~ ^-.* ]] || [ -z $(eval "echo \${$OPTIND}") ]; do
+                installjails+=($(eval "echo \${$OPTIND}"))
+                OPTIND=$((OPTIND + 1))
+            done
+            ;;
+        r ) redojails=("$OPTARG")
+            until [[ $(eval "echo \${$OPTIND}") =~ ^-.* ]] || [ -z $(eval "echo \${$OPTIND}") ]; do
+                redojails+=($(eval "echo \${$OPTIND}"))
+                OPTIND=$((OPTIND + 1))
+            done
+            ;;
+        u ) updatejails=("$OPTARG")
+            until [[ $(eval "echo \${$OPTIND}") =~ ^-.* ]] || [ -z $(eval "echo \${$OPTIND}") ]; do
+                updateljails+=($(eval "echo \${$OPTIND}"))
+                OPTIND=$((OPTIND + 1))
+            done
+            ;;
+        d ) destroyjails=("$OPTARG")
+            until [[ $(eval "echo \${$OPTIND}") =~ ^-.* ]] || [ -z $(eval "echo \${$OPTIND}") ]; do
+                deletejails+=($(eval "echo \${$OPTIND}"))
+                OPTIND=$((OPTIND + 1))
+            done
+            ;;
+		g ) upgradejails=("$OPTARG")
+            until [[ $(eval "echo \${$OPTIND}") =~ ^-.* ]] || [ -z $(eval "echo \${$OPTIND}") ]; do
+                upgradejails+=($(eval "echo \${$OPTIND}"))
+                OPTIND=$((OPTIND + 1))
+            done
+            ;;
+		h ) 
+			echo "Usage:"
+            echo "$0 -i "
+            echo "$0 -r "
+            echo "$0 -u "
+            echo "$0 -d  "
+            echo "$0 -g "
+            echo ""
+            echo "   -i to install jails, listed by name, space seperated like this: jackett plex sonarr"
+            echo "   -r to reinstall jails, listed by name, space seperated like this: jackett plex sonarr"
+			echo "   -u to update jails, listed by name, space seperated like this: jackett plex sonarr"
+            echo "   -d to destroy jails, listed by name, space seperated like this: jackett plex sonarrt"
+            echo "   -g to upgrade jails, listed by name, space seperated like this: jackett plex sonarr"
+            echo "   -h help (this output)"
+			exit 0
+            ;;
+		? ) echo "Error: Invalid option was specified -$OPTARG"
+			exit 0
+			;;
+     esac
+done
+
+# Parse the Config YAML
+eval $(parse_yaml config.yml)
+
+# Check and Execute requested jail destructions
+if [ ${#destroyjails[@]} -eq 0 ]; then 
+	echo "No jails to destroy"
+else
+	echo "jails to destroy ${destroyjails[@]}"
+	for jail in "${destroyjails[@]}"
+	do
+		echo "destroying $jail"
+		iocage destroy -f $jail
+	done
+
+fi
+
+# Check and Execute requested jail Installs
+if [ ${#installjails[@]} -eq 0 ]; then 
+	echo "No jails to install"
+else
+	echo "jails to install ${installjails[@]}"
+	for jail in "${installjails[@]}"
+	do
+		if [ -f "${SCRIPT_DIR}/jails/$jail/install.sh" ]
+		then
+			echo "Installing $jail"
+			${SCRIPT_DIR}/jailcreate.sh $jail && ${SCRIPT_DIR}/jails/$jail/install.sh
+		else
+			echo "Missing install script for $jail in ${SCRIPT_DIR}/jails/$jail/install.sh"
+		fi
+	done
+fi
+
+# Check and Execute requested jail Reinstalls
+if [ ${#redojails[@]} -eq 0 ]; then 
+	echo "No jails to ReInstall"
+else
+	echo "jails to reinstall ${redojails[@]}"
+	for jail in "${redojails[@]}"
+	do
+		if [ -f "${SCRIPT_DIR}/jails/$jail/install.sh" ]
+		then
+			echo "Reinstalling $jail"
+			iocage destroy -f $jail && ${SCRIPT_DIR}/jailcreate.sh $jail && ${SCRIPT_DIR}/jails/$jail/install.sh
+		else
+			echo "Missing install script for $jail in ${SCRIPT_DIR}/jails/$jail/update.sh"
+		fi
+	done
+fi
+
+
+# Check and Execute requested jail Updates
+if [ ${#updatejails[@]} -eq 0 ]; then 
+	echo "No jails to Update"
+else
+	echo "jails to update ${updatejails[@]}"
+	for jail in "${updatejails[@]}"
+	do
+		if [ -f "${SCRIPT_DIR}/jails/$jail/update.sh" ]
+		then
+			echo "Updating $jail"
+			iocage update $jail && iocage exec $jail "pkg update && pkg upgrade -y" && ${SCRIPT_DIR}/jails/$jail/update.sh
+			iocage restart $jail
+		else
+			echo "Missing update script for $jail in ${SCRIPT_DIR}/jails/$jail/update.sh"
+		fi
+	done
+fi
+
+# Check and Execute requested jail Upgrades
+if [ ${#upgradejails[@]} -eq 0 ]; then 
+	echo "No jails to Upgrade"
+else
+	echo "jails to update ${upgradejails[@]}"
+	for jail in "${upgradejails[@]}"
+	do
+		if [ -f "${SCRIPT_DIR}/jails/$jail/update.sh" ]
+		then
+			echo "Currently Upgrading is not yet included in this script."
+		else
+			echo "Missing update script for $jail in ${SCRIPT_DIR}/jails/$jail/update.sh"
+		fi
+	done
+fi
diff --git a/includes/jackett-conf/jackett.rc b/jails/jackett/includes/jackett.rc
similarity index 100%
rename from includes/jackett-conf/jackett.rc
rename to jails/jackett/includes/jackett.rc
diff --git a/install/jackett.sh b/jails/jackett/install.sh
similarity index 56%
rename from install/jackett.sh
rename to jails/jackett/install.sh
index cc550003..3af8a978 100755
--- a/install/jackett.sh
+++ b/jails/jackett/install.sh
@@ -1,8 +1,6 @@
-echo '{"pkgs":["mono","curl","ca_root_nss","nano"]}' > /tmp/pkg.json
-iocage create -n "jackett" -p /tmp/pkg.json -r 11.3-RELEASE interfaces="vnet0:bridge31" ip4_addr="vnet0|192.168.31.30/24" defaultrouter="192.168.21.1" vnet="on" allow_raw_sockets="1" boot="on"
-rm /tmp/pkg.json
-iocage exec jackett mkdir -p /config
-iocage fstab -a jackett /mnt/tank/apps/jackett /config nullfs rw 0 0
+#!/usr/local/bin/bash
+# This file contains the install script for jackett
+
 iocage exec jackett ln -s /usr/local/bin/mono /usr/bin/mono
 iocage exec jackett "fetch https://github.com/Jackett/Jackett/releases/download/v0.11.502/Jackett.Binaries.Mono.tar.gz -o /usr/local/share"
 iocage exec jackett "tar -xzvf /usr/local/share/Jackett.Binaries.Mono.tar.gz -C /usr/local/share"
@@ -10,7 +8,7 @@ iocage exec jackett rm /usr/local/share/Jackett.Binaries.Mono.tar.gz
 iocage exec jackett "pw user add jackett -c jackett -u 818 -d /nonexistent -s /usr/bin/nologin"
 iocage exec jackett chown -R jackett:jackett /usr/local/share/Jackett /config
 iocage exec jackett mkdir /usr/local/etc/rc.d
-cp ../includes/jackett-conf/jackett.rc /mnt/tank/iocage/jails/jackett/root/usr/local/etc/rc.d/jackett
+cp ${SCRIPT_DIR}/jails/jackett/includes/jackett.rc /mnt/${global_dataset_iocage}/jails/jackett/root/usr/local/etc/rc.d/jackett
 iocage exec jackett chmod u+x /usr/local/etc/rc.d/jackett
 iocage exec jackett sysrc "jackett_enable=YES"
-iocage exec jackett service jackett restart
\ No newline at end of file
+iocage exec jackett service jackett restart
diff --git a/jails/jackett/readme.md b/jails/jackett/readme.md
new file mode 100644
index 00000000..2b0dce8e
--- /dev/null
+++ b/jails/jackett/readme.md
@@ -0,0 +1,6 @@
+## jackett 
+
+Jackett is tool designed to combine and search multiple bittorrent trackers like a proxy.
+
+### Post-install
+Currently there are not relevant post-install steps, other than your own personal preferences for setting up Jacket.
diff --git a/jails/jackett/update.sh b/jails/jackett/update.sh
new file mode 100755
index 00000000..df7d983e
--- /dev/null
+++ b/jails/jackett/update.sh
@@ -0,0 +1,9 @@
+#!/usr/local/bin/bash
+# This file contains the update script for jackett
+
+iocage exec jackett service jackett stop
+#TODO insert code to update jacket itself here
+iocage exec jackett chown -R jackett:jackett /usr/local/share/Jackett /config
+cp ${SCRIPT_DIR}/jails/test10/includes/jackett.rc /mnt/${global_dataset_iocage}/jails/test10/root/usr/local/etc/rc.d/jackett
+iocage exec jackett chmod u+x /usr/local/etc/rc.d/jackett
+iocage exec jackett service jackett restart
diff --git a/includes/py-kms-conf/Activate_Office_2019_Pro.bat b/jails/kms/includes/Activate_Office_2019_Pro.bat
similarity index 100%
rename from includes/py-kms-conf/Activate_Office_2019_Pro.bat
rename to jails/kms/includes/Activate_Office_2019_Pro.bat
diff --git a/includes/py-kms-conf/Activate_Windows_10_Pro.bat b/jails/kms/includes/Activate_Windows_10_Pro.bat
similarity index 100%
rename from includes/py-kms-conf/Activate_Windows_10_Pro.bat
rename to jails/kms/includes/Activate_Windows_10_Pro.bat
diff --git a/includes/py-kms-conf/Activate_Windows_Server_2019_Standard.bat b/jails/kms/includes/Activate_Windows_Server_2019_Standard.bat
similarity index 100%
rename from includes/py-kms-conf/Activate_Windows_Server_2019_Standard.bat
rename to jails/kms/includes/Activate_Windows_Server_2019_Standard.bat
diff --git a/includes/py-kms-conf/Office-2019-Pro-VLK-Config.xml b/jails/kms/includes/Office-2019-Pro-VLK-Config.xml
similarity index 100%
rename from includes/py-kms-conf/Office-2019-Pro-VLK-Config.xml
rename to jails/kms/includes/Office-2019-Pro-VLK-Config.xml
diff --git a/includes/py-kms-conf/Readme.md b/jails/kms/includes/Readme.md
similarity index 100%
rename from includes/py-kms-conf/Readme.md
rename to jails/kms/includes/Readme.md
diff --git a/includes/py-kms-conf/Setup_Office_2019_Pro.txt b/jails/kms/includes/Setup_Office_2019_Pro.txt
similarity index 100%
rename from includes/py-kms-conf/Setup_Office_2019_Pro.txt
rename to jails/kms/includes/Setup_Office_2019_Pro.txt
diff --git a/includes/py-kms-conf/py_kms.rc b/jails/kms/includes/py_kms.rc
similarity index 100%
rename from includes/py-kms-conf/py_kms.rc
rename to jails/kms/includes/py_kms.rc
diff --git a/jails/kms/install.sh b/jails/kms/install.sh
new file mode 100755
index 00000000..6e8148c0
--- /dev/null
+++ b/jails/kms/install.sh
@@ -0,0 +1,12 @@
+#!/usr/local/bin/bash
+# This file contains the install script for KMS
+
+
+iocage exec kms svn checkout https://github.com/SystemRage/py-kms/trunk/py-kms /usr/local/share/py-kms
+iocage exec kms "pw user add kms -c kms -u 666 -d /nonexistent -s /usr/bin/nologin"
+iocage exec kms chown -R kms:kms /usr/local/share/py-kms /config
+iocage exec kms mkdir /usr/local/etc/rc.d
+cp ${SCRIPT_DIR}/jails/kms/includes/py_kms.rc /mnt/${global_dataset_iocage}/jails/kms/root/usr/local/etc/rc.d/py_kms
+iocage exec kms chmod u+x /usr/local/etc/rc.d/py_kms
+iocage exec kms sysrc "py_kms_enable=YES"
+iocage exec kms service py_kms start
\ No newline at end of file
diff --git a/jails/kms/update.sh b/jails/kms/update.sh
new file mode 100755
index 00000000..0f556a5e
--- /dev/null
+++ b/jails/kms/update.sh
@@ -0,0 +1,9 @@
+#!/usr/local/bin/bash
+# This file contains the update script for KMS
+
+iocage exec kms service py_kms stop
+iocage exec kms svn checkout https://github.com/SystemRage/py-kms/trunk/py-kms /usr/local/share/py-kms
+iocage exec kms chown -R kms:kms /usr/local/share/py-kms /config
+cp ${SCRIPT_DIR}/jails/kms/includes/py_kms.rc /mnt/${global_dataset_iocage}/jails/kms/root/usr/local/etc/rc.d/py_kms
+iocage exec kms chmod u+x /usr/local/etc/rc.d/py_kms
+iocage exec kms service py_kms start
\ No newline at end of file
diff --git a/includes/lidarr-conf/lidarr.rc b/jails/lidarr/includes/lidarr.rc
similarity index 100%
rename from includes/lidarr-conf/lidarr.rc
rename to jails/lidarr/includes/lidarr.rc
diff --git a/jails/lidarr/install.sh b/jails/lidarr/install.sh
new file mode 100755
index 00000000..7e105b43
--- /dev/null
+++ b/jails/lidarr/install.sh
@@ -0,0 +1,44 @@
+#!/usr/local/bin/bash
+# This file contains the install script for lidarr
+
+iocage exec lidarr mkdir -p /mnt/music
+iocage exec lidarr mkdir -p /mnt/fetched
+
+# Check if dataset for completed download and it parent dataset exist, create if they do not.
+if [ ! -d "/mnt/${global_dataset_downloads}" ]; then
+	echo "Downloads dataset does not exist... Creating... ${global_dataset_downloads}"
+	zfs create ${global_dataset_downloads}
+fi
+
+if [ ! -d "/mnt/${global_dataset_downloads}/complete" ]; then
+	echo "Completed Downloads dataset does not exist... Creating... ${global_dataset_downloads}/complete"
+	zfs create ${global_dataset_downloads}/complete
+fi
+
+iocage fstab -a lidarr /mnt/${global_dataset_downloads}/complete /mnt/fetched nullfs rw 0 0
+
+# Check if dataset for media library and the dataset for music exist, create if they do not.
+if [ ! -d "/mnt/${global_dataset_media}" ]; then
+	echo "Media dataset does not exist... Creating... ${global_dataset_media}"
+	zfs create ${global_dataset_media}
+fi
+
+if [ ! -d "/mnt/${global_dataset_media}/music" ]; then
+	echo "Music dataset does not exist... Creating... ${global_dataset_media}/music"
+	zfs create ${global_dataset_media}/music
+fi
+
+iocage fstab -a lidarr /mnt/${global_dataset_media}/music /mnt/music nullfs rw 0 0
+
+
+iocage exec lidarr ln -s /usr/local/bin/mono /usr/bin/mono
+iocage exec lidarr "fetch https://github.com/lidarr/Lidarr/releases/download/v0.2.0.371/Lidarr.develop.0.2.0.371.linux.tar.gz -o /usr/local/share"
+iocage exec lidarr "tar -xzvf /usr/local/share/Lidarr.develop.0.2.0.371.linux.tar.gz -C /usr/local/share"
+iocage exec lidarr "rm /usr/local/share/Lidarr.develop.0.2.0.371.linux.tar.gz"
+iocage exec lidarr "pw user add lidarr -c lidarr -u 353 -d /nonexistent -s /usr/bin/nologin"
+iocage exec lidarr chown -R lidarr:lidarr /usr/local/share/Lidarr /config
+iocage exec lidarr mkdir /usr/local/etc/rc.d
+cp ${SCRIPT_DIR}/jails/lidarr/includes/lidarr.rc /mnt/${global_dataset_iocage}/jails/lidarr/root/usr/local/etc/rc.d/lidarr
+iocage exec lidarr chmod u+x /usr/local/etc/rc.d/lidarr
+iocage exec lidarr sysrc "lidarr_enable=YES"
+iocage exec lidarr service lidarr start
\ No newline at end of file
diff --git a/jails/lidarr/update.sh b/jails/lidarr/update.sh
new file mode 100755
index 00000000..f85fefbe
--- /dev/null
+++ b/jails/lidarr/update.sh
@@ -0,0 +1,9 @@
+#!/usr/local/bin/bash
+# This file contains the update script for lidarr
+
+iocage exec lidarr service lidarr stop
+#TODO insert code to update lidarr itself here
+iocage exec lidarr chown -R lidarr:lidarr /usr/local/share/lidarr /config
+cp ${SCRIPT_DIR}/jails/lidarr/includes/lidarr.rc /mnt/${global_dataset_iocage}/jails/lidarr/root/usr/local/etc/rc.d/lidarr
+iocage exec lidarr chmod u+x /usr/local/etc/rc.d/lidarr
+iocage exec lidarr service lidarr restart
\ No newline at end of file
diff --git a/includes/organizr-conf/custom/organizr.conf b/jails/organizr/includes/custom/organizr.conf
similarity index 100%
rename from includes/organizr-conf/custom/organizr.conf
rename to jails/organizr/includes/custom/organizr.conf
diff --git a/includes/organizr-conf/custom/phpblock.conf b/jails/organizr/includes/custom/phpblock.conf
similarity index 100%
rename from includes/organizr-conf/custom/phpblock.conf
rename to jails/organizr/includes/custom/phpblock.conf
diff --git a/jails/organizr/includes/nginx.conf b/jails/organizr/includes/nginx.conf
new file mode 100644
index 00000000..04ab189b
--- /dev/null
+++ b/jails/organizr/includes/nginx.conf
@@ -0,0 +1,25 @@
+user www;
+worker_processes 1;
+
+events {
+	worker_connections 1024;
+}
+
+http {
+	include mime.types;
+	default_type application/octet-stream;
+	sendfile on;
+	keepalive_timeout 65;
+	server {
+	listen 80;
+	server_name localhost;
+	include custom/organizr.conf;
+	}
+	server {
+		listen 443 ssl;
+		server_name localhost;
+		include custom/organizr.conf;
+		ssl_certificate /config/cert/Organizr-Cert.crt; # Replace with actually valid certificate
+		ssl_certificate_key /config/cert/Organizr-Cert.key; # Replace with actually valid certificate
+	}
+}
\ No newline at end of file
diff --git a/install/organizr.sh b/jails/organizr/install.sh
similarity index 50%
rename from install/organizr.sh
rename to jails/organizr/install.sh
index eb0cd1e9..b5904ee5 100755
--- a/install/organizr.sh
+++ b/jails/organizr/install.sh
@@ -1,8 +1,6 @@
-echo '{"pkgs":["nginx","php72","php72-filter","php72-curl","php72-hash","php72-json","php72-openssl","php72-pdo","php72-pdo_sqlite","php72-session","php72-simplexml","php72-sqlite3","php72-zip","git","ca_root_nss"]}' > /tmp/pkg.json
-iocage create -n "organizr" -p /tmp/pkg.json -r 11.3-RELEASE interfaces="vnet0:bridge30" ip4_addr="vnet0|192.168.30.25/24" defaultrouter="192.168.30.1" vnet="on" allow_raw_sockets="1" boot="on"
-rm /tmp/pkg.json
-iocage exec organizr mkdir -p /config
-iocage fstab -a organizr /mnt/tank/apps/organizr /config nullfs rw 0 0
+#!/usr/local/bin/bash
+# This file contains the install script for Organizr
+
 iocage exec organizr sed -i '' -e 's?listen = 127.0.0.1:9000?listen = /var/run/php-fpm.sock?g' /usr/local/etc/php-fpm.d/www.conf
 iocage exec organizr sed -i '' -e 's/;listen.owner = www/listen.owner = www/g' /usr/local/etc/php-fpm.d/www.conf
 iocage exec organizr sed -i '' -e 's/;listen.group = www/listen.group = www/g' /usr/local/etc/php-fpm.d/www.conf
@@ -10,13 +8,27 @@ iocage exec organizr sed -i '' -e 's/;listen.mode = 0660/listen.mode = 0600/g' /
 iocage exec organizr cp /usr/local/etc/php.ini-production /usr/local/etc/php.ini
 iocage exec organizr sed -i '' -e 's?;date.timezone =?date.timezone = "Universal"?g' /usr/local/etc/php.ini
 iocage exec organizr sed -i '' -e 's?;cgi.fix_pathinfo=1?cgi.fix_pathinfo=0?g' /usr/local/etc/php.ini
-mv /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/nginx.conf /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/nginx.conf.bak
-cp ../includes/organizr-conf/nginx.conf /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/nginx.conf
-cp ../includes/organizr-conf/custom /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/custom
+mv /mnt/${global_dataset_iocage}/jails/organizr/root/usr/local/etc/nginx/nginx.conf /mnt/${global_dataset_iocage}/jails/organizr/root/usr/local/etc/nginx/nginx.conf.bak
+cp ${SCRIPT_DIR}/jails/organizr/includes/nginx.conf /mnt/${global_dataset_iocage}/jails/organizr/root/usr/local/etc/nginx/nginx.conf
+cp -Rf ${SCRIPT_DIR}/jails/organizr/includes/custom /mnt/${global_dataset_iocage}/jails/organizr/root/usr/local/etc/nginx/custom
+
+if [ ! -d "/mnt/${global_dataset_config}/organizr/cert" ]; then
+	echo "cert folder not existing... creating..."
+	iocage exec organizr mkdir /config/cert
+fi
+
+if [ -f "/mnt/${global_dataset_config}/organizr/cert/Organizr-Cert.crt" ]; then
+    echo "certificate exist... Skipping cert generation"
+else
+	"No ssl certificate present, generating self signed certificate"
+	openssl req -new -newkey rsa:2048 -days 365 -nodes -x509 -subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=localhost" -keyout /mnt/${global_dataset_config}/organizr/cert/Organizr-Cert.key -out /mnt/${global_dataset_config}/organizr/cert/Organizr-Cert.crt
+fi
+
+
 iocage exec organizr git clone https://github.com/causefx/Organizr.git /usr/local/www/Organizr
 iocage exec organizr chown -R www:www /usr/local/www /config /usr/local/etc/nginx/nginx.conf /usr/local/etc/nginx/custom
 iocage exec organizr ln -s /config/config.php /usr/local/www/Organizr/api/config/config.php
 iocage exec organizr sysrc nginx_enable=YES
 iocage exec organizr sysrc php_fpm_enable=YES
 iocage exec organizr service nginx start
-iocage exec organizr service php-fpm start
\ No newline at end of file
+iocage exec organizr service php-fpm start
diff --git a/update/organizr.sh b/jails/organizr/update.sh
similarity index 54%
rename from update/organizr.sh
rename to jails/organizr/update.sh
index 3e053cee..173c47e9 100755
--- a/update/organizr.sh
+++ b/jails/organizr/update.sh
@@ -1,9 +1,11 @@
+#!/usr/local/bin/bash
+# This file contains the update script for Organizr
+
+
 iocage exec organizr service nginx stop
 iocage exec organizr service php-fpm stop
-iocage update organizr
-iocage exec organizr "pkg update && pkg upgrade -y"
-cp ../includes/organizr-conf/nginx.conf /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/nginx.conf
-cp ../includes/organizr-conf/custom/*.* /mnt/tank/iocage/jails/organizr/root/usr/local/etc/nginx/custom/
+# TODO setup cli update for Organizr here.
+cp ${SCRIPT_DIR}/jails/organizr/includes/nginx.conf /mnt/${global_dataset_iocage}/jails/organizr/root/usr/local/etc/nginx/nginx.conf
 iocage exec organizr "cd /usr/local/www/Organizr && git pull"
 iocage exec organizr chown -R www:www /usr/local/www /config /usr/local/etc/nginx/nginx.conf /usr/local/etc/nginx/custom
 iocage exec organizr service nginx start
diff --git a/includes/plex-conf/FreeBSD.conf b/jails/plex/includes/FreeBSD.conf
similarity index 100%
rename from includes/plex-conf/FreeBSD.conf
rename to jails/plex/includes/FreeBSD.conf
diff --git a/jails/plex/install.sh b/jails/plex/install.sh
new file mode 100755
index 00000000..4b6d6ef0
--- /dev/null
+++ b/jails/plex/install.sh
@@ -0,0 +1,65 @@
+#!/usr/local/bin/bash
+# This file contains the install script for plex
+
+iocage exec plex mkdir -p /usr/local/etc/pkg/repos
+iocage exec plex mkdir -p /mnt/media
+iocage exec plex mkdir -p /mnt/media/movies
+iocage exec plex mkdir -p /mnt/media/music
+iocage exec plex mkdir -p /mnt/media/shows
+
+# Change to to more frequent FreeBSD repo to stay up-to-date with plex more.
+cp ${SCRIPT_DIR}/jails/plex/includes/FreeBSD.conf /mnt/${global_dataset_iocage}/jails/plex/root/usr/local/etc/pkg/repos/FreeBSD.conf
+
+
+# Check if datasets for media librarys exist, create them if they do not.
+if [ ! -d "/mnt/${global_dataset_media}" ]; then
+	echo "Media dataset does not exist... Creating... ${global_dataset_media}"
+	zfs create ${global_dataset_media}
+fi
+
+iocage fstab -a plex /mnt/${global_dataset_media} /mnt/media nullfs rw 0 0
+
+if [ ! -d "/mnt/${global_dataset_media}/shows" ]; then
+	echo "TV Shows dataset does not exist... Creating... ${global_dataset_media}/shows"
+	zfs create ${global_dataset_media}/shows
+fi
+
+iocage fstab -a plex /mnt/${global_dataset_media}/shows /mnt/media/shows nullfs rw 0 0
+
+if [ ! -d "/mnt/${global_dataset_media}/music" ]; then
+	echo "music dataset does not exist... Creating... ${global_dataset_media}/music"
+	zfs create ${global_dataset_media}/music
+fi
+
+iocage fstab -a plex /mnt/${global_dataset_media}/music /mnt/media/music nullfs rw 0 0
+
+if [ ! -d "/mnt/${global_dataset_media}/movies" ]; then
+	echo "movies dataset does not exist... Creating... ${global_dataset_media}/movies"
+	zfs create ${global_dataset_media}/movies
+fi
+
+iocage fstab -a plex /mnt/${global_dataset_media}/movies /mnt/media/movies nullfs rw 0 0
+
+
+iocage exec plex chown -R plex:plex /config
+
+# Force update pkg to get latest plex version
+iocage exec plex pkg update
+iocage exec plex pkg upgrade -y
+
+# Run different install procedures depending on Plex vs Plexpass
+if [ "$plex_plexpass" == "true" ]; then
+	echo "plexpass enabled in config.yml... using plexpass for install"
+	iocage exec plex sysrc "plexmediaserver_plexpass_enable=YES"
+	iocage exec plex sysrc plexmediaserver_plexpass_support_path="/config"
+	iocage exec plex chown -R plex:plex /usr/local/share/plexmediaserver-plexpass/
+	iocage exec plex service plexmediaserver_plexpass restart
+else
+	echo "plexpass disabled in config.yml... NOT using plexpass for install"
+	iocage exec plex sysrc "plexmediaserver_enable=YES"
+	iocage exec plex sysrc plexmediaserver_support_path="/config"
+	iocage exec plex chown -R plex:plex /usr/local/share/plexmediaserver/
+	iocage exec plex service plexmediaserver restart
+fi
+
+echo "Finished installing plex"
\ No newline at end of file
diff --git a/jails/plex/update.sh b/jails/plex/update.sh
new file mode 100755
index 00000000..4f1d62c5
--- /dev/null
+++ b/jails/plex/update.sh
@@ -0,0 +1,22 @@
+#!/usr/local/bin/bash
+# This file contains the update script for Plex
+
+# Run different update procedures depending on Plex vs Plexpass
+if [ "$plex_plexpass" == "true" ]; then
+	echo "plexpass enabled in config.yml... using plexpass for update..."
+	iocage exec plex service plexmediaserver_plexpass stop
+	# Plex is updated using PKG already, this is mostly a placeholder
+	iocage exec plex chown -R plex:plex /usr/local/share/plexmediaserver-plexpass/
+	iocage exec plex service plexmediaserver_plexpass restart
+else
+	echo "plexpass disabled in config.yml... NOT using plexpass for update..."
+	iocage exec plex service plexmediaserver stop
+	# Plex is updated using PKG already, this is mostly a placeholder
+	iocage exec plex chown -R plex:plex /usr/local/share/plexmediaserver/
+	iocage exec plex service plexmediaserver restart
+fi
+
+
+
+
+
diff --git a/includes/radarr-conf/radarr.rc b/jails/radarr/includes/radarr.rc
similarity index 100%
rename from includes/radarr-conf/radarr.rc
rename to jails/radarr/includes/radarr.rc
diff --git a/jails/radarr/install.sh b/jails/radarr/install.sh
new file mode 100755
index 00000000..95982878
--- /dev/null
+++ b/jails/radarr/install.sh
@@ -0,0 +1,43 @@
+#!/usr/local/bin/bash
+# This file contains the install script for radarr
+
+iocage exec radarr mkdir -p /mnt/movies
+iocage exec radarr mkdir -p /mnt/fetched
+
+# Check if dataset for completed download and it parent dataset exist, create if they do not.
+if [ ! -d "/mnt/${global_dataset_downloads}" ]; then
+	echo "Downloads dataset does not exist... Creating... ${global_dataset_downloads}"
+	zfs create ${global_dataset_downloads}
+fi
+
+if [ ! -d "/mnt/${global_dataset_downloads}/complete" ]; then
+	echo "Completed Downloads dataset does not exist... Creating... ${global_dataset_downloads}/complete"
+	zfs create ${global_dataset_downloads}/complete
+fi
+
+iocage fstab -a radarr /mnt/${global_dataset_downloads}/complete /mnt/fetched nullfs rw 0 0
+
+# Check if dataset for media library and the dataset for movies exist, create if they do not.
+if [ ! -d "/mnt/${global_dataset_media}" ]; then
+	echo "Media dataset does not exist... Creating... ${global_dataset_media}"
+	zfs create ${global_dataset_media}
+fi
+
+if [ ! -d "/mnt/${global_dataset_media}/movies" ]; then
+	echo "Movies dataset does not exist... Creating... ${global_dataset_media}/movies"
+	zfs create ${global_dataset_media}/movies
+fi
+
+iocage fstab -a radarr /mnt/${global_dataset_media}/movies /mnt/movies nullfs rw 0 0
+
+iocage exec radarr ln -s /usr/local/bin/mono /usr/bin/mono
+iocage exec radarr "fetch https://github.com/Radarr/Radarr/releases/download/v0.2.0.1480/Radarr.develop.0.2.0.1480.linux.tar.gz -o /usr/local/share"
+iocage exec radarr "tar -xzvf /usr/local/share/Radarr.develop.0.2.0.1480.linux.tar.gz -C /usr/local/share"
+iocage exec radarr rm /usr/local/share/Radarr.develop.0.2.0.1480.linux.tar.gz
+iocage exec radarr "pw user add radarr -c radarr -u 352 -d /nonexistent -s /usr/bin/nologin"
+iocage exec radarr chown -R radarr:radarr /usr/local/share/Radarr /config
+iocage exec radarr mkdir /usr/local/etc/rc.d
+cp ${SCRIPT_DIR}/jails/radarr/includes/radarr.rc /mnt/${global_dataset_iocage}/jails/radarr/root/usr/local/etc/rc.d/radarr
+iocage exec radarr chmod u+x /usr/local/etc/rc.d/radarr
+iocage exec radarr sysrc "radarr_enable=YES"
+iocage exec radarr service radarr restart
\ No newline at end of file
diff --git a/jails/radarr/update.sh b/jails/radarr/update.sh
new file mode 100755
index 00000000..9b3afca0
--- /dev/null
+++ b/jails/radarr/update.sh
@@ -0,0 +1,9 @@
+#!/usr/local/bin/bash
+# This file contains the update script for radarr
+
+iocage exec radarr service radarr stop
+#TODO insert code to update radarr itself here
+iocage exec radarr chown -R radarr:radarr /usr/local/share/Radarr /config
+cp ${SCRIPT_DIR}/jails/radarr/includes/radarr.rc /mnt/${global_dataset_iocage}/jails/radarr/root/usr/local/etc/rc.d/radarr
+iocage exec radarr chmod u+x /usr/local/etc/rc.d/radarr
+iocage exec radarr service radarr restart
\ No newline at end of file
diff --git a/includes/sonarr-conf/sonarr.rc b/jails/sonarr/includes/sonarr.rc
similarity index 100%
rename from includes/sonarr-conf/sonarr.rc
rename to jails/sonarr/includes/sonarr.rc
diff --git a/jails/sonarr/install.sh b/jails/sonarr/install.sh
new file mode 100755
index 00000000..4da5ea9f
--- /dev/null
+++ b/jails/sonarr/install.sh
@@ -0,0 +1,44 @@
+#!/usr/local/bin/bash
+# This file contains the install script for sonarr
+
+iocage exec sonarr mkdir -p /mnt/shows
+iocage exec sonarr mkdir -p /mnt/fetched
+
+# Check if dataset for completed download and it parent dataset exist, create if they do not.
+if [ ! -d "/mnt/${global_dataset_downloads}" ]; then
+	echo "Downloads dataset does not exist... Creating... ${global_dataset_downloads}"
+	zfs create ${global_dataset_downloads}
+fi
+
+if [ ! -d "/mnt/${global_dataset_downloads}/complete" ]; then
+	echo "Completed Downloads dataset does not exist... Creating... ${global_dataset_downloads}/complete"
+	zfs create ${global_dataset_downloads}/complete
+fi
+
+iocage fstab -a sonarr /mnt/${global_dataset_downloads}/complete /mnt/fetched nullfs rw 0 0
+
+# Check if dataset for media library and the dataset for tv shows exist, create if they do not.
+if [ ! -d "/mnt/${global_dataset_media}" ]; then
+	echo "Media dataset does not exist... Creating... ${global_dataset_media}"
+	zfs create ${global_dataset_media}
+fi
+
+if [ ! -d "/mnt/${global_dataset_media}/shows" ]; then
+	echo "TV Shows dataset does not exist... Creating... ${global_dataset_media}/shows"
+	zfs create ${global_dataset_media}/shows
+fi
+
+iocage fstab -a sonarr /mnt/${global_dataset_media}/shows /mnt/shows nullfs rw 0 0
+
+
+iocage exec sonarr ln -s /usr/local/bin/mono /usr/bin/mono
+iocage exec sonarr "fetch http://download.sonarr.tv/v2/master/mono/NzbDrone.master.tar.gz -o /usr/local/share"
+iocage exec sonarr "tar -xzvf /usr/local/share/NzbDrone.master.tar.gz -C /usr/local/share"
+iocage exec sonarr rm /usr/local/share/NzbDrone.master.tar.gz
+iocage exec sonarr "pw user add sonarr -c sonarr -u 351 -d /nonexistent -s /usr/bin/nologin"
+iocage exec sonarr chown -R sonarr:sonarr /usr/local/share/NzbDrone /config
+iocage exec sonarr mkdir /usr/local/etc/rc.d
+cp ${SCRIPT_DIR}/jails/sonarr/includes/sonarr.rc /mnt/${global_dataset_iocage}/jails/sonarr/root/usr/local/etc/rc.d/sonarr
+iocage exec sonarr chmod u+x /usr/local/etc/rc.d/sonarr
+iocage exec sonarr sysrc "sonarr_enable=YES"
+iocage exec sonarr service sonarr restart
\ No newline at end of file
diff --git a/jails/sonarr/update.sh b/jails/sonarr/update.sh
new file mode 100755
index 00000000..7774c866
--- /dev/null
+++ b/jails/sonarr/update.sh
@@ -0,0 +1,9 @@
+#!/usr/local/bin/bash
+# This file contains the update script for sonarr
+
+iocage exec sonarr service sonarr stop
+#TODO insert code to update sonarr itself here
+iocage exec sonarr chown -R sonarr:sonarr /usr/local/share/NzbDrone /config
+cp ${SCRIPT_DIR}/jails/sonarr/includes/sonarr.rc /mnt/${global_dataset_iocage}/jails/sonarr/root/usr/local/etc/rc.d/sonarr
+iocage exec sonarr chmod u+x /usr/local/etc/rc.d/sonarr
+iocage exec sonarr service sonarr restart
\ No newline at end of file
diff --git a/install/tautulli.sh b/jails/tautulli/install.sh
similarity index 58%
rename from install/tautulli.sh
rename to jails/tautulli/install.sh
index ebf1f459..eee596bb 100755
--- a/install/tautulli.sh
+++ b/jails/tautulli/install.sh
@@ -1,8 +1,7 @@
-echo '{"pkgs":["python2","py27-sqlite3","py27-openssl","ca_root_nss","git","nano"]}' > /tmp/pkg.json
-iocage create -n "tautulli" -p /tmp/pkg.json -r 11.3-RELEASE interfaces="vnet0:bridge31" ip4_addr="vnet0|192.168.31.26/24" defaultrouter="192.168.31.1" vnet="on" allow_raw_sockets="1" boot="on"
-rm /tmp/pkg.json
-iocage exec tautulli mkdir -p /config
-iocage fstab -a tautulli /mnt/tank/apps/tautulli /config nullfs rw 0 0
+#!/usr/local/bin/bash
+# This file contains the install script for Tautulli
+
+
 iocage exec tautulli git clone https://github.com/Tautulli/Tautulli.git /usr/local/share/Tautulli
 iocage exec tautulli "pw user add tautulli -c tautulli -u 109 -d /nonexistent -s /usr/bin/nologin"
 iocage exec tautulli chown -R tautulli:tautulli /usr/local/share/Tautulli /config
diff --git a/update/tautulli.sh b/jails/tautulli/update.sh
similarity index 69%
rename from update/tautulli.sh
rename to jails/tautulli/update.sh
index 7a2576b8..52c00a18 100755
--- a/update/tautulli.sh
+++ b/jails/tautulli/update.sh
@@ -1,6 +1,8 @@
+#!/usr/local/bin/bash
+# This file contains the update script for Tautulli
+
 iocage exec tautulli service tautulli stop
-iocage update tautulli
-iocage exec tautulli "pkg update && pkg upgrade -y"
+# Tautulli is updated through pkg, this is mostly just a placeholder
 iocage exec tautulli chown -R tautulli:tautulli /usr/local/share/Tautulli /config
 iocage exec tautulli cp /usr/local/share/Tautulli/init-scripts/init.freenas /usr/local/etc/rc.d/tautulli
 iocage exec tautulli chmod u+x /usr/local/etc/rc.d/tautulli
diff --git a/jails/transmission/install.sh b/jails/transmission/install.sh
new file mode 100755
index 00000000..25af1d31
--- /dev/null
+++ b/jails/transmission/install.sh
@@ -0,0 +1,38 @@
+#!/usr/local/bin/bash
+# This file contains the install script for transmission
+
+iocage exec transmission mkdir -p /mnt/downloads
+iocage exec transmission mkdir -p /mnt/downloads/complete
+iocage exec transmission mkdir -p /mnt/downloads/incomplete
+
+# Check if dataset Downloads dataset exist, create if they do not.
+if [ ! -d "/mnt/${global_dataset_downloads}" ]; then
+	echo "Downloads dataset does not exist... Creating... ${global_dataset_downloads}"
+	zfs create ${global_dataset_downloads}
+fi
+
+iocage fstab -a transmission /mnt/${global_dataset_downloads} /mnt/downloads nullfs rw 0 0
+
+# Check if dataset Complete Downloads dataset exist, create if they do not.
+if [ ! -d "/mnt/${global_dataset_downloads}/complete" ]; then
+	echo "Completed Downloads dataset does not exist... Creating... ${global_dataset_downloads}/complete"
+	zfs create ${global_dataset_downloads}/complete
+fi
+
+iocage fstab -a transmission /mnt/${global_dataset_downloads}/complete /mnt/downloads/complete nullfs rw 0 0
+
+# Check if dataset InComplete Downloads dataset exist, create if they do not.
+if [ ! -d "/mnt/${global_dataset_downloads}/incomplete" ]; then
+	echo "Completed Downloads dataset does not exist... Creating... ${global_dataset_downloads}/incomplete"
+	zfs create ${global_dataset_downloads}/incomplete
+fi
+
+iocage fstab -a transmission /mnt/${global_dataset_downloads}/incomplete /mnt/downloads/incomplete nullfs rw 0 0
+
+
+iocage exec transmission mkdir -p /config
+iocage exec transmission chown -R transmission:transmission /config
+iocage exec transmission sysrc "transmission_enable=YES"
+iocage exec transmission sysrc "transmission_conf_dir=/config"
+iocage exec transmission sysrc "transmission_download_dir=/mnt/downloads/complete"
+iocage exec transmission service transmission restart
\ No newline at end of file
diff --git a/jails/transmission/update.sh b/jails/transmission/update.sh
new file mode 100755
index 00000000..a0c0e40b
--- /dev/null
+++ b/jails/transmission/update.sh
@@ -0,0 +1,7 @@
+#!/usr/local/bin/bash
+# This file contains the update script for transmission
+
+iocage exec transmission service transmission stop
+# Transmision is updated during PKG update, this file is mostly just a placeholder
+iocage exec transmission chown -R transmission:transmission /config
+iocage exec transmission service transmission restart
\ No newline at end of file
diff --git a/update-all.sh b/update-all.sh
deleted file mode 100755
index 06d23294..00000000
--- a/update-all.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-cd update
-for f in *.sh; do
-  sh "$f"
-done
\ No newline at end of file
diff --git a/update/jackett.sh b/update/jackett.sh
deleted file mode 100755
index 1c594b8a..00000000
--- a/update/jackett.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-iocage exec jackett service jackett stop
-iocage update jackett
-iocage exec jackett "pkg update && pkg upgrade -y"
-iocage exec jackett chown -R jackett:jackett /usr/local/share/Jackett /config
-cp ../includes/jackett-conf/jackett.rc /mnt/tank/iocage/jails/jackett/root/usr/local/etc/rc.d/jackett
-iocage exec jackett chmod u+x /usr/local/etc/rc.d/jackett
-iocage exec jackett service jackett restart
\ No newline at end of file
diff --git a/update/lidarr.sh b/update/lidarr.sh
deleted file mode 100755
index 77199c20..00000000
--- a/update/lidarr.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-iocage exec lidarr service lidarr stop
-iocage update lidarr
-iocage exec lidarr "pkg update && pkg upgrade -y"
-iocage exec lidarr chown -R lidarr:lidarr /usr/local/share/Lidarr /config
-cp ../includes/lidarr-conf/lidarr.rc /mnt/tank/iocage/jails/lidarr/root/usr/local/etc/rc.d/lidarr
-iocage exec lidarr chmod u+x /usr/local/etc/rc.d/lidarr
-iocage exec lidarr service lidarr restart
\ No newline at end of file
diff --git a/update/plex.sh b/update/plex.sh
deleted file mode 100755
index 4a184251..00000000
--- a/update/plex.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-iocage exec plex service plexmediaserver_plexpass stop
-iocage update plex
-iocage exec plex "pkg update && pkg upgrade -y"
-iocage exec plex chown -R plex:plex /usr/local/share/plexmediaserver-plexpass/
-iocage exec plex service plexmediaserver_plexpass restart
-sleep 10s
-iocage exec plex service plexmediaserver_plexpass start
-echo "Finished updating plex"
\ No newline at end of file
diff --git a/update/radarr.sh b/update/radarr.sh
deleted file mode 100755
index 3844aac4..00000000
--- a/update/radarr.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-iocage exec radarr service radarr stop
-iocage update radarr
-iocage exec radarr "pkg update && pkg upgrade -y"
-iocage exec radarr chown -R radarr:radarr /usr/local/share/Radarr /config
-cp ../includes/radarr-conf/radarr.rc /mnt/tank/iocage/jails/radarr/root/usr/local/etc/rc.d/radarr
-iocage exec radarr chmod u+x /usr/local/etc/rc.d/radarr
-iocage exec radarr service radarr restart
\ No newline at end of file
diff --git a/update/sonarr.sh b/update/sonarr.sh
deleted file mode 100755
index ea80f064..00000000
--- a/update/sonarr.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-iocage exec sonarr service sonarr stop
-iocage update sonarr
-iocage exec sonarr "pkg update && pkg upgrade -y"
-iocage exec sonarr chown -R sonarr:sonarr /usr/local/share/NzbDrone /config
-cp ../includes/sonarr-conf/sonarr.rc /mnt/tank/iocage/jails/sonarr/root/usr/local/etc/rc.d/sonarr
-iocage exec sonarr chmod u+x /usr/local/etc/rc.d/sonarr
-iocage exec sonarr service sonarr restart
\ No newline at end of file

From 4d8755c9ee4657243b0ba1dd76c8a23c5c394e95 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sat, 7 Mar 2020 11:33:20 +0100
Subject: [PATCH 065/147] Create FUNDING.yml

---
 .github/FUNDING.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 00000000..b202c345
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: ornias1993
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

From 30f01cf4d642164c90cf7064733cd3bbd4def0e6 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sat, 7 Mar 2020 14:10:39 +0100
Subject: [PATCH 066/147] Emergency bug fix in config example

---
 config.yml.example | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/config.yml.example b/config.yml.example
index 1a4f3ba0..5814c985 100644
--- a/config.yml.example
+++ b/config.yml.example
@@ -1,8 +1,15 @@
 global:
   # Relevant dataset paths, please use the ZFS dataset syntax such as: tank/apps
   dataset:
+   # dataset for internal jail config files
    config: tank/apps
+   # Iocage root dataset
    iocage: tank/iocage
+   # Media library dataset
+   media: tank/media
+   # Parent downloads dataset 
+   # (is going to contain: Complete and Incomplete datasets for downloads)
+   downloads: tank/downloads
   jails:
    # jail version to install
    version: 11.3-RELEASE

From 35302bf90a18903be5b49b045a399a27397489c1 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sat, 7 Mar 2020 17:39:37 +0100
Subject: [PATCH 067/147] Update readme tutorial

As requested by Debug78 on the FreeNAS forum (PM) some more more thorough instructions
---
 docs/Readme.md | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/docs/Readme.md b/docs/Readme.md
index de3d4ff3..ca831149 100644
--- a/docs/Readme.md
+++ b/docs/Readme.md
@@ -13,9 +13,13 @@ If something goes wrong with Jackett, you just use:
 
 
 ## Install
+- Get into FreeNAS using the in-gui console or SSH.
+Run the following commands to install jailman:
 - `git clone https://github.com/Ornias1993/jailman.git`
-- `cp config.yml.ex. config.yml`
-- edit config.yml to reflect your personal settings
+- `cd jailman`
+- `cp config.yml.example config.yml`
+- edit config.yml to reflect your personal settings (optional, see "use")
+- Run one of the commands under "use"
 
 Thats all.
 
@@ -29,12 +33,22 @@ For supported jails, please see this readme or config.yml.example
 
 - Install:
 `jailman.sh -i $jailname`
+Example:
+`jailman.sh -i sonarr`
 
 - ReInstall:
 `jailman.sh -r $jailname`
+Example:
+`jailman.sh -r sonarr`
 
 - Destroy
 `jailman.sh -d $jailname`
+Example:
+`jailman.sh -d sonarr`
+
+You can also do multiple jails in one pass:
+Example:
+`jailman.sh -i sonarr radarr lidarr`
 
 This installs the jail, creates the config dataset if needed, installs all packages and sets them up for you.
 Only thing you need to do is do the setup of the packages in their respective GUI.
@@ -80,4 +94,4 @@ https://github.com/SystemRage/py-kms
 
 
 ### LICENCE
-This work is dual licenced under GPLv2 and BSD-2 clause
\ No newline at end of file
+This work is dual licenced under GPLv2 and BSD-2 clause

From c2fb804281c16dce6ba8e968cff420d2592ea703 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sun, 8 Mar 2020 12:16:48 +0100
Subject: [PATCH 068/147] fixed some mistakes

---
 docs/Readme.md | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/docs/Readme.md b/docs/Readme.md
index ca831149..c292040d 100644
--- a/docs/Readme.md
+++ b/docs/Readme.md
@@ -31,20 +31,24 @@ This script includes an autoupdate feature which checks if changes to the script
 Replace $jailname with the name of the jail you want to install.
 For supported jails, please see this readme or config.yml.example
 
+- First: CD into the directory you downloaded jailman into (see above)
+example:
+`cd /root/jailman`
+
 - Install:
-`jailman.sh -i $jailname`
+`./jailman.sh -i $jailname`
 Example:
-`jailman.sh -i sonarr`
+`./jailman.sh -i sonarr`
 
 - ReInstall:
-`jailman.sh -r $jailname`
+`./jailman.sh -r $jailname`
 Example:
-`jailman.sh -r sonarr`
+`./jailman.sh -r sonarr`
 
 - Destroy
-`jailman.sh -d $jailname`
+`./jailman.sh -d $jailname`
 Example:
-`jailman.sh -d sonarr`
+`./jailman.sh -d sonarr`
 
 You can also do multiple jails in one pass:
 Example:

From 63bc1cb9ee99625dfacc43d0c6252786a79b4358 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Tue, 10 Mar 2020 22:24:17 +0100
Subject: [PATCH 069/147] Update FUNDING.yml

---
 .github/FUNDING.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index b202c345..f5d4dae0 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -9,4 +9,4 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl
 liberapay: # Replace with a single Liberapay username
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
-custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
+custom: https://www.buymeacoffee.com/Xr9O4jc # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

From 31423fac526c053c8b7ea11dbb7da67f14088a19 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 12 Mar 2020 12:01:16 +0100
Subject: [PATCH 070/147] Create test.md

---
 wiki/test.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 wiki/test.md

diff --git a/wiki/test.md b/wiki/test.md
new file mode 100644
index 00000000..ff7bfcd8
--- /dev/null
+++ b/wiki/test.md
@@ -0,0 +1 @@
+this is a wiki test

From 904f6eb5cf08164f8a70e8b4dad5165e9bf7a46c Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 12 Mar 2020 13:30:18 +0100
Subject: [PATCH 071/147] Update and rename test.md to Home.md

---
 wiki/Home.md | 3 +++
 wiki/test.md | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 wiki/Home.md
 delete mode 100644 wiki/test.md

diff --git a/wiki/Home.md b/wiki/Home.md
new file mode 100644
index 00000000..cbc77572
--- /dev/null
+++ b/wiki/Home.md
@@ -0,0 +1,3 @@
+
+Welcome to the Jailman Wiki.
+This wiki is automatically generated from the *.md files located in either the /wiki or the /jails/*/ directories.
diff --git a/wiki/test.md b/wiki/test.md
deleted file mode 100644
index ff7bfcd8..00000000
--- a/wiki/test.md
+++ /dev/null
@@ -1 +0,0 @@
-this is a wiki test

From b54921f97e2d4da33afd95da62c9aa8f32083d01 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 12 Mar 2020 13:31:57 +0100
Subject: [PATCH 072/147] Final update to Home.md to prepare for dev merge

---
 wiki/Home.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wiki/Home.md b/wiki/Home.md
index cbc77572..ae97c2b6 100644
--- a/wiki/Home.md
+++ b/wiki/Home.md
@@ -1,3 +1,3 @@
+Welcome to the jailman wiki!
 
-Welcome to the Jailman Wiki.
-This wiki is automatically generated from the *.md files located in either the /wiki or the /jails/*/ directories.
+This wiki is automatically generated from the .md files located in either the /wiki or the /jails// directories.

From cd5adfd94b813e6ecf0fc612cd724220a3e4eca0 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Fri, 13 Mar 2020 23:59:05 +0100
Subject: [PATCH 073/147] Jailman v1.1.0 (#24)

* set branch (+2 squashed commit)

Squashed commit:

[e322f24] remove placeholder

[8647131] palceholder

* Code cleanup and (primarily) consolidation (#21)

* set branch

* Exit 1 on iocage create failure

* - Move jailcreate to global function
- Remove Jailcreate.sh

* Add dataset creation function

* - add test script to test new global changes
- also create folder in jail with createmount

* fix

* make test executable

* more verbosity, fixing folder creation

* moving global dataset create

* move jails to new dataset-mount creation function

* remove test jail and test branch-ref

* Add Nextcloud (#22)

* Basic working nextcloud integration

* Enable persistent reinstall of Nextcloud

* prepare for dev merge

* Licence alert

* Add external database and integrated jail

* small improvements and update script

* Add mariadb to dev (#31)

* Working MariaDB config

* - Set ZFS settings for DB on Nextcloud and MariaDB
- Cleanup MariaDB

* prepare for dev merge

* Niceify Readme (#34)

* put content from master into it

* Some readme itteration

* more niceification

* [WIP} Wiki workflow test (#37)

introduce automatic wiki generation

* Add Bitwarden support (#35)

* Nextcloud-Cleanup for v1.1.0 (#40)

* Nextcloud cleanup
- add db-type sanity check
- remove some integrated db checks
- Move ssl to /config/ssl
- remove integrated databases

* slight default tweaking

* fix mariadb install bug

* QA cycle
---
 .github/workflows/main.yml                    |   39 +
 config.yml.example                            |   40 +-
 docs/Readme.md                                |   81 +-
 global.sh                                     |   86 +
 jailcreate.sh                                 |   53 -
 jailman.sh                                    |   10 +-
 jails/bitwarden/includes/bitwarden.rc         |   17 +
 jails/bitwarden/includes/bitwarden.rc.conf    |   13 +
 jails/bitwarden/install.sh                    |   86 +
 jails/bitwarden/readme.md                     |   66 +
 jails/bitwarden/update.sh                     |   65 +
 jails/jackett/includes/jackett.rc             |    0
 jails/jackett/readme.md                       |    0
 .../kms/includes/Activate_Office_2019_Pro.bat |    0
 .../kms/includes/Activate_Windows_10_Pro.bat  |    0
 .../Activate_Windows_Server_2019_Standard.bat |    0
 .../includes/Office-2019-Pro-VLK-Config.xml   |    0
 jails/kms/includes/Readme.md                  |    0
 jails/kms/includes/Setup_Office_2019_Pro.txt  |    0
 jails/kms/includes/py_kms.rc                  |    0
 jails/kms/readme.md                           |   78 +
 jails/lidarr/includes/lidarr.rc               |    0
 jails/lidarr/install.sh                       |   31 +-
 jails/lidarr/readme.md                        |   71 +
 jails/mariadb/includes/Caddyfile              |   11 +
 jails/mariadb/includes/caddy                  |   82 +
 jails/mariadb/includes/my-system.cnf          |   16 +
 jails/mariadb/includes/my.cnf                 |    3 +
 jails/mariadb/install.sh                      |  111 +
 jails/mariadb/readme.md                       |   91 +
 jails/mariadb/update.sh                       |   34 +
 jails/nextcloud/LICENSE                       |  674 ++++++
 jails/nextcloud/README.md                     |   82 +
 jails/nextcloud/includes/Caddyfile            |  127 ++
 jails/nextcloud/includes/Caddyfile-nossl      |  122 ++
 jails/nextcloud/includes/Caddyfile-selfsigned |  128 ++
 jails/nextcloud/includes/caddy                |   83 +
 jails/nextcloud/includes/my-system.cnf        |    4 +
 jails/nextcloud/includes/my.cnf               |    3 +
 jails/nextcloud/includes/pgpass               |    2 +
 jails/nextcloud/includes/php.ini              | 1915 +++++++++++++++++
 jails/nextcloud/includes/redis.conf           | 1052 +++++++++
 jails/nextcloud/includes/remove-staging.sh    |    5 +
 jails/nextcloud/includes/www-crontab          |    1 +
 jails/nextcloud/includes/www.conf             |  417 ++++
 jails/nextcloud/install.sh                    |  350 +++
 jails/nextcloud/update.sh                     |    6 +
 jails/organizr/includes/custom/organizr.conf  |    0
 jails/organizr/includes/custom/phpblock.conf  |    0
 jails/organizr/includes/nginx.conf            |    4 +-
 jails/organizr/install.sh                     |    7 +-
 jails/organizr/readme.md                      |   99 +
 jails/plex/includes/FreeBSD.conf              |    0
 jails/plex/install.sh                         |   36 +-
 jails/plex/readme.md                          |    7 +
 jails/radarr/includes/radarr.rc               |    0
 jails/radarr/install.sh                       |   29 +-
 jails/radarr/readme.md                        |  168 ++
 jails/sonarr/includes/sonarr.rc               |    0
 jails/sonarr/install.sh                       |   30 +-
 jails/sonarr/readme.md                        |   63 +
 jails/tautulli/readme.md                      |   67 +
 jails/transmission/install.sh                 |   26 +-
 jails/transmission/readme.md                  |   81 +
 wiki/test.md                                  |    1 +
 65 files changed, 6448 insertions(+), 225 deletions(-)
 create mode 100644 .github/workflows/main.yml
 delete mode 100755 jailcreate.sh
 create mode 100755 jails/bitwarden/includes/bitwarden.rc
 create mode 100755 jails/bitwarden/includes/bitwarden.rc.conf
 create mode 100755 jails/bitwarden/install.sh
 create mode 100755 jails/bitwarden/readme.md
 create mode 100755 jails/bitwarden/update.sh
 mode change 100644 => 100755 jails/jackett/includes/jackett.rc
 mode change 100644 => 100755 jails/jackett/readme.md
 mode change 100644 => 100755 jails/kms/includes/Activate_Office_2019_Pro.bat
 mode change 100644 => 100755 jails/kms/includes/Activate_Windows_10_Pro.bat
 mode change 100644 => 100755 jails/kms/includes/Activate_Windows_Server_2019_Standard.bat
 mode change 100644 => 100755 jails/kms/includes/Office-2019-Pro-VLK-Config.xml
 mode change 100644 => 100755 jails/kms/includes/Readme.md
 mode change 100644 => 100755 jails/kms/includes/Setup_Office_2019_Pro.txt
 mode change 100644 => 100755 jails/kms/includes/py_kms.rc
 create mode 100755 jails/kms/readme.md
 mode change 100644 => 100755 jails/lidarr/includes/lidarr.rc
 create mode 100755 jails/lidarr/readme.md
 create mode 100755 jails/mariadb/includes/Caddyfile
 create mode 100755 jails/mariadb/includes/caddy
 create mode 100755 jails/mariadb/includes/my-system.cnf
 create mode 100755 jails/mariadb/includes/my.cnf
 create mode 100755 jails/mariadb/install.sh
 create mode 100755 jails/mariadb/readme.md
 create mode 100755 jails/mariadb/update.sh
 create mode 100755 jails/nextcloud/LICENSE
 create mode 100755 jails/nextcloud/README.md
 create mode 100755 jails/nextcloud/includes/Caddyfile
 create mode 100755 jails/nextcloud/includes/Caddyfile-nossl
 create mode 100755 jails/nextcloud/includes/Caddyfile-selfsigned
 create mode 100755 jails/nextcloud/includes/caddy
 create mode 100755 jails/nextcloud/includes/my-system.cnf
 create mode 100755 jails/nextcloud/includes/my.cnf
 create mode 100755 jails/nextcloud/includes/pgpass
 create mode 100755 jails/nextcloud/includes/php.ini
 create mode 100755 jails/nextcloud/includes/redis.conf
 create mode 100755 jails/nextcloud/includes/remove-staging.sh
 create mode 100755 jails/nextcloud/includes/www-crontab
 create mode 100755 jails/nextcloud/includes/www.conf
 create mode 100755 jails/nextcloud/install.sh
 create mode 100755 jails/nextcloud/update.sh
 mode change 100644 => 100755 jails/organizr/includes/custom/organizr.conf
 mode change 100644 => 100755 jails/organizr/includes/custom/phpblock.conf
 mode change 100644 => 100755 jails/organizr/includes/nginx.conf
 create mode 100755 jails/organizr/readme.md
 mode change 100644 => 100755 jails/plex/includes/FreeBSD.conf
 create mode 100755 jails/plex/readme.md
 mode change 100644 => 100755 jails/radarr/includes/radarr.rc
 create mode 100755 jails/radarr/readme.md
 mode change 100644 => 100755 jails/sonarr/includes/sonarr.rc
 create mode 100755 jails/sonarr/readme.md
 create mode 100755 jails/tautulli/readme.md
 create mode 100755 jails/transmission/readme.md
 create mode 100644 wiki/test.md

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 00000000..c7d70678
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,39 @@
+# This is a basic workflow to help you get started with Actions
+
+name: Master workflow
+
+# Controls when the action will run. Triggers the workflow on push or pull request 
+# events but only for the master branch
+on:
+  push:
+    branches: [ master ]
+
+
+jobs:
+  create-wiki:
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout
+      uses: actions/checkout@master
+    - name: rename-readme
+      run: |
+        for pathname in jails/*/README.MD; do ! cp "$pathname" "wiki/$( basename "$( dirname "$pathname" )" ).md"; done
+        for pathname in jails/*/README.md; do ! cp "$pathname" "wiki/$( basename "$( dirname "$pathname" )" ).md"; done 
+        for pathname in jails/*/readme.md; do ! cp "$pathname" "wiki/$( basename "$( dirname "$pathname" )" ).md"; done
+        for pathname in jails/*/Readme.md; do ! cp "$pathname" "wiki/$( basename "$( dirname "$pathname" )" ).md"; done
+      shell: bash
+    - name: copy file
+      uses: canastro/copy-file-action@master
+      with:
+        source: "jails/**/*.md"
+        target: "wiki/"
+    - name: Upload wiki to Wiki
+      uses: docker://decathlon/wiki-page-creator-action:latest
+      env:
+        ACTION_MAIL: ornias1993@users.noreply.github.com
+        ACTION_NAME: ornias1993
+        GH_PAT: ${{ secrets.WIKI_GH_PAT }}
+        MD_FOLDER: wiki
+        OWNER: ornias1993
+        REPO_NAME: jailman
+        SKIP_MD: README.md
diff --git a/config.yml.example b/config.yml.example
index 5814c985..55cda37a 100644
--- a/config.yml.example
+++ b/config.yml.example
@@ -15,10 +15,10 @@ global:
    version: 11.3-RELEASE
    # Global pkgs to install in all jails.
    # Please use standard space delimited pkg install syntax.
-   pkgs: curl ca_root_nss
+   pkgs: curl ca_root_nss bash
 
 
-# Example configuration, showing how to customise network config.
+# Example configuration, showing how to customise network config. 
 # Ese the same jailname on both sides of this variable example: example
 example: example
   #interfaces is optional and will be autmatically replace with vnet0:bridge0 if not present
@@ -56,3 +56,39 @@ organizr: organizr
   
 kms: kms
   pkgs: bash py37-tkinter py37-pip py37-sqlite3 git
+
+
+nextcloud: nextcloud
+  ip4_addr: 192.168.1.99/24
+  gateway: 192.168.1.1
+  time_zone: Europe/Amsterdam
+  host_name: cloud.example.com
+  pkgs:   nano sudo redis php73-ctype gnupg php73-dom php73-gd php73-iconv php73-json php73-mbstring php73-posix php73-simplexml php73-xmlreader php73-xmlwriter php73-zip php73-zlib php73-hash php73-xml php73 php73-pecl-redis php73-session php73-wddx php73-xsl php73-filter php73-pecl-APCu php73-curl php73-fileinfo php73-bz2 php73-intl php73-openssl php73-ldap php73-ftp php73-imap php73-exif php73-gmp php73-pecl-memcache php73-pecl-imagick perl5 p5-Locale-gettext help2man texinfo m4 autoconf
+  database: mariadb
+  standalone_cert: 0
+  selfsigned_cert: 0
+  dns_cert: 0
+  no_cert: 1
+  dl_flags: ""
+  dns_settings: ""
+  cert_email: "placeholder@holdplace.org"
+  database: mariadb
+#  db_database:
+#  db_user:
+#  db_password
+#  db_host
+  
+mariadb: mariadb
+  ip4_addr: 192.168.1.98/24
+  gateway: 192.168.1.1
+  pkgs: mariadb104-server git  php74-session php74-xml php74-ctype php74-openssl php74-filter php74-gd php74-json php74-mysqli php74-mbstring php74-zlib php74-zip php74-bz2 phpMyAdmin5-php74 php74-pdo_mysql php74-mysqli phpMyAdmin5-php74-5.0.1
+  db_root_password: ReplaceThisWithYourOwnRootPAssword
+  host_name: mariadb.local.example
+
+bitwarden: bitwarden
+  ip4_addr: 192.168.1.97/24
+  gateway: 192.168.1.1
+  pkgs: sqlite3 nginx git sudo vim-tiny bash node npm python27-2.7.17_1 mariadb104-client
+  db_password: "YourDBPasswordHerePLEASE"
+  type: mariadb
+  admin_token: "PUTYOURADMINTOKENHEREANDREMOVETHIS"
diff --git a/docs/Readme.md b/docs/Readme.md
index c292040d..9e42dfc9 100644
--- a/docs/Readme.md
+++ b/docs/Readme.md
@@ -1,33 +1,36 @@
+
+
+
+### JailMan is a collection of shell scripts designed to make it easier to install all sorts of iocage Jails on FreeNAS.
+
+---
+
+[![GitHub last commit](https://img.shields.io/github/last-commit/ornias1993/jailman/dev.svg)](https://github.com/ornias1993/jailman/commits/dev) [![Krihelimeter](http://www.krihelinator.xyz/badge/ornias1993/jailman)](http://www.krihelinator.xyz/repositories/ornias1993/jailman) [![GitHub Release](https://img.shields.io/github/release/ornias1993/jailman.svg)](https://github.com/ornias1993/jailman/releases/latest) [![License: GPL v2](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](https://github.com/ornias1993/jailman/blob/master/docs/LICENSE.GPLV2) [![License](https://img.shields.io/badge/License-BSD%202--Clause-orange.svg)](https://github.com/ornias1993/jailman/blob/master/docs/LICENSE.BSD2)
+
 ## Intro
 
-JailMan is a collection of shell scripts designed to make it easier to install iocage Jails on FreeNAS and/or TrueNAS core.
-Inspirations for this script are: Docker, FreeNAS plugins, Pentaflake's guide and "freenas-iocage-nextcloud" by danb35.
-The updater is inspired by the updater designed for ZFS-Compression-Test by Ornias1993.
+There are a lot of great scripts out there to create all sorts of custom jails on FreeNAS. Sadly enough, they all take their own approach to configuration, which lead to a lot of time wasted configuring all sorts of different scripts.
 
-The goal of this project is to be able to install, update, reinstall, upgrade and delete most of your services by just running a single command.
-While doing this we aim for a "docker like" scenario, where the jail is completely disposable and all configuration is saved outside of the jail.
+We do not aim to be some sort of XKCD like "solution to replace all solutions", but aim to simply improve, iterate and integrate the great work others have already put forward.
 
-Example: 
-If something goes wrong with Jackett, you just use:
-'jailman -r jackett' 
+The goal of this project is to be able to install, update, reinstall, upgrade and delete most of your services by just running a single command using a single config file. While doing this we aim for a "docker like" scenario, where the jail is completely disposable and all configuration is saved outside of the jail.
 
-
-## Install
+## Getting started
+### Installing
 - Get into FreeNAS using the in-gui console or SSH.
 Run the following commands to install jailman:
 - `git clone https://github.com/Ornias1993/jailman.git`
 - `cd jailman`
 - `cp config.yml.example config.yml`
 - edit config.yml to reflect your personal settings (optional, see "use")
-- Run one of the commands under "use"
-
-Thats all.
+- Run one of the commands under "How-To Use"
 
 
-## Update
+### Updating
 This script includes an autoupdate feature which checks if changes to the script has been posted to github.
 
-## Use
+
+## How-To Use
 Replace $jailname with the name of the jail you want to install.
 For supported jails, please see this readme or config.yml.example
 
@@ -61,19 +64,23 @@ All settings for the applications inside the jails are persistent across reinsta
 config.yml.example includes basic configuration for all jails.
 Basic means: The same setup as a FreeNAS plugin would've, DHCP on bridge0.
 
-## Currently Supported Services
+### Currently Supported Services
 
-### General
+#### General
 
 - organizr
 - py-kms
+- nextcloud
 
-### Downloads
+#### Backend
+- mariadb
+
+#### Downloads
 
 - transmission
 - jackett
 
-### Media
+#### Media
 
 - plex
 - tautulli
@@ -81,21 +88,37 @@ Basic means: The same setup as a FreeNAS plugin would've, DHCP on bridge0.
 - radarr
 - lidarr
 
-## References
+## Get involved
 
-- Pentaflake's guide:
-https://www.ixsystems.com/community/resources/fn11-3-iocage-jails-plex-tautulli-sonarr-radarr-lidarr-jackett-transmission-organizr.58/
+### Preparing your own copy of JailMan
+Getting involved with JailMan and creating your own Jails, is really simple although experience with Bash, BSD and iocage is highly recommended.
 
-- "freenas-iocage-nextcloud" by danb35:
-https://github.com/danb35/freenas-iocage-nextcloud
+- Fork the JailMan Repository and clone your own fork to disk.
+- Create a new branch, starting from the dev branch (with all current development changes)
+- Open Jailman.sh and `BRANCH="dev"`into your own branch. 
 
-- "ZFS-Compression-Test" by Ornias1993:
-https://github.com/Ornias1993/zfs-compression-test
+### Making changes
+To add a jail, you need 4 things:
 
-- "py-kms" by SystemRage and others:
-https://github.com/SystemRage/py-kms
+- A jailfolder under jails/
+- an install script in the jail folder, named `install.sh`
+- an update script in the jail folder, named `update.sh`
+- an entry in `config.yml` with the name of your jail
 
+All jails created by JailMan start with their own persistant data folder in a seperate dataset, mounted under `/config`.
+You can safely use this, or create additional datasets and mount those. 
 
+To make your experience making changes to Jailman as easy as possible, we already made some  convenience functions in global.sh, those are available to your jail install and update scripts from the start!
 
-### LICENCE
+But above all: Have fun building it!
+
+## LICENCE
 This work is dual licenced under GPLv2 and BSD-2 clause
+
+### Sub-Licences
+Some sub-modules available under "jails" might be licenced under a different licence.
+Please be aware of this and take note of any LICENCE files signaling a differently licenced sub-module.
+
+
+---
+![built-with-resentment](http://forthebadge.com/images/badges/built-with-resentment.svg)       ![contains-technical-debt](http://forthebadge.com/images/badges/contains-technical-debt.svg)
diff --git a/global.sh b/global.sh
index 9211b7c0..f59ca2b6 100755
--- a/global.sh
+++ b/global.sh
@@ -37,3 +37,89 @@ else
     echo "script up-to-date"
 fi
 }
+
+jailcreate() {
+echo "Checking config..."
+jailname="${1}"
+jailpkgs="${1}_pkgs"
+jailinterfaces="${1}_interfaces"
+jailip4="${1}_ip4_addr"
+jailgateway="${1}_gateway"
+jaildhcp="${1}_dhcp"
+setdhcp=${!jaildhcp}
+
+if [ -z "${!jailinterfaces}" ]; then 
+	jailinterfaces="vnet0:bridge0"
+else
+	jailinterfaces=${!jailinterfaces}
+fi
+
+if [ -z "${setdhcp}" ] && [ -z "${!jailip4}" ] && [ -z "${!jailgateway}" ]; then 
+	echo 'no network settings specified in config.yml, defaulting to dhcp="on"'
+	setdhcp="on"
+fi
+
+if [ -z "${!jailname}" ]; then 
+	echo "ERROR, jail not defined in config.yml"
+	exit 1
+else
+	echo "Creating jail for $1"
+	pkgs="$(sed 's/[^[:space:]]\{1,\}/"&"/g;s/ /,/g' <<<"${global_jails_pkgs} ${!jailpkgs}")"
+	echo '{"pkgs":['${pkgs}']}' > /tmp/pkg.json
+	if [ "${setdhcp}" == "on" ]
+	then
+		if ! iocage create -n "${1}" -p /tmp/pkg.json -r ${global_jails_version} interfaces="${jailinterfaces}" dhcp="on" vnet="on" allow_raw_sockets="1" boot="on"
+		then
+			echo "Failed to create jail"
+			exit 1
+		fi
+	else
+		if ! iocage create -n "${1}" -p /tmp/pkg.json -r ${global_jails_version} interfaces="${jailinterfaces}" ip4_addr="vnet0|${!jailip4}" defaultrouter="${!jailgateway}" vnet="on" allow_raw_sockets="1" boot="on"
+		then
+			echo "Failed to create jail"
+			exit 1
+		fi
+		
+	fi
+
+	rm /tmp/pkg.json
+	echo "creating jail config directory"
+	
+	createmount $1 ${global_dataset_config}
+	createmount $1 ${global_dataset_config}/$1 /config
+	
+	echo "Jail creation completed for $1"
+fi	
+	
+}
+
+# $1 = jail name
+# $2 = Dataset
+# $3 = Target mountpoint
+# $4 = fstab prefernces
+createmount() {
+	if [ -z "$2" ] ; then
+		echo "ERROR: No Dataset specified to create and/or mount"
+		exit 1
+	else
+		if [ ! -d "/mnt/$2" ]; then
+			echo "Dataset does not exist... Creating... $2"
+			zfs create $2
+		else
+			echo "Dataset already exists, skipping creation of $2"
+		fi
+
+		if [ -n "$1" ] && [ -n "$3" ]; then
+			iocage exec $1 mkdir -p $3
+			if [ -n "$4" ]; then
+				iocage fstab -a $1 /mnt/$2 $3 $4
+			else
+				iocage fstab -a $1 /mnt/$2 $3 nullfs rw 0 0
+			fi
+		else
+			echo "No Jail Name or Mount target specified, not mounting dataset"
+		fi
+
+	fi
+}
+export -f createmount
diff --git a/jailcreate.sh b/jailcreate.sh
deleted file mode 100755
index 735c0187..00000000
--- a/jailcreate.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/local/bin/bash
-
-echo "Checking config..."
-jailname="${1}"
-jailpkgs="${1}_pkgs"
-jailinterfaces="${1}_interfaces"
-jailip4="${1}_ip4_addr"
-jailgateway="${1}_gateway"
-jaildhcp="${1}_dhcp"
-setdhcp=${!jaildhcp}
-
-if [ -z "${!jailinterfaces}" ]; then 
-	jailinterfaces="vnet0:bridge0"
-else
-	jailinterfaces=${!jailinterfaces}
-fi
-
-if [ -z "${setdhcp}" ] && [ -z "${!jailip4}" ] && [ -z "${!jailgateway}" ]; then 
-	echo 'no network settings specified in config.yml, defaulting to dhcp="on"'
-	setdhcp="on"
-fi
-
-if [ -z "${!jailname}" ]; then 
-	echo "ERROR, jail not defined in config.yml"
-	exit 1
-else
-	echo "Creating jail for $1"
-	pkgs="$(sed 's/[^[:space:]]\{1,\}/"&"/g;s/ /,/g' <<<"${!jailpkgs} ${global_jails_pkgs}")"
-	echo '{"pkgs":['${pkgs}']}' > /tmp/pkg.json
-	if [ "${setdhcp}" == "on" ]
-	then
-		iocage create -n "${1}" -p /tmp/pkg.json -r ${global_jails_version} interfaces="${jailinterfaces}" dhcp="on" vnet="on" allow_raw_sockets="1" boot="on"
-	else
-		iocage create -n "${1}" -p /tmp/pkg.json -r ${global_jails_version} interfaces="${jailinterfaces}" ip4_addr="vnet0|${!jailip4}" defaultrouter="${!jailgateway}" vnet="on" allow_raw_sockets="1" boot="on"
-	fi
-
-	rm /tmp/pkg.json
-	echo "creating jail config directory"
-	iocage exec $1 mkdir -p /config
-
-	if [ ! -d "/mnt/${global_dataset_config}" ]; then
-		echo "Config root dataset does not exist... Creating... ${global_dataset_config}"
-		zfs create ${global_dataset_config}
-	fi
-	
-	if [ ! -d "/mnt/${global_dataset_config}/$1" ]; then
-		echo "Config dataset does not exist... Creating... ${global_dataset_config}/$1"
-		zfs create ${global_dataset_config}/$1
-	fi
-	
-	iocage fstab -a $1 /mnt/${global_dataset_config}/$1 /config nullfs rw 0 0
-	echo "Jail creation completed for $1"
-fi
diff --git a/jailman.sh b/jailman.sh
index 784a6661..57b232cb 100755
--- a/jailman.sh
+++ b/jailman.sh
@@ -15,7 +15,7 @@ if ! [ $(id -u) = 0 ]; then
 fi
 
 # Auto Update
-BRANCH="master"
+BRANCH="dev"
 gitupdate ${BRANCH}
 
 # If no option is given, point to the help menu
@@ -110,7 +110,7 @@ else
 		if [ -f "${SCRIPT_DIR}/jails/$jail/install.sh" ]
 		then
 			echo "Installing $jail"
-			${SCRIPT_DIR}/jailcreate.sh $jail && ${SCRIPT_DIR}/jails/$jail/install.sh
+			jailcreate $jail && ${SCRIPT_DIR}/jails/$jail/install.sh
 		else
 			echo "Missing install script for $jail in ${SCRIPT_DIR}/jails/$jail/install.sh"
 		fi
@@ -127,7 +127,7 @@ else
 		if [ -f "${SCRIPT_DIR}/jails/$jail/install.sh" ]
 		then
 			echo "Reinstalling $jail"
-			iocage destroy -f $jail && ${SCRIPT_DIR}/jailcreate.sh $jail && ${SCRIPT_DIR}/jails/$jail/install.sh
+			iocage destroy -f $jail && jailcreate $jail && ${SCRIPT_DIR}/jails/$jail/install.sh
 		else
 			echo "Missing install script for $jail in ${SCRIPT_DIR}/jails/$jail/update.sh"
 		fi
@@ -145,8 +145,10 @@ else
 		if [ -f "${SCRIPT_DIR}/jails/$jail/update.sh" ]
 		then
 			echo "Updating $jail"
-			iocage update $jail && iocage exec $jail "pkg update && pkg upgrade -y" && ${SCRIPT_DIR}/jails/$jail/update.sh
+			iocage update $jail
+			iocage exec $jail "pkg update && pkg upgrade -y" && ${SCRIPT_DIR}/jails/$jail/update.sh
 			iocage restart $jail
+			iocage start $jail
 		else
 			echo "Missing update script for $jail in ${SCRIPT_DIR}/jails/$jail/update.sh"
 		fi
diff --git a/jails/bitwarden/includes/bitwarden.rc b/jails/bitwarden/includes/bitwarden.rc
new file mode 100755
index 00000000..420f379a
--- /dev/null
+++ b/jails/bitwarden/includes/bitwarden.rc
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+# PROVIDE: bitwarden
+# REQUIRE: LOGIN DAEMON NETWORKING FILESYSTEMS
+# KEYWORD: jail rust
+
+. /etc/rc.subr
+
+name="bitwarden"
+
+
+rcvar=${name}_enable
+pidfile="/var/run/${name}.pid"
+command="/usr/sbin/daemon"
+command_args="-u bitwarden -c -f -P ${pidfile} -r /usr/local/share/bitwarden/bin/bitwarden_rs"
+load_rc_config $name
+run_rc_command "$1"
diff --git a/jails/bitwarden/includes/bitwarden.rc.conf b/jails/bitwarden/includes/bitwarden.rc.conf
new file mode 100755
index 00000000..2046bd0a
--- /dev/null
+++ b/jails/bitwarden/includes/bitwarden.rc.conf
@@ -0,0 +1,13 @@
+export DATA_FOLDER="/config"
+export ENABLE_DB_WAL="false"
+export ROCKET_TLS="{certs="/config/ssl/bitwarden-ssl.crt",key="/config/ssl/bitwarden-ssl.key"}"
+export LOG_FILE="/config/bitwarden.log"
+export WEB_VAULT_FOLDER="/usr/local/share/bitwarden/web-vault"
+export LOG_LEVEL="trace"
+export WEBSOCKET_ENABLED="true"
+export DISABLE_ICON_DOWNLOAD=false
+export ICON_CACHE_FOLDER="/config/icon_cache"
+export ICON_CACHE_TTL=2592000
+export ICON_CACHE_NEGTTL=259200
+export ROCKET_WORKERS=20
+export ROCKET_PORT=8000
diff --git a/jails/bitwarden/install.sh b/jails/bitwarden/install.sh
new file mode 100755
index 00000000..5a8dffa8
--- /dev/null
+++ b/jails/bitwarden/install.sh
@@ -0,0 +1,86 @@
+#!/usr/local/bin/bash
+# This file contains the install script for bitwarden
+
+# Initialise defaults
+JAIL_NAME="bitwarden"
+DB_DATABASE=${JAIL_NAME}
+DB_USER=${JAIL_NAME}
+INSTALL_TYPE=${bitwarden_type}
+DB_HOST="$(sed 's|\(.*\)/.*|\1|' <<<"${mariadb_ip4_addr}"):3306"
+DB_PASSWORD="${bitwarden_db_password}"
+DB_STRING="mysql://${DB_USER}:${DB_PASSWORD}@${DB_HOST}/${DB_DATABASE}"
+ADMIN_TOKEN=${bitwarden_admin_token}
+
+if [ -z "${ADMIN_TOKEN}" ]; then
+ADMIN_TOKEN=$(openssl rand -base64 16)
+fi
+
+# install latest rust version, pkg version is outdated and can't build bitwarden_rs
+iocage exec ${JAIL_NAME} "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y"
+
+# Install Bitwarden_rs
+iocage exec ${JAIL_NAME} mkdir -p /usr/local/share/bitwarden/src
+iocage exec ${JAIL_NAME} git clone https://github.com/dani-garcia/bitwarden_rs/ /usr/local/share/bitwarden/src
+TAG=$(iocage exec ${JAIL_NAME} "git -C /usr/local/share/bitwarden/src tag --sort=v:refname | tail -n1")
+iocage exec ${JAIL_NAME} "git -C /usr/local/share/bitwarden/src checkout ${TAG}"
+#TODO replace with: cargo build --features mysql --release
+if [ "${INSTALL_TYPE}" == "mariadb" ]; then
+	iocage exec ${JAIL_NAME} "cd /usr/local/share/bitwarden/src && $HOME/.cargo/bin/cargo build --features mysql --release"
+	iocage exec ${JAIL_NAME} "cd /usr/local/share/bitwarden/src && $HOME/.cargo/bin/cargo install diesel_cli --no-default-features --features mysql"
+else
+	iocage exec ${JAIL_NAME} "cd /usr/local/share/bitwarden/src && $HOME/.cargo/bin/cargo build --features sqlite --release"
+	iocage exec ${JAIL_NAME} "cd /usr/local/share/bitwarden/src && $HOME/.cargo/bin/cargo install diesel_cli --no-default-features --features sqlite-bundled"
+fi
+
+
+iocage exec ${JAIL_NAME} cp -r /usr/local/share/bitwarden/src/target/release /usr/local/share/bitwarden/bin
+
+# Download and install webvault
+WEB_RELEASE_URL=$(curl -Ls -o /dev/null -w %{url_effective} https://github.com/dani-garcia/bw_web_builds/releases/latest)
+WEB_TAG="${WEB_RELEASE_URL##*/}"
+iocage exec ${JAIL_NAME} "fetch http://github.com/dani-garcia/bw_web_builds/releases/download/$WEB_TAG/bw_web_$WEB_TAG.tar.gz -o /usr/local/share/bitwarden"
+iocage exec ${JAIL_NAME} "tar -xzvf /usr/local/share/bitwarden/bw_web_$WEB_TAG.tar.gz -C /usr/local/share/bitwarden/"
+iocage exec ${JAIL_NAME} rm /usr/local/share/bitwarden/bw_web_$WEB_TAG.tar.gz
+
+if [ -f "/mnt/${global_dataset_config}/${JAIL_NAME}/ssl/bitwarden-ssl.crt" ]; then
+    echo "certificate exist... Skipping cert generation"
+else
+	"No ssl certificate present, generating self signed certificate"
+	if [ ! -d "/mnt/${global_dataset_config}/${JAIL_NAME}/ssl" ]; then
+		echo "cert folder not existing... creating..."
+		iocage exec ${JAIL_NAME} mkdir /config/ssl
+	fi
+	openssl req -new -newkey rsa:2048 -days 365 -nodes -x509 -subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=localhost" -keyout /mnt/${global_dataset_config}/${JAIL_NAME}/ssl/bitwarden-ssl.key -out /mnt/${global_dataset_config}/${JAIL_NAME}/ssl/bitwarden-ssl.crt
+fi
+
+if [ -f "/mnt/${global_dataset_config}/${JAIL_NAME}/bitwarden.log" ]; then
+	echo "Reinstall of Bitwarden detected... using existing config and database"
+elif [ "${INSTALL_TYPE}" == "mariadb" ]; then
+	echo "No config detected, doing clean install, utilizing the Mariadb database ${DB_HOST}"
+	iocage exec "mariadb" mysql -u root -e "CREATE DATABASE ${DB_DATABASE};"
+	iocage exec "mariadb" mysql -u root -e "GRANT ALL ON ${DB_DATABASE}.* TO ${DB_USER}@${JAIL_IP} IDENTIFIED BY '${DB_PASSWORD}';"
+	iocage exec "mariadb" mysqladmin reload
+else
+	echo "No config detected, doing clean install."
+fi
+
+iocage exec ${JAIL_NAME} "pw user add bitwarden -c bitwarden -u 725 -d /nonexistent -s /usr/bin/nologin"
+iocage exec ${JAIL_NAME} chown -R bitwarden:bitwarden /usr/local/share/bitwarden /config
+iocage exec ${JAIL_NAME} mkdir /usr/local/etc/rc.d /usr/local/etc/rc.conf.d
+cp ${SCRIPT_DIR}/jails/${JAIL_NAME}/includes/bitwarden.rc /mnt/${global_dataset_iocage}/jails/${JAIL_NAME}/root/usr/local/etc/rc.d/bitwarden
+cp ${SCRIPT_DIR}/jails/${JAIL_NAME}/includes/bitwarden.rc.conf /mnt/${global_dataset_iocage}/jails/${JAIL_NAME}/root/usr/local/etc/rc.conf.d/bitwarden
+echo 'export DATABASE_URL="'${DB_STRING}'"' >> /mnt/${global_dataset_iocage}/jails/${JAIL_NAME}/root/usr/local/etc/rc.conf.d/bitwarden
+echo 'export ADMIN_TOKEN="'${ADMIN_TOKEN}'"' >> /mnt/${global_dataset_iocage}/jails/${JAIL_NAME}/root/usr/local/etc/rc.conf.d/bitwarden
+
+if [ "${ADMIN_TOKEN}" == "NONE" ]; then
+	echo "Admin_token set to NONE, disabling admin portal"
+else
+	echo "Admin_token set and admin portal enabled"
+	iocage exec "${JAIL_NAME}" echo "${DB_NAME} Admin Token is ${ADMIN_TOKEN}" > /root/${JAIL_NAME}_admin_token.txt
+fi
+
+iocage exec ${JAIL_NAME} chmod u+x /usr/local/etc/rc.d/bitwarden
+iocage exec ${JAIL_NAME} sysrc "bitwarden_enable=YES"
+iocage exec ${JAIL_NAME} service bitwarden restart
+echo "Jail ${JAIL_NAME} finished Bitwarden install."
+echo "Admin Token is ${ADMIN_TOKEN}"
diff --git a/jails/bitwarden/readme.md b/jails/bitwarden/readme.md
new file mode 100755
index 00000000..b698d7fc
--- /dev/null
+++ b/jails/bitwarden/readme.md
@@ -0,0 +1,66 @@
+# Original README from the Bitwarden_rs github:
+
+https://github.com/dani-garcia/bitwarden_rs
+
+# Bitwarden_RS
+### This is a Bitwarden server API implementation written in Rust compatible with [upstream Bitwarden clients](https://bitwarden.com/#download)*, perfect for self-hosted deployment where running the official resource-heavy service might not be ideal.
+
+---
+
+[![Travis Build Status](https://travis-ci.org/dani-garcia/bitwarden_rs.svg?branch=master)](https://travis-ci.org/dani-garcia/bitwarden_rs)
+[![Docker Pulls](https://img.shields.io/docker/pulls/bitwardenrs/server.svg)](https://hub.docker.com/r/bitwardenrs/server)
+[![Dependency Status](https://deps.rs/repo/github/dani-garcia/bitwarden_rs/status.svg)](https://deps.rs/repo/github/dani-garcia/bitwarden_rs)
+[![GitHub Release](https://img.shields.io/github/release/dani-garcia/bitwarden_rs.svg)](https://github.com/dani-garcia/bitwarden_rs/releases/latest)
+[![GPL-3.0 Licensed](https://img.shields.io/github/license/dani-garcia/bitwarden_rs.svg)](https://github.com/dani-garcia/bitwarden_rs/blob/master/LICENSE.txt)
+[![Matrix Chat](https://img.shields.io/matrix/bitwarden_rs:matrix.org.svg?logo=matrix)](https://matrix.to/#/#bitwarden_rs:matrix.org)
+
+Image is based on [Rust implementation of Bitwarden API](https://github.com/dani-garcia/bitwarden_rs).
+
+**This project is not associated with the [Bitwarden](https://bitwarden.com/) project nor 8bit Solutions LLC.**
+
+#### ⚠️**IMPORTANT**⚠️: When using this server, please report any bugs or suggestions to us directly (look at the bottom of this page for ways to get in touch), regardless of whatever clients you are using (mobile, desktop, browser...). DO NOT use the official support channels.
+
+---
+
+## Features
+
+Basically full implementation of Bitwarden API is provided including:
+
+ * Single user functionality
+ * Organizations support
+ * Attachments
+ * Vault API support
+ * Serving the static files for Vault interface
+ * Website icons API
+ * Authenticator and U2F support
+ * YubiKey and Duo support
+
+## Installation
+Pull the docker image and mount a volume from the host for persistent storage:
+
+```sh
+docker pull bitwardenrs/server:latest
+docker run -d --name bitwarden -v /bw-data/:/data/ -p 80:80 bitwardenrs/server:latest
+```
+This will preserve any persistent data under /bw-data/, you can adapt the path to whatever suits you.
+
+**IMPORTANT**: Some web browsers, like Chrome, disallow the use of Web Crypto APIs in insecure contexts. In this case, you might get an error like `Cannot read property 'importKey'`. To solve this problem, you need to access the web vault from HTTPS. 
+
+This can be configured in [bitwarden_rs directly](https://github.com/dani-garcia/bitwarden_rs/wiki/Enabling-HTTPS) or using a third-party reverse proxy ([some examples](https://github.com/dani-garcia/bitwarden_rs/wiki/Proxy-examples)).
+
+If you have an available domain name, you can get HTTPS certificates with [Let's Encrypt](https://letsencrypt.org/), or you can generate self-signed certificates with utilities like [mkcert](https://github.com/FiloSottile/mkcert). Some proxies automatically do this step, like Caddy (see examples linked above).
+
+## Usage
+See the [bitwarden_rs wiki](https://github.com/dani-garcia/bitwarden_rs/wiki) for more information on how to configure and run the bitwarden_rs server.
+
+## Get in touch
+To ask a question, offer suggestions or new features or to get help configuring or installing the software, please [use the forum](https://bitwardenrs.discourse.group/).
+
+If you spot any bugs or crashes with bitwarden_rs itself, please [create an issue](https://github.com/dani-garcia/bitwarden_rs/issues/). Make sure there aren't any similar issues open, though!
+
+If you prefer to chat, we're usually hanging around at [#bitwarden_rs:matrix.org](https://matrix.to/#/#bitwarden_rs:matrix.org) room on Matrix. Feel free to join us!
+
+### Sponsors
+Thanks for your contribution to the project!
+
+- [@ChonoN](https://github.com/ChonoN)
diff --git a/jails/bitwarden/update.sh b/jails/bitwarden/update.sh
new file mode 100755
index 00000000..746df014
--- /dev/null
+++ b/jails/bitwarden/update.sh
@@ -0,0 +1,65 @@
+#!/usr/local/bin/bash
+# This file contains the update script for bitwarden
+# Due to it being build from scratch or downloaded directly to execution dir, 
+# Update for Bitwarden is pretty similair to installation
+
+# Initialise defaults
+JAIL_NAME="bitwarden"
+DB_DATABASE=${JAIL_NAME}
+DB_USER=${JAIL_NAME}
+INSTALL_TYPE=${bitwarden_type}
+DB_HOST="$(sed 's|\(.*\)/.*|\1|' <<<"${mariadb_ip4_addr}"):3306"
+DB_PASSWORD="${bitwarden_db_password}"
+DB_STRING="mysql://${DB_USER}:${DB_PASSWORD}@${DB_HOST}/${DB_DATABASE}"
+ADMIN_TOKEN=${bitwarden_admin_token}
+
+if [ -z "${ADMIN_TOKEN}" ]; then
+ADMIN_TOKEN=$(openssl rand -base64 16)
+fi
+
+iocage exec ${JAIL_NAME} service bitwarden stop
+
+# install latest rust version, pkg version is outdated and can't build bitwarden_rs
+iocage exec ${JAIL_NAME} "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y"
+
+# Install Bitwarden_rs
+iocage exec ${JAIL_NAME} "git -C /usr/local/share/bitwarden/src fetch"
+TAG=$(iocage exec ${JAIL_NAME} "git -C /usr/local/share/bitwarden/src tag --sort=v:refname | tail -n1")
+iocage exec ${JAIL_NAME} "git -C /usr/local/share/bitwarden/src checkout ${TAG}"
+#TODO replace with: cargo build --features mysql --release
+if [ "${INSTALL_TYPE}" == "mariadb" ]; then
+	iocage exec ${JAIL_NAME} "cd /usr/local/share/bitwarden/src && $HOME/.cargo/bin/cargo build --features mysql --release"
+	iocage exec ${JAIL_NAME} "cd /usr/local/share/bitwarden/src && $HOME/.cargo/bin/cargo install diesel_cli --no-default-features --features mysql"
+else
+	iocage exec ${JAIL_NAME} "cd /usr/local/share/bitwarden/src && $HOME/.cargo/bin/cargo build --features sqlite --release"
+	iocage exec ${JAIL_NAME} "cd /usr/local/share/bitwarden/src && $HOME/.cargo/bin/cargo install diesel_cli --no-default-features --features sqlite-bundled"
+fi
+
+
+iocage exec ${JAIL_NAME} cp -r /usr/local/share/bitwarden/src/target/release /usr/local/share/bitwarden/bin
+
+# Download and install webvault
+WEB_RELEASE_URL=$(curl -Ls -o /dev/null -w %{url_effective} https://github.com/dani-garcia/bw_web_builds/releases/latest)
+WEB_TAG="${WEB_RELEASE_URL##*/}"
+iocage exec ${JAIL_NAME} "fetch http://github.com/dani-garcia/bw_web_builds/releases/download/$WEB_TAG/bw_web_$WEB_TAG.tar.gz -o /usr/local/share/bitwarden"
+iocage exec ${JAIL_NAME} "tar -xzvf /usr/local/share/bitwarden/bw_web_$WEB_TAG.tar.gz -C /usr/local/share/bitwarden/"
+iocage exec ${JAIL_NAME} rm /usr/local/share/bitwarden/bw_web_$WEB_TAG.tar.gz
+
+iocage exec ${JAIL_NAME} chown -R bitwarden:bitwarden /usr/local/share/bitwarden /config
+cp ${SCRIPT_DIR}/jails/${JAIL_NAME}/includes/bitwarden.rc /mnt/${global_dataset_iocage}/jails/${JAIL_NAME}/root/usr/local/etc/rc.d/bitwarden
+cp ${SCRIPT_DIR}/jails/${JAIL_NAME}/includes/bitwarden.rc.conf /mnt/${global_dataset_iocage}/jails/${JAIL_NAME}/root/usr/local/etc/rc.conf.d/bitwarden
+echo 'export DATABASE_URL="'${DB_STRING}'"' >> /mnt/${global_dataset_iocage}/jails/${JAIL_NAME}/root/usr/local/etc/rc.conf.d/bitwarden
+echo 'export ADMIN_TOKEN="'${ADMIN_TOKEN}'"' >> /mnt/${global_dataset_iocage}/jails/${JAIL_NAME}/root/usr/local/etc/rc.conf.d/bitwarden
+
+if [ "${ADMIN_TOKEN}" == "NONE" ]; then
+	echo "Admin_token set to NONE, disabling admin portal"
+else
+	echo "Admin_token set and admin portal enabled"
+	iocage exec "${JAIL_NAME}" echo "${DB_NAME} Admin Token is ${ADMIN_TOKEN}" > /root/${JAIL_NAME}_admin_token.txt
+fi
+
+
+iocage exec ${JAIL_NAME} chmod u+x /usr/local/etc/rc.d/bitwarden
+iocage exec ${JAIL_NAME} service bitwarden restart
+echo "Jail ${JAIL_NAME} finished Bitwarden update."
+echo "Admin Token is ${ADMIN_TOKEN}"
diff --git a/jails/jackett/includes/jackett.rc b/jails/jackett/includes/jackett.rc
old mode 100644
new mode 100755
diff --git a/jails/jackett/readme.md b/jails/jackett/readme.md
old mode 100644
new mode 100755
diff --git a/jails/kms/includes/Activate_Office_2019_Pro.bat b/jails/kms/includes/Activate_Office_2019_Pro.bat
old mode 100644
new mode 100755
diff --git a/jails/kms/includes/Activate_Windows_10_Pro.bat b/jails/kms/includes/Activate_Windows_10_Pro.bat
old mode 100644
new mode 100755
diff --git a/jails/kms/includes/Activate_Windows_Server_2019_Standard.bat b/jails/kms/includes/Activate_Windows_Server_2019_Standard.bat
old mode 100644
new mode 100755
diff --git a/jails/kms/includes/Office-2019-Pro-VLK-Config.xml b/jails/kms/includes/Office-2019-Pro-VLK-Config.xml
old mode 100644
new mode 100755
diff --git a/jails/kms/includes/Readme.md b/jails/kms/includes/Readme.md
old mode 100644
new mode 100755
diff --git a/jails/kms/includes/Setup_Office_2019_Pro.txt b/jails/kms/includes/Setup_Office_2019_Pro.txt
old mode 100644
new mode 100755
diff --git a/jails/kms/includes/py_kms.rc b/jails/kms/includes/py_kms.rc
old mode 100644
new mode 100755
diff --git a/jails/kms/readme.md b/jails/kms/readme.md
new file mode 100755
index 00000000..7c55dd7f
--- /dev/null
+++ b/jails/kms/readme.md
@@ -0,0 +1,78 @@
+
+# Original README from the py-kms github:
+
+https://github.com/SystemRage/py-kms
+
+## History
+_py-kms_ is a port of node-kms created by [cyrozap](http://forums.mydigitallife.info/members/183074-markedsword), which is a port of either the C##, C++, or .NET implementations of KMS Emulator. The original version was written by [CODYQX4](http://forums.mydigitallife.info/members/89933-CODYQX4) and is derived from the reverse-engineered code of Microsoft's official KMS.
+
+## Features
+- Responds to V4, V5, and V6 KMS requests.
+- Supports activating:
+	- Windows Vista 
+	- Windows 7 
+	- Windows 8
+	- Windows 8.1
+	- Windows 10 ( 1511 / 1607 / 1703 / 1709 / 1803 / 1809 / 1903 / 1909 )
+	- Windows Server 2008
+	- Windows Server 2008 R2
+	- Windows Server 2012
+	- Windows Server 2012 R2
+	- Windows Server 2016
+	- Windows Server 2019
+	- Microsoft Office 2010 ( Volume License )
+	- Microsoft Office 2013 ( Volume License )
+	- Microsoft Office 2016 ( Volume License )
+	- Microsoft Office 2019 ( Volume License )
+- It's written in Python:
+	- tested with Python 2.7.15rc1 
+	- tested with Python 3.6.7
+
+## Dependencies
+- Python 3.x or Python 2.7.x or Python 2.6.x with the `argparse` module installed.
+- Tkinter module.
+- If the `tzlocal` module is installed, the "Request Time" in the verbose output will be converted into local time. Otherwise, it will be in UTC.
+- It can use the `sqlite3` module so you can use the database function, storing activation data so it can be recalled again. 
+- Installation example on Ubuntu / Mint:
+    - `sudo apt-get update`
+    - for python3
+    - `sudo apt-get install python3-tk python3-pip`
+    - `sudo pip3 install tzlocal pysqlite3`
+    - or for python2
+    - `sudo apt-get install python-tk python-pip`
+    - `sudo pip install tzlocal pysqlite`
+       
+## Usage
+- __NOTE__: Pay attention to how invoke scripts, if you want to run with python2 use `python...` while for python3 use `python3...`, also depending on the Python versions that resides in your PC.
+- To start the server, execute `python pykms_Server.py [IPADDRESS] [PORT]`, the default _IPADDRESS_ is "0.0.0.0" ( all interfaces ) and the default _PORT_ is "1688".
+- To run the client (only for testing purposes), use `python pykms_Client.py [IPADDRESS] [PORT]`, with the same defaults of `pykms_Server.py`.
+- To show the help pages type: `python pykms_Server.py -h` and `python pykms_Client.py -h`.
+- To generate a random HWID use `-w` option: `python pykms_Server.py -w RANDOM`.
+- To get the HWID from any server use the client, for example type: `python pykms_Client.py 0.0.0.0 1688 -m Windows8.1 -V INFO`.
+- To view a minimal set of logging information use `-V MINI` option, for example: `python pykms_Server.py -F /path/to/your/logfile.log -V MINI`.
+- To redirect logging on stdout use `-F STDOUT` option, for example: `python pykms_Server.py -F STDOUT -V DEBUG`.
+- You can create logfile and view logging information on stdout at the same time with `-F FILESTDOUT` option, for example: `python pykms_Server.py -F FILESTDOUT /path/to/your/logfile.log -V DEBUG`.
+- Select timeout (seconds) for py-kms with `-t` option, for example `python pykms_Server.py -t 10`
+- For launching py-kms GUI make executable `pykms_Server.py` file with `chmod +x /path/to/folder/py-kms/pykms_Server.py`, then simply run `pykms_Server.py` double-clicking.
+- You can run py-kms deamonized (via [Etrigan](https://github.com/SystemRage/Etrigan)) using a command like: `python pykms_Server.py etrigan start` and stop it with: `python pykms_Server.py etrigan stop`.
+- With Etrigan you have another way to launch py-kms GUI (specially suitable if you're using a virtualenv), so: `python pykms_Server.py etrigan start -g`
+and stop the GUI with the same precedent command (or interact with EXIT button).
+
+## Docker
+![auto-docker](https://img.shields.io/docker/cloud/automated/pykmsorg/py-kms)
+![status-docker](https://img.shields.io/docker/cloud/build/pykmsorg/py-kms)
+
+This projects has docker image support. You can find all available image configurations inside the docker folder.
+There are three tags of the images available:
+* `latest`, currently the same like minimal...
+* `minimal`, wich is based on the python3 minimal configuration of py-kms. _This image does NOT include SQLLite support!_
+* `python2`, which is fully configurable and equiped with SQLLite support and web interface.
+* `python3`, which is like the `python2` tag - just with Python 3...
+If you just want to use the image and don't want to build them yourself, you can use the official image at the docker hub (`pykmsorg/py-kms`).
+To ensure that the image is always up-to-date you should check [watchtower](https://github.com/containrrr/watchtower) out!
+
+## Other Important Stuff
+Consult the [Wiki](https://github.com/SystemRage/py-kms/wiki) for more information about activation with _py-kms_ and to get GVLK keys.
+
+## License
+   [![License](https://img.shields.io/badge/license-unlicense-lightgray.svg)](https://github.com/SystemRage/py-kms/blob/master/LICENSE)
diff --git a/jails/lidarr/includes/lidarr.rc b/jails/lidarr/includes/lidarr.rc
old mode 100644
new mode 100755
diff --git a/jails/lidarr/install.sh b/jails/lidarr/install.sh
index 7e105b43..8fe19d76 100755
--- a/jails/lidarr/install.sh
+++ b/jails/lidarr/install.sh
@@ -1,34 +1,13 @@
 #!/usr/local/bin/bash
 # This file contains the install script for lidarr
 
-iocage exec lidarr mkdir -p /mnt/music
-iocage exec lidarr mkdir -p /mnt/fetched
-
 # Check if dataset for completed download and it parent dataset exist, create if they do not.
-if [ ! -d "/mnt/${global_dataset_downloads}" ]; then
-	echo "Downloads dataset does not exist... Creating... ${global_dataset_downloads}"
-	zfs create ${global_dataset_downloads}
-fi
+createmount lidarr ${global_dataset_downloads}
+createmount lidarr ${global_dataset_downloads}/complete /mnt/fetched
 
-if [ ! -d "/mnt/${global_dataset_downloads}/complete" ]; then
-	echo "Completed Downloads dataset does not exist... Creating... ${global_dataset_downloads}/complete"
-	zfs create ${global_dataset_downloads}/complete
-fi
-
-iocage fstab -a lidarr /mnt/${global_dataset_downloads}/complete /mnt/fetched nullfs rw 0 0
-
-# Check if dataset for media library and the dataset for music exist, create if they do not.
-if [ ! -d "/mnt/${global_dataset_media}" ]; then
-	echo "Media dataset does not exist... Creating... ${global_dataset_media}"
-	zfs create ${global_dataset_media}
-fi
-
-if [ ! -d "/mnt/${global_dataset_media}/music" ]; then
-	echo "Music dataset does not exist... Creating... ${global_dataset_media}/music"
-	zfs create ${global_dataset_media}/music
-fi
-
-iocage fstab -a lidarr /mnt/${global_dataset_media}/music /mnt/music nullfs rw 0 0
+# Check if dataset for media library and the dataset for movies exist, create if they do not.
+createmount lidarr ${global_dataset_media}
+createmount lidarr ${global_dataset_media}/music /mnt/music
 
 
 iocage exec lidarr ln -s /usr/local/bin/mono /usr/bin/mono
diff --git a/jails/lidarr/readme.md b/jails/lidarr/readme.md
new file mode 100755
index 00000000..d73b6bff
--- /dev/null
+++ b/jails/lidarr/readme.md
@@ -0,0 +1,71 @@
+# Original README from the lidarr github:
+
+https://github.com/lidarr/Lidarr
+
+# Lidarr
+
+[![Build Status](https://dev.azure.com/Lidarr/Lidarr/_apis/build/status/lidarr.Lidarr?branchName=develop)](https://dev.azure.com/Lidarr/Lidarr/_build/latest?definitionId=1&branchName=develop)
+[![BrowserStack Status](https://automate.browserstack.com/badge.svg?badge_key=Z1I4SVZOMitOdENIMHpkMlN3djJiRVJkTzBpdUJ5Q2ZtWVhnYTFvYS9qcz0tLTM5THJZRkVCZlk0blp5cXFBK1BDYWc9PQ==--67f41b00af03ab78148d3d711f22ca42ab348a52)](https://automate.browserstack.com/public-build/Z1I4SVZOMitOdENIMHpkMlN3djJiRVJkTzBpdUJ5Q2ZtWVhnYTFvYS9qcz0tLTM5THJZRkVCZlk0blp5cXFBK1BDYWc9PQ==--67f41b00af03ab78148d3d711f22ca42ab348a52)
+[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/lidarr.svg)](https://github.com/lidarr/Lidarr/wiki/Docker)
+![Github Downloads](https://img.shields.io/github/downloads/lidarr/lidarr/total.svg)
+[![Backers on Open Collective](https://opencollective.com/lidarr/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/lidarr/sponsors/badge.svg)](#sponsors)
+
+Lidarr is a music collection manager for Usenet and BitTorrent users. It can monitor multiple RSS feeds for new tracks from your favorite artists and will grab, sort and rename them. It can also be configured to automatically upgrade the quality of files already downloaded when a better quality format becomes available.
+
+## Major Features Include:
+
+* Support for major platforms: Windows, Linux, macOS, Raspberry Pi, etc.
+* Automatically detects new tracks.
+* Can scan your existing library and download any missing tracks.
+* Can watch for better quality of the tracks you already have and do an automatic upgrade.
+* Automatic failed download handling will try another release if one fails
+* Manual search so you can pick any release or to see why a release was not downloaded automatically
+* Fully configurable track renaming
+* Full integration with SABnzbd and NZBGet
+* Full integration with Kodi, Plex (notification, library update, metadata)
+* Full support for specials and multi-album releases
+* And a beautiful UI
+
+## Feature Requests
+
+[![Feature Requests](http://feathub.com/lidarr/Lidarr?format=svg)](http://feathub.com/lidarr/Lidarr)
+
+## Support
+
+[![Discord](https://img.shields.io/badge/discord-chat-7289DA.svg?maxAge=60)](https://discord.gg/8Y7rDc9)
+[![Reddit](https://img.shields.io/badge/reddit-discussion-FF4500.svg?maxAge=60)](https://www.reddit.com/r/lidarr)
+[![GitHub](https://img.shields.io/badge/github-issues-red.svg?maxAge=60)](https://github.com/Lidarr/Lidarr/issues)
+[![GitHub Wiki](https://img.shields.io/badge/github-wiki-181717.svg?maxAge=60)](https://github.com/Lidarr/Lidarr/wiki)
+
+## Contributors
+
+This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)].
+<a href="https://github.com/lidarr/Lidarr/graphs/contributors"><img src="https://opencollective.com/lidarr/contributors.svg?width=890&button=false" /></a>
+
+
+## Backers
+
+Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/lidarr#backer)]
+
+<a href="https://opencollective.com/lidarr#backers" target="_blank"><img src="https://opencollective.com/lidarr/backers.svg?width=890"></a>
+
+
+## Sponsors
+
+Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/lidarr#sponsor)]
+
+<a href="https://opencollective.com/lidarr/sponsor/0/website" target="_blank"><img src="https://opencollective.com/lidarr/sponsor/0/avatar.svg"></a>
+<a href="https://opencollective.com/lidarr/sponsor/1/website" target="_blank"><img src="https://opencollective.com/lidarr/sponsor/1/avatar.svg"></a>
+<a href="https://opencollective.com/lidarr/sponsor/2/website" target="_blank"><img src="https://opencollective.com/lidarr/sponsor/2/avatar.svg"></a>
+<a href="https://opencollective.com/lidarr/sponsor/3/website" target="_blank"><img src="https://opencollective.com/lidarr/sponsor/3/avatar.svg"></a>
+<a href="https://opencollective.com/lidarr/sponsor/4/website" target="_blank"><img src="https://opencollective.com/lidarr/sponsor/4/avatar.svg"></a>
+<a href="https://opencollective.com/lidarr/sponsor/5/website" target="_blank"><img src="https://opencollective.com/lidarr/sponsor/5/avatar.svg"></a>
+<a href="https://opencollective.com/lidarr/sponsor/6/website" target="_blank"><img src="https://opencollective.com/lidarr/sponsor/6/avatar.svg"></a>
+<a href="https://opencollective.com/lidarr/sponsor/7/website" target="_blank"><img src="https://opencollective.com/lidarr/sponsor/7/avatar.svg"></a>
+<a href="https://opencollective.com/lidarr/sponsor/8/website" target="_blank"><img src="https://opencollective.com/lidarr/sponsor/8/avatar.svg"></a>
+<a href="https://opencollective.com/lidarr/sponsor/9/website" target="_blank"><img src="https://opencollective.com/lidarr/sponsor/9/avatar.svg"></a>
+
+### License
+
+* [GNU GPL v3](http://www.gnu.org/licenses/gpl.html)
+* Copyright 2010-2019
diff --git a/jails/mariadb/includes/Caddyfile b/jails/mariadb/includes/Caddyfile
new file mode 100755
index 00000000..65843dbe
--- /dev/null
+++ b/jails/mariadb/includes/Caddyfile
@@ -0,0 +1,11 @@
+yourhostnamehere:80 JAIL-IP:80 {
+  root /usr/local/www/phpMyAdmin/
+  fastcgi / 127.0.0.1:9000 php {
+        env PATH /bin
+        env modHeadersAvailable true
+        env front_controller_active true
+        connect_timeout 60s
+        read_timeout 3600s
+        send_timeout 300s
+        }
+}
\ No newline at end of file
diff --git a/jails/mariadb/includes/caddy b/jails/mariadb/includes/caddy
new file mode 100755
index 00000000..9c087c47
--- /dev/null
+++ b/jails/mariadb/includes/caddy
@@ -0,0 +1,82 @@
+#!/bin/sh
+#
+# PROVIDE: caddy
+# REQUIRE: networking
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable caddy:
+# caddy_enable (bool):        Set to "NO" by default.
+#                             Set it to "YES" to enable caddy
+#
+# caddy_cert_email (str):     Set to "" by default.
+#                             Defines the SSL certificate issuer email. By providing an
+#                             email address you automatically agree to letsencrypt.org's
+#                             general terms and conditions
+#
+# caddy_bin_path (str):       Set to "/usr/local/bin/caddy" by default.
+#                             Provides the path to the caddy server executable
+#
+# caddy_cpu (str):            Set to "99%" by default.
+#                             Configures, how much CPU capacity caddy may gain
+#
+# caddy_config_path (str):    Set to "/usr/local/www/Caddyfile" by default.
+#                             Defines the path for the configuration file caddy will load on boot
+#
+# caddy_user (str):           Set to "root" by default.
+#                             Defines the user that caddy will run on
+#
+# caddy_group (str):          Set to "wheel" by default.
+#                             Defines the group that caddy files will be attached to
+#
+# caddy_logfile (str)         Set to "/var/log/caddy.log" by default.
+#                             Defines where the process log file is written, this is not a web access log
+#
+# caddy_env (str)             Set to "" by default.
+#                             This allows environment variable to be set that may be required, for example when using "DNS Challenge" account credentials are required.
+#                             e.g. (in your rc.conf)   caddy_env="CLOUDFLARE_EMAIL=me@domain.com CLOUDFLARE_API_KEY=my_api_key"
+#
+
+. /etc/rc.subr                                           
+
+name="caddy"
+rcvar="${name}_enable"
+
+load_rc_config ${name}
+
+: ${caddy_enable:="NO"}
+: ${caddy_cert_email=""}
+: ${caddy_bin_path="/usr/local/bin/caddy"}
+: ${caddy_cpu="99%"} # was a bug for me that caused a crash within jails
+: ${caddy_config_path="/usr/local/www/Caddyfile"}
+: ${caddy_logfile="/var/log/caddy.log"}
+: ${caddy_user="root"}
+: ${caddy_group="wheel"}
+
+if [ "$caddy_cert_email" = "" ]
+then
+    echo "rc variable \$caddy_cert_email is not set. Please provide a valid SSL certificate issuer email."
+    exit 1
+fi
+
+pidfile="/var/run/${name}.pid"
+procname="${caddy_bin_path}" #enabled builtin pid checking for start / stop
+command="/usr/sbin/daemon"
+command_args="-p ${pidfile} /usr/bin/env ${caddy_env} ${procname} -cpu ${caddy_cpu} -log stdout -conf ${caddy_config_path} -agree -email ${caddy_cert_email} < /dev/null >> ${caddy_logfile} 2>&1"
+
+start_precmd="caddy_startprecmd"
+
+caddy_startprecmd()
+{
+        if [ ! -e "${pidfile}" ]; then
+                install -o "${caddy_user}" -g "${caddy_group}" "/dev/null" "${pidfile}"
+        fi
+
+        if [ ! -e "${caddy_logfile}" ]; then
+                install -o "${caddy_user}" -g "${caddy_group}" "/dev/null" "${caddy_logfile}"
+        fi
+}
+
+required_files="${caddy_config_path}"
+
+run_rc_command "$1"
diff --git a/jails/mariadb/includes/my-system.cnf b/jails/mariadb/includes/my-system.cnf
new file mode 100755
index 00000000..b7eca26d
--- /dev/null
+++ b/jails/mariadb/includes/my-system.cnf
@@ -0,0 +1,16 @@
+[mysqld]
+innodb_file_per_table=1
+transaction_isolation = READ-COMMITTED
+binlog_format = ROW
+
+symbolic-links=0
+innodb_doublewrite = 0
+innodb_checksum_algorithm = none
+innodb_file_per_table=1
+
+innodb_buffer_pool_size = 1G
+innodb_log_buffer_size  = 8M
+innodb_open_files       = 400
+innodb_io_capacity      = 400
+innodb_flush_method     = O_DIRECT
+innodb_io_capacity      = 4000
diff --git a/jails/mariadb/includes/my.cnf b/jails/mariadb/includes/my.cnf
new file mode 100755
index 00000000..77b7660a
--- /dev/null
+++ b/jails/mariadb/includes/my.cnf
@@ -0,0 +1,3 @@
+# MySQL client config file
+[client]
+password=mypassword
diff --git a/jails/mariadb/install.sh b/jails/mariadb/install.sh
new file mode 100755
index 00000000..6c9d9e7d
--- /dev/null
+++ b/jails/mariadb/install.sh
@@ -0,0 +1,111 @@
+#!/usr/local/bin/bash
+# This script installs the current release of Mariadb and PhpMyAdmin into a created jail
+#####
+# 
+# Init and Mounts
+#
+#####
+
+# Initialise defaults
+JAIL_NAME="mariadb"
+JAIL_IP="$(sed 's|\(.*\)/.*|\1|' <<<"${mariadb_ip4_addr}" )"
+INCLUDES_PATH="${SCRIPT_DIR}/jails/mariadb/includes"
+CERT_EMAIL=${mariadb_cert_email}
+DB_ROOT_PASSWORD=${mariadb_db_root_password}
+DB_NAME="MariaDB"
+DL_FLAGS=""
+
+# Check that necessary variables were set by nextcloud-config
+if [ -z "${mariadb_ip4_addr}" ]; then
+  echo 'Configuration error: The mariadb jail does NOT accept DHCP'
+  echo 'Please reinstall using a fixed IP adress'
+  exit 1
+fi
+
+# Make sure DB_PATH is empty -- if not, MariaDB/PostgreSQL will choke
+
+if [ "$(ls -A "/mnt/${global_dataset_config}/${JAIL_NAME}/db")" ]; then
+	echo "Reinstall of mariadb detected... Continuing"
+	REINSTALL="true"
+fi
+
+# Mount database dataset and set zfs preferences
+createmount ${JAIL_NAME} ${global_dataset_config}/${JAIL_NAME}/db /var/db/mysql
+zfs set recordsize=16K ${global_dataset_config}/${JAIL_NAME}/db
+zfs set primarycache=metadata ${global_dataset_config}/${JAIL_NAME}/db
+
+iocage exec "${JAIL_NAME}" chown -R 88:88 /var/db/mysql
+
+# Install includes fstab
+iocage exec "${JAIL_NAME}" mkdir -p /mnt/includes
+iocage fstab -a "${JAIL_NAME}" "${INCLUDES_PATH}" /mnt/includes nullfs rw 0 0
+
+iocage exec "${JAIL_NAME}" mkdir -p /usr/local/www/phpmyadmin
+iocage exec "${JAIL_NAME}" chown -R www:www /usr/local/www/phpmyadmin
+
+#####
+# 
+# Install mariadb, Caddy and PhpMyAdmin
+#
+#####
+
+fetch -o /tmp https://getcaddy.com
+if ! iocage exec "${JAIL_NAME}" bash -s personal "${DL_FLAGS}" < /tmp/getcaddy.com
+then
+	echo "Failed to download/install Caddy"
+	exit 1
+fi
+
+iocage exec "${JAIL_NAME}" sysrc mysql_enable="YES"
+
+# Copy and edit pre-written config files
+echo "Copying Caddyfile for no SSL"
+iocage exec "${JAIL_NAME}" cp -f /mnt/includes/caddy /usr/local/etc/rc.d/
+iocage exec "${JAIL_NAME}" cp -f /mnt/includes/Caddyfile /usr/local/www/Caddyfile
+iocage exec "${JAIL_NAME}" sed -i '' "s/yourhostnamehere/${mariadb_host_name}/" /usr/local/www/Caddyfile
+iocage exec "${JAIL_NAME}" sed -i '' "s/JAIL-IP/${JAIL_IP}/" /usr/local/www/Caddyfile
+
+iocage exec "${JAIL_NAME}" sysrc caddy_enable="YES"
+iocage exec "${JAIL_NAME}" sysrc php_fpm_enable="YES"
+iocage exec "${JAIL_NAME}" sysrc caddy_cert_email="${CERT_EMAIL}"
+iocage exec "${JAIL_NAME}" sysrc caddy_env="${DNS_ENV}"
+
+iocage restart "${JAIL_NAME}"
+sleep 10
+
+if [ "${REINSTALL}" == "true" ]; then
+	echo "Reinstall detected, skipping generaion of new config and database"
+else
+	
+	# Secure database, set root password, create Nextcloud DB, user, and password
+	iocage exec "${JAIL_NAME}" cp -f /mnt/includes/my-system.cnf /var/db/mysql/my.cnf
+	iocage exec "${JAIL_NAME}" mysql -u root -e "DELETE FROM mysql.user WHERE User='';"
+	iocage exec "${JAIL_NAME}" mysql -u root -e "DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1');"
+	iocage exec "${JAIL_NAME}" mysql -u root -e "DROP DATABASE IF EXISTS test;"
+	iocage exec "${JAIL_NAME}" mysql -u root -e "DELETE FROM mysql.db WHERE Db='test' OR Db='test\\_%';"
+	iocage exec "${JAIL_NAME}" mysql -u root -e "UPDATE mysql.user SET Password=PASSWORD('${DB_ROOT_PASSWORD}') WHERE User='root';"
+	iocage exec "${JAIL_NAME}" mysqladmin reload
+fi
+iocage exec "${JAIL_NAME}" cp -f /mnt/includes/my.cnf /root/.my.cnf
+iocage exec "${JAIL_NAME}" sed -i '' "s|mypassword|${DB_ROOT_PASSWORD}|" /root/.my.cnf
+
+# Save passwords for later reference
+iocage exec "${JAIL_NAME}" echo "${DB_NAME} root password is ${DB_ROOT_PASSWORD}" > /root/${JAIL_NAME}_db_password.txt
+	
+
+# Don't need /mnt/includes any more, so unmount it
+iocage fstab -r "${JAIL_NAME}" "${INCLUDES_PATH}" /mnt/includes nullfs rw 0 0
+
+# Done!
+echo "Installation complete!"
+echo "Using your web browser, go to http://${mariadb_host_name} to log in"
+
+if [ "${REINSTALL}" == "true" ]; then
+	echo "You did a reinstall, please use your old database and account credentials"
+else
+	echo "Database Information"
+	echo "--------------------"
+	echo "The ${DB_NAME} root password is ${DB_ROOT_PASSWORD}"
+	fi
+echo ""
+echo "All passwords are saved in /root/${JAIL_NAME}_db_password.txt"
diff --git a/jails/mariadb/readme.md b/jails/mariadb/readme.md
new file mode 100755
index 00000000..532bf0b6
--- /dev/null
+++ b/jails/mariadb/readme.md
@@ -0,0 +1,91 @@
+# Original README from the mariadb github:
+
+https://github.com/MariaDB/server/
+
+Code status:
+------------
+
+* [![Travis CI status](https://secure.travis-ci.org/MariaDB/server.png?branch=10.5)](https://travis-ci.org/MariaDB/server) travis-ci.org (10.5 branch)
+* [![Appveyor CI status](https://ci.appveyor.com/api/projects/status/4u6pexmtpuf8jq66?svg=true)](https://ci.appveyor.com/project/rasmushoj/server) ci.appveyor.com
+
+## MariaDB: drop-in replacement for MySQL
+
+MariaDB is designed as a drop-in replacement of MySQL(R) with more
+features, new storage engines, fewer bugs, and better performance.
+
+MariaDB is brought to you by the MariaDB Foundation and the MariaDB corporation.
+Please read the CREDITS file for details about the MariaDB Foundation,
+and who is developing MariaDB.
+
+MariaDB is developed by many of the original developers of MySQL who
+now work for the MariaDB Corporation, the MariaDB Foundation and by
+many people in the community.
+
+MySQL, which is the base of MariaDB, is a product and trademark of Oracle
+Corporation, Inc. For a list of developers and other contributors,
+see the Credits appendix.  You can also run 'SHOW authors' to get a
+list of active contributors.
+
+A description of the MariaDB project and a manual can be found at:
+
+https://mariadb.com/kb/en/
+
+https://mariadb.com/kb/en/mariadb-vs-mysql-features/
+
+https://mariadb.com/kb/en/mariadb-versus-mysql-compatibility/
+
+https://mariadb.com/kb/en/library/new-and-old-releases/
+
+https://mariadb.org/
+
+As MariaDB is a full replacement of MySQL, the MySQL manual at
+http://dev.mysql.com/doc is generally applicable.
+
+Help
+-----
+
+More help is available from the Maria Discuss mailing list
+https://launchpad.net/~maria-discuss
+and the #maria IRC channel on Freenode.
+
+Live QA for beginner contributors
+----
+MariaDB has a dedicated time each week when we answer new contributor questions live on Zulip and IRC.
+From 8:00 to 10:00 UTC on Mondays, and 10:00 to 12:00 UTC on Thursdays,
+anyone can ask any questions they’d like, and a live developer will be available to assist.
+
+New contributors can ask questions any time, but we will provide immediate feedback during that interval.
+
+Licensing
+---------
+
+***************************************************************************
+
+NOTE: 
+
+MariaDB is specifically available only under version 2 of the GNU
+General Public License (GPLv2). (I.e. Without the "any later version"
+clause.) This is inherited from MySQL. Please see the README file in
+the MySQL distribution for more information.
+
+License information can be found in the COPYING file. Third party
+license information can be found in the THIRDPARTY file.
+
+***************************************************************************
+
+Bug Reports
+------------
+
+Bug and/or error reports regarding MariaDB should be submitted at:
+https://jira.mariadb.org
+
+For reporting security vulnerabilities see:
+https://mariadb.org/about/security-policy/
+
+Bugs in the MySQL code can also be submitted at:
+https://bugs.mysql.com
+
+The code for MariaDB, including all revision history, can be found at:
+https://github.com/MariaDB/server
+
+***************************************************************************
diff --git a/jails/mariadb/update.sh b/jails/mariadb/update.sh
new file mode 100755
index 00000000..2cb9fe25
--- /dev/null
+++ b/jails/mariadb/update.sh
@@ -0,0 +1,34 @@
+#!/usr/local/bin/bash
+# This file contains the update script for mariadb
+
+JAIL_NAME="mariadb"
+JAIL_IP="$(sed 's|\(.*\)/.*|\1|' <<<"${mariadb_ip4_addr}" )"
+INCLUDES_PATH="${SCRIPT_DIR}/jails/mariadb/includes"
+
+# Install includes fstab
+iocage exec "${JAIL_NAME}" mkdir -p /mnt/includes
+iocage fstab -a "${JAIL_NAME}" "${INCLUDES_PATH}" /mnt/includes nullfs rw 0 0
+
+
+iocage exec ${JAIL_NAME} service caddy stop
+iocage exec ${JAIL_NAME} service php-fpm stop
+
+fetch -o /tmp https://getcaddy.com
+if ! iocage exec "${JAIL_NAME}" bash -s personal "${DL_FLAGS}" < /tmp/getcaddy.com
+then
+	echo "Failed to download/install Caddy"
+	exit 1
+fi
+
+# Copy and edit pre-written config files
+echo "Copying Caddyfile for no SSL"
+iocage exec "${JAIL_NAME}" cp -f /mnt/includes/caddy /usr/local/etc/rc.d/
+iocage exec "${JAIL_NAME}" cp -f /mnt/includes/Caddyfile /usr/local/www/Caddyfile
+iocage exec "${JAIL_NAME}" sed -i '' "s/yourhostnamehere/${mariadb_host_name}/" /usr/local/www/Caddyfile
+iocage exec "${JAIL_NAME}" sed -i '' "s/JAIL-IP/${JAIL_IP}/" /usr/local/www/Caddyfile
+
+# Don't need /mnt/includes any more, so unmount it
+iocage fstab -r "${JAIL_NAME}" "${INCLUDES_PATH}" /mnt/includes nullfs rw 0 0
+
+iocage exec ${JAIL_NAME} service caddy start
+iocage exec ${JAIL_NAME} service php-fpm start
\ No newline at end of file
diff --git a/jails/nextcloud/LICENSE b/jails/nextcloud/LICENSE
new file mode 100755
index 00000000..94a9ed02
--- /dev/null
+++ b/jails/nextcloud/LICENSE
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/jails/nextcloud/README.md b/jails/nextcloud/README.md
new file mode 100755
index 00000000..aa4ee344
--- /dev/null
+++ b/jails/nextcloud/README.md
@@ -0,0 +1,82 @@
+# Original README from the Upstream Nextcloud-iocage install script:
+
+https://github.com/danb35/freenas-iocage-nextcloud
+
+
+# freenas-iocage-nextcloud
+Script to create an iocage jail on FreeNAS for the latest Nextcloud 18 release, including Caddy 1.0, MariaDB 10.3/PostgreSQL 10, and Let's Encrypt
+
+This script will create an iocage jail on FreeNAS 11.2-U7 or 11.3 with the latest release of Nextcloud 18, along with its dependencies.  It will obtain a trusted certificate from Let's Encrypt for the system, install it, and configure it to renew automatically.  It will create the Nextcloud database and generate a strong root password and user password for the database system.  It will configure the jail to store the database and Nextcloud user data outside the jail, so it will not be lost in the event you need to rebuild the jail.
+
+## Status
+This script will work with FreeNAS 11.3, and it should also work with 11.2-U7.  Due to the EOL status of FreeBSD 11.2, it is unlikely to work reliably with earlier releases of FreeNAS.
+
+## Usage
+
+### Prerequisites (Let's Encrypt)
+This script works best when your installation is able to obtain a certificate from [Let's Encrypt](https://letsencrypt.org/).  When you use it this way, Caddy is able to handle all of the TLS-related configuration for you, obtain and renew certificates automatically, etc.  In order for this to happen, you must meet the two requirements below:
+
+* First, you must own or control a real Internet domain name.  This script obtains a TLS encryption certificate from Let's Encrypt, who will only issue for public domain names.  Thus, domains like `cloud.local`, `mycloud.lan`, or `nextcloud.home` won't work.  Domains can be very inexpensive, and in some cases, they can be free.  [Freenom](https://www.freenom.com/), for example, provides domains for free if you jump through the right hoops.  [EasyDNS](https://easydns.com/) is a fine domain registrar for paid domains, costing roughly US$15 per year (which varies slightly with the top-level domain).
+
+* Second, one of these two conditions must be met in order for Let's Encrypt to validate your control over the domain name:
+
+  * You must be able and willing to open ports 80 and 443 from the entire Internet to the jail, and leave them open.  If this applies, do it **before** running this script.
+  * DNS hosting for the domain name needs to be with a provider that Caddy supports, to automatically update the DNS records needed to prove your control over the domain.  See the [Caddy documentation](https://caddyserver.com/docs) under the heading of "DNS Providers" for the supported providers, and what information you'll need in order to proceed.
+
+[Cloudflare](https://www.cloudflare.com/) provides DNS hosting at no cost, and it's well-supported by Caddy.  Cloudflare doesn't directly provide Dynamic DNS service, but [DNS-O-Matic](https://dnsomatic.com/) is a Dynamic DNS provider that will interface with many DNS hosts including Cloudflare, and is also free of charge.  So, even if you have a dynamic IP address (as most residential Internet users do), you don't have your own domain, and you aren't willing to pay for a domain or any other relevant service, and you aren't willing to open any ports from the Internet to your system, you can still get a trusted certificate from Let's Encrypt by following these steps:
+
+* Register a free domain with Freenom.  Be sure to keep up with the renewal requirements.
+* Sign up for a free account with Cloudflare, and activate it for free DNS service only on your domain.
+* Tell Freenom to use Cloudflare for DNS for your domain.
+* Sign up for a free account with DNS-O-Matic, and configure it to update your Cloudflare DNS.
+* Set up FreeNAS (see [this thread](https://www.ixsystems.com/community/threads/dns-o-matic-dynamic-dns-configuration.10326/)), your router, or whatever you prefer to update DNS-O-Matic as your IP address changes.
+* Set up this script to do DNS validation, tell it to use the cloudflare plugin, and give it your email address and Global API key.
+
+If you aren't able or willing to obtain a certificate from Let's Encrypt, this script also supports configuring Caddy with a self-signed certificate, or with no certificate (and thus no HTTPS) at all.
+
+### Prerequisites (Other)
+Although not required, it's recommended to create two datasets on your main storage pool: one named `files`, which will store the Nextcloud user data; and one called `db`, which will store the SQL database.  For optimal performance, set the record size of the `db` dataset to 16 KB (under Advanced Settings in the FreeNAS web GUI).  It's also recommended to cache only metadata on the `db` dataset; you can do this by running `zfs set primarycache=metadata poolname/db`.
+
+### Installation
+Download the repository to a convenient directory on your FreeNAS system by running `git clone https://github.com/danb35/freenas-iocage-nextcloud`.  Then change into the new directory and create a file called `nextcloud-config`.  It should look like this:
+```
+JAIL_IP="192.168.1.199"
+DEFAULT_GW_IP="192.168.1.1"
+POOL_PATH="/mnt/tank"
+TIME_ZONE="America/New_York"
+HOST_NAME="YOUR_FQDN"
+STANDALONE_CERT=1
+CERT_EMAIL="me@example.com"
+```
+Many of the options are self-explanatory, and all should be adjusted to suit your needs, but only a few are mandatory.  The mandatory options are:
+
+* JAIL_IP is the IP address for your jail
+* DEFAULT_GW_IP is the address for your default gateway
+* POOL_PATH is the path for your data pool.
+* TIME_ZONE is the time zone of your location, in PHP notation--see the [PHP manual](http://php.net/manual/en/timezones.php) for a list of all valid time zones.
+* HOST_NAME is the fully-qualified domain name you want to assign to your installation.  You must own (or at least control) this domain, because Let's Encrypt will test that control.
+* DNS_CERT, STANDALONE_CERT, SELFSIGNED_CERT, and NO_CERT determine which method will be used to generate a TLS certificate (or, in the case of NO_CERT, indicate that you don't want to use SSL at all).  DNS_CERT and STANDALONE_CERT indicate use of DNS or HTTP validation for Let's Encrypt, respectively.  One **and only one** of these must be set to 1.
+* CERT_EMAIL is the email address Let's Encrypt will use to notify you of certificate expiration.  This is mandatory regardless of whether you're using Let's Encrypt (Caddy won't start without it), but it's only used with Let's Encrypt.  If you are **not** using one of the Let's Encrypt certificate options, you can set this to a dummy address as above.  If you **are** using Let's Encrypt, though, it should be set to a valid address for the system admin.
+* DNS_PLUGIN: If DNS_CERT is set, DNS_PLUGIN must contain the name of the DNS validation plugin you'll use with Caddy to validate domain control.  See the [Caddy documentation](https://caddyserver.com/docs) under the heading of "DNS Providers" for the available plugins, but omit the leading "tls.dns.".  For example, to use Cloudflare, set `DNS_PLUGIN="cloudflare"`.
+* DNS_ENV: If DNS_CERT is set, DNS_ENV must contain the authentication credentials for your DNS provider.  See the [Caddy documentation](https://caddyserver.com/docs) under the heading of "DNS Providers" for further details.  For Cloudflare, you'd set `DNS_ENV="CLOUDFLARE_EMAIL=foo@bar.baz CLOUDFLARE_API_KEY=blah"`, using your the email address of your Cloudflare account and your Global API key--the newer API tokens aren't currently supported.
+ 
+In addition, there are some other options which have sensible defaults, but can be adjusted if needed.  These are:
+
+* JAIL_NAME: The name of the jail, defaults to "nextcloud"
+* DB_PATH, FILES_PATH, and PORTS_PATH: These are the paths to your database files, your data files, and the FreeBSD Ports collection.  They default to $POOL_PATH/db, $POOL_PATH/files, and $POOL_PATH/portsnap, respectively.
+* DATABASE: Which database management system to use.  Default is "mariadb", but can be set to "pgsql" if you prefer to use PostgreSQL.
+* INTERFACE: The network interface to use for the jail.  Defaults to `vnet0`.
+* VNET: Whether to use the iocage virtual network stack.  Defaults to `on`.
+
+If you're going to open ports 80 and 443 from the outside world to your jail, do so before running the script, and set STANDALONE_CERT to 1.  If not, but you use a DNS provider that's supported by Caddy, set DNS_CERT to 1.  If neither of these is true, you won't be able to use this script without modification.
+
+It's also helpful if HOST_NAME resolves to your jail from **inside** your network.  You'll probably need to configure this on your router.  If it doesn't, you'll still be able to reach your Nextcloud installation via the jail's IP address, but you'll get certificate errors that way.
+
+### Execution
+Once you've downloaded the script and prepared the configuration file, run this script (`./nextcloud-jail.sh`).  The script will run for several minutes.  When it finishes, your jail will be created, Nextcloud will be installed and configured, and you'll be shown the randomly-generated password for the default user ("admin").  You can then log in and create users, add data, and generally do whatever else you like.
+
+### Obtaining a trusted Let's Encrypt cert
+This configuration generated by this script will obtain certs from a non-trusted certificate authority by default.  This is to prevent you from exhausting the [Let's Encrypt rate limits](https://letsencrypt.org/docs/rate-limits/) while you're testing things out.  Once you're sure things are working, you'll want to get a trusted cert instead.  To do this, you can use a simple script that's included.  As long as you haven't changed the default jail name, you can do this by running `iocage exec nextcloud /root/remove-staging.sh`.
+
+### To Do
+I'd appreciate any suggestions (or, better yet, pull requests) to improve the various config files I'm using.  Most of them are adapted from the default configuration files that ship with the software in question, and have only been lightly edited to work in this application.  But if there are changes to settings or organization that could improve performance, reliability, or security, I'd like to hear about them.
diff --git a/jails/nextcloud/includes/Caddyfile b/jails/nextcloud/includes/Caddyfile
new file mode 100755
index 00000000..1f815a22
--- /dev/null
+++ b/jails/nextcloud/includes/Caddyfile
@@ -0,0 +1,127 @@
+yourhostnamehere JAIL-IP {
+
+	root   /usr/local/www/nextcloud
+	log    /var/log/nextcloud_access.log
+	errors /var/log/nextcloud_errors.log
+
+	tls {
+		ca https://acme-staging-v02.api.letsencrypt.org/directory
+		DNS-PLACEHOLDER
+	}
+
+	fastcgi / 127.0.0.1:9000 php {
+		env PATH /bin
+		env modHeadersAvailable true
+		env front_controller_active true
+		connect_timeout 60s
+		read_timeout 3600s
+		send_timeout 300s
+	}
+
+	header / {
+		Strict-Transport-Security		"max-age=15768000;"
+		X-Content-Type-Options			"nosniff"
+		X-XSS-Protection			"1; mode=block"
+		X-Robots-Tag				"none"
+		X-Download-Options			"noopen"
+		X-Permitted-Cross-Domain-Policies	"none"
+		X-Frame-Options "SAMEORIGIN"
+		Referrer-Policy				"no-referrer"
+	}
+
+	header /core/fonts {
+		Cache-Control				"max-age=604800"
+	}
+
+	# checks for images
+	rewrite {
+		ext .png .html .ttf .ico .jpg .jpeg .css .js .woff .woff2 .svg .gif .map
+		r ^/index.php/.*$
+		to /{1} /index.php?{query}
+	}
+	
+	rewrite {
+                r ^/\.well-known/host-meta$
+                to /public.php?service=host-meta&{query}
+        }
+	rewrite {
+                r ^/\.well-known/host-meta\.json$
+                to /public.php?service=host-meta-json&{query}
+        }
+	rewrite {
+                r ^/\.well-known/webfinger$
+                to /public.php?service=webfinger&{query}
+        }
+
+	rewrite {
+		r ^/index.php/.*$
+		to /index.php?{query}
+	}
+
+	rewrite / {
+		if {path} not_starts_with /remote.php
+		if {path} not_starts_with /public.php
+		ext .png .html .ttf .ico .jpg .jpeg .css .js .woff .woff2 .svg .gif .map .html .ttf 
+		r ^/(.*)$
+		to /{1} /index.php{uri}
+	}
+
+	rewrite / {
+		if {path} not /core/img/favicon.ico
+		if {path} not /core/img/manifest.json
+		if {path} not_starts_with /remote.php
+		if {path} not_starts_with /public.php
+		if {path} not_starts_with /cron.php
+		if {path} not_starts_with /core/ajax/update.php
+		if {path} not_starts_with /status.php
+		if {path} not_starts_with /ocs/v1.php
+		if {path} not_starts_with /ocs/v2.php
+		if {path} not /robots.txt
+		if {path} not_starts_with /updater/
+		if {path} not_starts_with /ocs-provider/
+		if {path} not_starts_with /ocm-provider/ 
+		if {path} not_starts_with /.well-known/
+		to /index.php{uri}
+	}
+
+	# client support (e.g. os x calendar / contacts)
+	redir /.well-known/carddav /remote.php/carddav 301
+	redir /.well-known/caldav /remote.php/caldav 301
+
+	# remove trailing / as it causes errors with php-fpm
+	rewrite {
+		r ^/remote.php/(webdav|caldav|carddav|dav)(\/?)(\/?)$
+		to /remote.php/{1}
+	}
+
+	rewrite {
+		r ^/remote.php/(webdav|caldav|carddav|dav)/(.+?)(\/?)(\/?)$
+		to /remote.php/{1}/{2}
+	}
+
+	rewrite {
+		r ^/public.php/(dav|webdav|caldav|carddav)(\/?)(\/?)$
+		to /public.php/{1}
+	}
+
+	rewrite {
+		r ^/public.php/(dav|webdav|caldav|carddav)/(.+)(\/?)(\/?)$
+		to /public.php/{1}/{2}
+	}
+
+	# .htaccess / data / config / ... shouldn't be accessible from outside
+	status 404 {
+		/.htaccess
+		/data
+		/config
+		/db_structure
+		/.xml
+		/README
+		/3rdparty
+		/lib
+		/templates
+		/occ
+		/console.php
+	}
+
+}
diff --git a/jails/nextcloud/includes/Caddyfile-nossl b/jails/nextcloud/includes/Caddyfile-nossl
new file mode 100755
index 00000000..5c5ec5d9
--- /dev/null
+++ b/jails/nextcloud/includes/Caddyfile-nossl
@@ -0,0 +1,122 @@
+yourhostnamehere:80 JAIL-IP:80 {
+
+	root   /usr/local/www/nextcloud
+	log    /var/log/nextcloud_access.log
+	errors /var/log/nextcloud_errors.log
+
+	fastcgi / 127.0.0.1:9000 php {
+		env PATH /bin
+		env modHeadersAvailable true
+		env front_controller_active true
+		connect_timeout 60s
+		read_timeout 3600s
+		send_timeout 300s
+	}
+
+	header / {
+		Strict-Transport-Security		"max-age=15768000;"
+		X-Content-Type-Options			"nosniff"
+		X-XSS-Protection			"1; mode=block"
+		X-Robots-Tag				"none"
+		X-Download-Options			"noopen"
+		X-Permitted-Cross-Domain-Policies	"none"
+		X-Frame-Options "SAMEORIGIN"
+		Referrer-Policy				"no-referrer"
+	}
+
+	header /core/fonts {
+		Cache-Control				"max-age=604800"
+	}
+
+	# checks for images
+	rewrite {
+		ext .png .html .ttf .ico .jpg .jpeg .css .js .woff .woff2 .svg .gif .map
+		r ^/index.php/.*$
+		to /{1} /index.php?{query}
+	}
+	
+	rewrite {
+                r ^/\.well-known/host-meta$
+                to /public.php?service=host-meta&{query}
+        }
+	rewrite {
+                r ^/\.well-known/host-meta\.json$
+                to /public.php?service=host-meta-json&{query}
+        }
+	rewrite {
+                r ^/\.well-known/webfinger$
+                to /public.php?service=webfinger&{query}
+        }
+
+	rewrite {
+		r ^/index.php/.*$
+		to /index.php?{query}
+	}
+
+	rewrite / {
+		if {path} not_starts_with /remote.php
+		if {path} not_starts_with /public.php
+		ext .png .html .ttf .ico .jpg .jpeg .css .js .woff .woff2 .svg .gif .map .html .ttf 
+		r ^/(.*)$
+		to /{1} /index.php{uri}
+	}
+
+	rewrite / {
+		if {path} not /core/img/favicon.ico
+		if {path} not /core/img/manifest.json
+		if {path} not_starts_with /remote.php
+		if {path} not_starts_with /public.php
+		if {path} not_starts_with /cron.php
+		if {path} not_starts_with /core/ajax/update.php
+		if {path} not_starts_with /status.php
+		if {path} not_starts_with /ocs/v1.php
+		if {path} not_starts_with /ocs/v2.php
+		if {path} not /robots.txt
+		if {path} not_starts_with /updater/
+		if {path} not_starts_with /ocs-provider/
+		if {path} not_starts_with /ocm-provider/ 
+		if {path} not_starts_with /.well-known/
+		to /index.php{uri}
+	}
+
+	# client support (e.g. os x calendar / contacts)
+	redir /.well-known/carddav /remote.php/carddav 301
+	redir /.well-known/caldav /remote.php/caldav 301
+
+	# remove trailing / as it causes errors with php-fpm
+	rewrite {
+		r ^/remote.php/(webdav|caldav|carddav|dav)(\/?)(\/?)$
+		to /remote.php/{1}
+	}
+
+	rewrite {
+		r ^/remote.php/(webdav|caldav|carddav|dav)/(.+?)(\/?)(\/?)$
+		to /remote.php/{1}/{2}
+	}
+
+	rewrite {
+		r ^/public.php/(dav|webdav|caldav|carddav)(\/?)(\/?)$
+		to /public.php/{1}
+	}
+
+	rewrite {
+		r ^/public.php/(dav|webdav|caldav|carddav)/(.+)(\/?)(\/?)$
+		to /public.php/{1}/{2}
+	}
+
+	# .htaccess / data / config / ... shouldn't be accessible from outside
+	status 404 {
+		/.htaccess
+		/data
+		/config
+		/db_structure
+		/.xml
+		/README
+		/3rdparty
+		/lib
+		/templates
+		/occ
+		/console.php
+	}
+
+}
diff --git a/jails/nextcloud/includes/Caddyfile-selfsigned b/jails/nextcloud/includes/Caddyfile-selfsigned
new file mode 100755
index 00000000..133f11e6
--- /dev/null
+++ b/jails/nextcloud/includes/Caddyfile-selfsigned
@@ -0,0 +1,128 @@
+http://yourhostnamehere http://JAIL-IP {
+	redir https://yourhostnamehere{uri}
+}
+
+https://yourhostnamehere https://JAIL-IP {
+
+	root   /usr/local/www/nextcloud
+	log    /var/log/nextcloud_access.log
+	errors /var/log/nextcloud_errors.log
+
+	tls /config/ssl/fullchain.pem /config/ssl/privkey.pem
+
+	fastcgi / 127.0.0.1:9000 php {
+		env PATH /bin
+		env modHeadersAvailable true
+		env front_controller_active true
+		connect_timeout 60s
+		read_timeout 3600s
+		send_timeout 300s
+	}
+
+	header / {
+		Strict-Transport-Security		"max-age=15768000;"
+		X-Content-Type-Options			"nosniff"
+		X-XSS-Protection			"1; mode=block"
+		X-Robots-Tag				"none"
+		X-Download-Options			"noopen"
+		X-Permitted-Cross-Domain-Policies	"none"
+		X-Frame-Options "SAMEORIGIN"
+		Referrer-Policy				"no-referrer"
+	}
+
+	header /core/fonts {
+		Cache-Control				"max-age=604800"
+	}
+
+	# checks for images
+	rewrite {
+		ext .png .html .ttf .ico .jpg .jpeg .css .js .woff .woff2 .svg .gif .map
+		r ^/index.php/.*$
+		to /{1} /index.php?{query}
+	}
+	
+	rewrite {
+                r ^/\.well-known/host-meta$
+                to /public.php?service=host-meta&{query}
+        }
+	rewrite {
+                r ^/\.well-known/host-meta\.json$
+                to /public.php?service=host-meta-json&{query}
+        }
+	rewrite {
+                r ^/\.well-known/webfinger$
+                to /public.php?service=webfinger&{query}
+        }
+
+	rewrite {
+		r ^/index.php/.*$
+		to /index.php?{query}
+	}
+
+	rewrite / {
+		if {path} not_starts_with /remote.php
+		if {path} not_starts_with /public.php
+		ext .png .html .ttf .ico .jpg .jpeg .css .js .woff .woff2 .svg .gif .map .html .ttf 
+		r ^/(.*)$
+		to /{1} /index.php{uri}
+	}
+
+	rewrite / {
+		if {path} not /core/img/favicon.ico
+		if {path} not /core/img/manifest.json
+		if {path} not_starts_with /remote.php
+		if {path} not_starts_with /public.php
+		if {path} not_starts_with /cron.php
+		if {path} not_starts_with /core/ajax/update.php
+		if {path} not_starts_with /status.php
+		if {path} not_starts_with /ocs/v1.php
+		if {path} not_starts_with /ocs/v2.php
+		if {path} not /robots.txt
+		if {path} not_starts_with /updater/
+		if {path} not_starts_with /ocs-provider/
+		if {path} not_starts_with /ocm-provider/ 
+		if {path} not_starts_with /.well-known/
+		to /index.php{uri}
+	}
+
+	# client support (e.g. os x calendar / contacts)
+	redir /.well-known/carddav /remote.php/carddav 301
+	redir /.well-known/caldav /remote.php/caldav 301
+
+	# remove trailing / as it causes errors with php-fpm
+	rewrite {
+		r ^/remote.php/(webdav|caldav|carddav|dav)(\/?)(\/?)$
+		to /remote.php/{1}
+	}
+
+	rewrite {
+		r ^/remote.php/(webdav|caldav|carddav|dav)/(.+?)(\/?)(\/?)$
+		to /remote.php/{1}/{2}
+	}
+
+	rewrite {
+		r ^/public.php/(dav|webdav|caldav|carddav)(\/?)(\/?)$
+		to /public.php/{1}
+	}
+
+	rewrite {
+		r ^/public.php/(dav|webdav|caldav|carddav)/(.+)(\/?)(\/?)$
+		to /public.php/{1}/{2}
+	}
+
+	# .htaccess / data / config / ... shouldn't be accessible from outside
+	status 404 {
+		/.htaccess
+		/data
+		/config
+		/db_structure
+		/.xml
+		/README
+		/3rdparty
+		/lib
+		/templates
+		/occ
+		/console.php
+	}
+
+}
diff --git a/jails/nextcloud/includes/caddy b/jails/nextcloud/includes/caddy
new file mode 100755
index 00000000..f7a9b1e4
--- /dev/null
+++ b/jails/nextcloud/includes/caddy
@@ -0,0 +1,83 @@
+#!/bin/sh
+#
+# PROVIDE: caddy
+# REQUIRE: networking
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable caddy:
+# caddy_enable (bool):        Set to "NO" by default.
+#                             Set it to "YES" to enable caddy
+#
+# caddy_cert_email (str):     Set to "" by default.
+#                             Defines the SSL certificate issuer email. By providing an
+#                             email address you automatically agree to letsencrypt.org's
+#                             general terms and conditions
+#
+# caddy_bin_path (str):       Set to "/usr/local/bin/caddy" by default.
+#                             Provides the path to the caddy server executable
+#
+# caddy_cpu (str):            Set to "99%" by default.
+#                             Configures, how much CPU capacity caddy may gain
+#
+# caddy_config_path (str):    Set to "/usr/local/www/Caddyfile" by default.
+#                             Defines the path for the configuration file caddy will load on boot
+#
+# caddy_user (str):           Set to "root" by default.
+#                             Defines the user that caddy will run on
+#
+# caddy_group (str):          Set to "wheel" by default.
+#                             Defines the group that caddy files will be attached to
+#
+# caddy_logfile (str)         Set to "/var/log/caddy.log" by default.
+#                             Defines where the process log file is written, this is not a web access log
+#
+# caddy_env (str)             Set to "" by default.
+#                             This allows environment variable to be set that may be required, for example when using "DNS Challenge" account credentials are required.
+#                             e.g. (in your rc.conf)   caddy_env="CLOUDFLARE_EMAIL=me@domain.com CLOUDFLARE_API_KEY=my_api_key"
+#
+
+. /etc/rc.subr                                           
+
+name="caddy"
+rcvar="${name}_enable"
+
+load_rc_config ${name}
+
+: ${caddy_enable:="NO"}
+: ${caddy_cert_email=""}
+: ${caddy_bin_path="/usr/local/bin/caddy"}
+: ${caddy_cpu="99%"} # was a bug for me that caused a crash within jails
+: ${caddy_config_path="/usr/local/www/Caddyfile"}
+: ${caddy_logfile="/var/log/caddy.log"}
+: ${caddy_user="root"}
+: ${caddy_group="wheel"}
+: ${caddy_SNI_default=""}
+
+if [ "$caddy_cert_email" = "" ]
+then
+    echo "rc variable \$caddy_cert_email is not set. Please provide a valid SSL certificate issuer email."
+    exit 1
+fi
+
+pidfile="/var/run/${name}.pid"
+procname="${caddy_bin_path}" #enabled builtin pid checking for start / stop
+command="/usr/sbin/daemon"
+command_args="-p ${pidfile} /usr/bin/env ${caddy_env} ${procname} -cpu ${caddy_cpu} -log stdout -conf ${caddy_config_path} -agree -email ${caddy_cert_email} < /dev/null >> ${caddy_logfile} 2>&1"
+
+start_precmd="caddy_startprecmd"
+
+caddy_startprecmd()
+{
+        if [ ! -e "${pidfile}" ]; then
+                install -o "${caddy_user}" -g "${caddy_group}" "/dev/null" "${pidfile}"
+        fi
+
+        if [ ! -e "${caddy_logfile}" ]; then
+                install -o "${caddy_user}" -g "${caddy_group}" "/dev/null" "${caddy_logfile}"
+        fi
+}
+
+required_files="${caddy_config_path}"
+
+run_rc_command "$1"
diff --git a/jails/nextcloud/includes/my-system.cnf b/jails/nextcloud/includes/my-system.cnf
new file mode 100755
index 00000000..44ba3c28
--- /dev/null
+++ b/jails/nextcloud/includes/my-system.cnf
@@ -0,0 +1,4 @@
+[mysqld]
+innodb_file_per_table=1
+transaction_isolation = READ-COMMITTED
+binlog_format = ROW
diff --git a/jails/nextcloud/includes/my.cnf b/jails/nextcloud/includes/my.cnf
new file mode 100755
index 00000000..77b7660a
--- /dev/null
+++ b/jails/nextcloud/includes/my.cnf
@@ -0,0 +1,3 @@
+# MySQL client config file
+[client]
+password=mypassword
diff --git a/jails/nextcloud/includes/pgpass b/jails/nextcloud/includes/pgpass
new file mode 100755
index 00000000..6fdcbc63
--- /dev/null
+++ b/jails/nextcloud/includes/pgpass
@@ -0,0 +1,2 @@
+*:*:*:root:mypassword
+*:*:*:postgres:mypassword
diff --git a/jails/nextcloud/includes/php.ini b/jails/nextcloud/includes/php.ini
new file mode 100755
index 00000000..df3c34a7
--- /dev/null
+++ b/jails/nextcloud/includes/php.ini
@@ -0,0 +1,1915 @@
+[PHP]
+
+;;;;;;;;;;;;;;;;;;;
+; About php.ini   ;
+;;;;;;;;;;;;;;;;;;;
+; PHP's initialization file, generally called php.ini, is responsible for
+; configuring many of the aspects of PHP's behavior.
+
+; PHP attempts to find and load this configuration from a number of locations.
+; The following is a summary of its search order:
+; 1. SAPI module specific location.
+; 2. The PHPRC environment variable. (As of PHP 5.2.0)
+; 3. A number of predefined registry keys on Windows (As of PHP 5.2.0)
+; 4. Current working directory (except CLI)
+; 5. The web server's directory (for SAPI modules), or directory of PHP
+; (otherwise in Windows)
+; 6. The directory from the --with-config-file-path compile time option, or the
+; Windows directory (C:\windows or C:\winnt)
+; See the PHP docs for more specific information.
+; http://php.net/configuration.file
+
+; The syntax of the file is extremely simple.  Whitespace and lines
+; beginning with a semicolon are silently ignored (as you probably guessed).
+; Section headers (e.g. [Foo]) are also silently ignored, even though
+; they might mean something in the future.
+
+; Directives following the section heading [PATH=/www/mysite] only
+; apply to PHP files in the /www/mysite directory.  Directives
+; following the section heading [HOST=www.example.com] only apply to
+; PHP files served from www.example.com.  Directives set in these
+; special sections cannot be overridden by user-defined INI files or
+; at runtime. Currently, [PATH=] and [HOST=] sections only work under
+; CGI/FastCGI.
+; http://php.net/ini.sections
+
+; Directives are specified using the following syntax:
+; directive = value
+; Directive names are *case sensitive* - foo=bar is different from FOO=bar.
+; Directives are variables used to configure PHP or PHP extensions.
+; There is no name validation.  If PHP can't find an expected
+; directive because it is not set or is mistyped, a default value will be used.
+
+; The value can be a string, a number, a PHP constant (e.g. E_ALL or M_PI), one
+; of the INI constants (On, Off, True, False, Yes, No and None) or an expression
+; (e.g. E_ALL & ~E_NOTICE), a quoted string ("bar"), or a reference to a
+; previously set variable or directive (e.g. ${foo})
+
+; Expressions in the INI file are limited to bitwise operators and parentheses:
+; |  bitwise OR
+; ^  bitwise XOR
+; &  bitwise AND
+; ~  bitwise NOT
+; !  boolean NOT
+
+; Boolean flags can be turned on using the values 1, On, True or Yes.
+; They can be turned off using the values 0, Off, False or No.
+
+; An empty string can be denoted by simply not writing anything after the equal
+; sign, or by using the None keyword:
+
+;  foo =         ; sets foo to an empty string
+;  foo = None    ; sets foo to an empty string
+;  foo = "None"  ; sets foo to the string 'None'
+
+; If you use constants in your value, and these constants belong to a
+; dynamically loaded extension (either a PHP extension or a Zend extension),
+; you may only use these constants *after* the line that loads the extension.
+
+;;;;;;;;;;;;;;;;;;;
+; About this file ;
+;;;;;;;;;;;;;;;;;;;
+; PHP comes packaged with two INI files. One that is recommended to be used
+; in production environments and one that is recommended to be used in
+; development environments.
+
+; php.ini-production contains settings which hold security, performance and
+; best practices at its core. But please be aware, these settings may break
+; compatibility with older or less security conscience applications. We
+; recommending using the production ini in production and testing environments.
+
+; php.ini-development is very similar to its production variant, except it is
+; much more verbose when it comes to errors. We recommend using the
+; development version only in development environments, as errors shown to
+; application users can inadvertently leak otherwise secure information.
+
+; This is php.ini-production INI file.
+
+;;;;;;;;;;;;;;;;;;;
+; Quick Reference ;
+;;;;;;;;;;;;;;;;;;;
+; The following are all the settings which are different in either the production
+; or development versions of the INIs with respect to PHP's default behavior.
+; Please see the actual settings later in the document for more details as to why
+; we recommend these changes in PHP's behavior.
+
+; display_errors
+;   Default Value: On
+;   Development Value: On
+;   Production Value: Off
+
+; display_startup_errors
+;   Default Value: Off
+;   Development Value: On
+;   Production Value: Off
+
+; error_reporting
+;   Default Value: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED
+;   Development Value: E_ALL
+;   Production Value: E_ALL & ~E_DEPRECATED & ~E_STRICT
+
+; html_errors
+;   Default Value: On
+;   Development Value: On
+;   Production value: On
+
+; log_errors
+;   Default Value: Off
+;   Development Value: On
+;   Production Value: On
+
+; max_input_time
+;   Default Value: -1 (Unlimited)
+;   Development Value: 60 (60 seconds)
+;   Production Value: 60 (60 seconds)
+
+; output_buffering
+;   Default Value: Off
+;   Development Value: 4096
+;   Production Value: 4096
+
+; register_argc_argv
+;   Default Value: On
+;   Development Value: Off
+;   Production Value: Off
+
+; request_order
+;   Default Value: None
+;   Development Value: "GP"
+;   Production Value: "GP"
+
+; session.gc_divisor
+;   Default Value: 100
+;   Development Value: 1000
+;   Production Value: 1000
+
+; session.sid_bits_per_character
+;   Default Value: 4
+;   Development Value: 5
+;   Production Value: 5
+
+; short_open_tag
+;   Default Value: On
+;   Development Value: Off
+;   Production Value: Off
+
+; track_errors
+;   Default Value: Off
+;   Development Value: On
+;   Production Value: Off
+
+; variables_order
+;   Default Value: "EGPCS"
+;   Development Value: "GPCS"
+;   Production Value: "GPCS"
+
+;;;;;;;;;;;;;;;;;;;;
+; php.ini Options  ;
+;;;;;;;;;;;;;;;;;;;;
+; Name for user-defined php.ini (.htaccess) files. Default is ".user.ini"
+;user_ini.filename = ".user.ini"
+
+; To disable this feature set this option to empty value
+;user_ini.filename =
+
+; TTL for user-defined php.ini files (time-to-live) in seconds. Default is 300 seconds (5 minutes)
+;user_ini.cache_ttl = 300
+
+;;;;;;;;;;;;;;;;;;;;
+; Language Options ;
+;;;;;;;;;;;;;;;;;;;;
+
+; Enable the PHP scripting language engine under Apache.
+; http://php.net/engine
+engine = On
+
+; This directive determines whether or not PHP will recognize code between
+; <? and ?> tags as PHP source which should be processed as such. It is
+; generally recommended that <?php and ?> should be used and that this feature
+; should be disabled, as enabling it may result in issues when generating XML
+; documents, however this remains supported for backward compatibility reasons.
+; Note that this directive does not control the <?= shorthand tag, which can be
+; used regardless of this directive.
+; Default Value: On
+; Development Value: Off
+; Production Value: Off
+; http://php.net/short-open-tag
+short_open_tag = Off
+
+; The number of significant digits displayed in floating point numbers.
+; http://php.net/precision
+precision = 14
+
+; Output buffering is a mechanism for controlling how much output data
+; (excluding headers and cookies) PHP should keep internally before pushing that
+; data to the client. If your application's output exceeds this setting, PHP
+; will send that data in chunks of roughly the size you specify.
+; Turning on this setting and managing its maximum buffer size can yield some
+; interesting side-effects depending on your application and web server.
+; You may be able to send headers and cookies after you've already sent output
+; through print or echo. You also may see performance benefits if your server is
+; emitting less packets due to buffered output versus PHP streaming the output
+; as it gets it. On production servers, 4096 bytes is a good setting for performance
+; reasons.
+; Note: Output buffering can also be controlled via Output Buffering Control
+;   functions.
+; Possible Values:
+;   On = Enabled and buffer is unlimited. (Use with caution)
+;   Off = Disabled
+;   Integer = Enables the buffer and sets its maximum size in bytes.
+; Note: This directive is hardcoded to Off for the CLI SAPI
+; Default Value: Off
+; Development Value: 4096
+; Production Value: 4096
+; http://php.net/output-buffering
+output_buffering = 4096
+
+; You can redirect all of the output of your scripts to a function.  For
+; example, if you set output_handler to "mb_output_handler", character
+; encoding will be transparently converted to the specified encoding.
+; Setting any output handler automatically turns on output buffering.
+; Note: People who wrote portable scripts should not depend on this ini
+;   directive. Instead, explicitly set the output handler using ob_start().
+;   Using this ini directive may cause problems unless you know what script
+;   is doing.
+; Note: You cannot use both "mb_output_handler" with "ob_iconv_handler"
+;   and you cannot use both "ob_gzhandler" and "zlib.output_compression".
+; Note: output_handler must be empty if this is set 'On' !!!!
+;   Instead you must use zlib.output_handler.
+; http://php.net/output-handler
+;output_handler =
+
+; URL rewriter function rewrites URL on the fly by using
+; output buffer. You can set target tags by this configuration.
+; "form" tag is special tag. It will add hidden input tag to pass values.
+; Refer to session.trans_sid_tags for usage.
+; Default Value: "form="
+; Development Value: "form="
+; Production Value: "form="
+;url_rewriter.tags
+
+; URL rewriter will not rewrites absolute URL nor form by default. To enable
+; absolute URL rewrite, allowed hosts must be defined at RUNTIME.
+; Refer to session.trans_sid_hosts for more details.
+; Default Value: ""
+; Development Value: ""
+; Production Value: ""
+;url_rewriter.hosts
+
+; Transparent output compression using the zlib library
+; Valid values for this option are 'off', 'on', or a specific buffer size
+; to be used for compression (default is 4KB)
+; Note: Resulting chunk size may vary due to nature of compression. PHP
+;   outputs chunks that are few hundreds bytes each as a result of
+;   compression. If you prefer a larger chunk size for better
+;   performance, enable output_buffering in addition.
+; Note: You need to use zlib.output_handler instead of the standard
+;   output_handler, or otherwise the output will be corrupted.
+; http://php.net/zlib.output-compression
+zlib.output_compression = Off
+
+; http://php.net/zlib.output-compression-level
+;zlib.output_compression_level = -1
+
+; You cannot specify additional output handlers if zlib.output_compression
+; is activated here. This setting does the same as output_handler but in
+; a different order.
+; http://php.net/zlib.output-handler
+;zlib.output_handler =
+
+; Implicit flush tells PHP to tell the output layer to flush itself
+; automatically after every output block.  This is equivalent to calling the
+; PHP function flush() after each and every call to print() or echo() and each
+; and every HTML block.  Turning this option on has serious performance
+; implications and is generally recommended for debugging purposes only.
+; http://php.net/implicit-flush
+; Note: This directive is hardcoded to On for the CLI SAPI
+implicit_flush = Off
+
+; The unserialize callback function will be called (with the undefined class'
+; name as parameter), if the unserializer finds an undefined class
+; which should be instantiated. A warning appears if the specified function is
+; not defined, or if the function doesn't include/implement the missing class.
+; So only set this entry, if you really want to implement such a
+; callback-function.
+unserialize_callback_func =
+
+; When floats & doubles are serialized, store serialize_precision significant
+; digits after the floating point. The default value ensures that when floats
+; are decoded with unserialize, the data will remain the same.
+; The value is also used for json_encode when encoding double values.
+; If -1 is used, then dtoa mode 0 is used which automatically select the best
+; precision.
+serialize_precision = -1
+
+; open_basedir, if set, limits all file operations to the defined directory
+; and below.  This directive makes most sense if used in a per-directory
+; or per-virtualhost web server configuration file.
+; http://php.net/open-basedir
+;open_basedir =
+
+; This directive allows you to disable certain functions for security reasons.
+; It receives a comma-delimited list of function names.
+; http://php.net/disable-functions
+disable_functions =
+
+; This directive allows you to disable certain classes for security reasons.
+; It receives a comma-delimited list of class names.
+; http://php.net/disable-classes
+disable_classes =
+
+; Colors for Syntax Highlighting mode.  Anything that's acceptable in
+; <span style="color: ???????"> would work.
+; http://php.net/syntax-highlighting
+;highlight.string  = #DD0000
+;highlight.comment = #FF9900
+;highlight.keyword = #007700
+;highlight.default = #0000BB
+;highlight.html    = #000000
+
+; If enabled, the request will be allowed to complete even if the user aborts
+; the request. Consider enabling it if executing long requests, which may end up
+; being interrupted by the user or a browser timing out. PHP's default behavior
+; is to disable this feature.
+; http://php.net/ignore-user-abort
+;ignore_user_abort = On
+
+; Determines the size of the realpath cache to be used by PHP. This value should
+; be increased on systems where PHP opens many files to reflect the quantity of
+; the file operations performed.
+; http://php.net/realpath-cache-size
+;realpath_cache_size = 4096k
+
+; Duration of time, in seconds for which to cache realpath information for a given
+; file or directory. For systems with rarely changing files, consider increasing this
+; value.
+; http://php.net/realpath-cache-ttl
+;realpath_cache_ttl = 120
+
+; Enables or disables the circular reference collector.
+; http://php.net/zend.enable-gc
+zend.enable_gc = On
+
+; If enabled, scripts may be written in encodings that are incompatible with
+; the scanner.  CP936, Big5, CP949 and Shift_JIS are the examples of such
+; encodings.  To use this feature, mbstring extension must be enabled.
+; Default: Off
+;zend.multibyte = Off
+
+; Allows to set the default encoding for the scripts.  This value will be used
+; unless "declare(encoding=...)" directive appears at the top of the script.
+; Only affects if zend.multibyte is set.
+; Default: ""
+;zend.script_encoding =
+
+;;;;;;;;;;;;;;;;;
+; Miscellaneous ;
+;;;;;;;;;;;;;;;;;
+
+; Decides whether PHP may expose the fact that it is installed on the server
+; (e.g. by adding its signature to the Web server header).  It is no security
+; threat in any way, but it makes it possible to determine whether you use PHP
+; on your server or not.
+; http://php.net/expose-php
+expose_php = On
+
+;;;;;;;;;;;;;;;;;;;
+; Resource Limits ;
+;;;;;;;;;;;;;;;;;;;
+
+; Maximum execution time of each script, in seconds
+; http://php.net/max-execution-time
+; Note: This directive is hardcoded to 0 for the CLI SAPI
+max_execution_time = 3600
+
+; Maximum amount of time each script may spend parsing request data. It's a good
+; idea to limit this time on productions servers in order to eliminate unexpectedly
+; long running scripts.
+; Note: This directive is hardcoded to -1 for the CLI SAPI
+; Default Value: -1 (Unlimited)
+; Development Value: 60 (60 seconds)
+; Production Value: 60 (60 seconds)
+; http://php.net/max-input-time
+max_input_time = 3600
+
+; Maximum input variable nesting level
+; http://php.net/max-input-nesting-level
+;max_input_nesting_level = 64
+
+; How many GET/POST/COOKIE input variables may be accepted
+; max_input_vars = 1000
+
+; Maximum amount of memory a script may consume (128MB)
+; http://php.net/memory-limit
+memory_limit = 512M
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Error handling and logging ;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+; This directive informs PHP of which errors, warnings and notices you would like
+; it to take action for. The recommended way of setting values for this
+; directive is through the use of the error level constants and bitwise
+; operators. The error level constants are below here for convenience as well as
+; some common settings and their meanings.
+; By default, PHP is set to take action on all errors, notices and warnings EXCEPT
+; those related to E_NOTICE and E_STRICT, which together cover best practices and
+; recommended coding standards in PHP. For performance reasons, this is the
+; recommend error reporting setting. Your production server shouldn't be wasting
+; resources complaining about best practices and coding standards. That's what
+; development servers and development settings are for.
+; Note: The php.ini-development file has this setting as E_ALL. This
+; means it pretty much reports everything which is exactly what you want during
+; development and early testing.
+;
+; Error Level Constants:
+; E_ALL             - All errors and warnings (includes E_STRICT as of PHP 5.4.0)
+; E_ERROR           - fatal run-time errors
+; E_RECOVERABLE_ERROR  - almost fatal run-time errors
+; E_WARNING         - run-time warnings (non-fatal errors)
+; E_PARSE           - compile-time parse errors
+; E_NOTICE          - run-time notices (these are warnings which often result
+;                     from a bug in your code, but it's possible that it was
+;                     intentional (e.g., using an uninitialized variable and
+;                     relying on the fact it is automatically initialized to an
+;                     empty string)
+; E_STRICT          - run-time notices, enable to have PHP suggest changes
+;                     to your code which will ensure the best interoperability
+;                     and forward compatibility of your code
+; E_CORE_ERROR      - fatal errors that occur during PHP's initial startup
+; E_CORE_WARNING    - warnings (non-fatal errors) that occur during PHP's
+;                     initial startup
+; E_COMPILE_ERROR   - fatal compile-time errors
+; E_COMPILE_WARNING - compile-time warnings (non-fatal errors)
+; E_USER_ERROR      - user-generated error message
+; E_USER_WARNING    - user-generated warning message
+; E_USER_NOTICE     - user-generated notice message
+; E_DEPRECATED      - warn about code that will not work in future versions
+;                     of PHP
+; E_USER_DEPRECATED - user-generated deprecation warnings
+;
+; Common Values:
+;   E_ALL (Show all errors, warnings and notices including coding standards.)
+;   E_ALL & ~E_NOTICE  (Show all errors, except for notices)
+;   E_ALL & ~E_NOTICE & ~E_STRICT  (Show all errors, except for notices and coding standards warnings.)
+;   E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR  (Show only errors)
+; Default Value: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED
+; Development Value: E_ALL
+; Production Value: E_ALL & ~E_DEPRECATED & ~E_STRICT
+; http://php.net/error-reporting
+error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT
+
+; This directive controls whether or not and where PHP will output errors,
+; notices and warnings too. Error output is very useful during development, but
+; it could be very dangerous in production environments. Depending on the code
+; which is triggering the error, sensitive information could potentially leak
+; out of your application such as database usernames and passwords or worse.
+; For production environments, we recommend logging errors rather than
+; sending them to STDOUT.
+; Possible Values:
+;   Off = Do not display any errors
+;   stderr = Display errors to STDERR (affects only CGI/CLI binaries!)
+;   On or stdout = Display errors to STDOUT
+; Default Value: On
+; Development Value: On
+; Production Value: Off
+; http://php.net/display-errors
+display_errors = Off
+
+; The display of errors which occur during PHP's startup sequence are handled
+; separately from display_errors. PHP's default behavior is to suppress those
+; errors from clients. Turning the display of startup errors on can be useful in
+; debugging configuration problems. We strongly recommend you
+; set this to 'off' for production servers.
+; Default Value: Off
+; Development Value: On
+; Production Value: Off
+; http://php.net/display-startup-errors
+display_startup_errors = Off
+
+; Besides displaying errors, PHP can also log errors to locations such as a
+; server-specific log, STDERR, or a location specified by the error_log
+; directive found below. While errors should not be displayed on productions
+; servers they should still be monitored and logging is a great way to do that.
+; Default Value: Off
+; Development Value: On
+; Production Value: On
+; http://php.net/log-errors
+log_errors = On
+
+; Set maximum length of log_errors. In error_log information about the source is
+; added. The default is 1024 and 0 allows to not apply any maximum length at all.
+; http://php.net/log-errors-max-len
+log_errors_max_len = 1024
+
+; Do not log repeated messages. Repeated errors must occur in same file on same
+; line unless ignore_repeated_source is set true.
+; http://php.net/ignore-repeated-errors
+ignore_repeated_errors = Off
+
+; Ignore source of message when ignoring repeated messages. When this setting
+; is On you will not log errors with repeated messages from different files or
+; source lines.
+; http://php.net/ignore-repeated-source
+ignore_repeated_source = Off
+
+; If this parameter is set to Off, then memory leaks will not be shown (on
+; stdout or in the log). This has only effect in a debug compile, and if
+; error reporting includes E_WARNING in the allowed list
+; http://php.net/report-memleaks
+report_memleaks = On
+
+; This setting is on by default.
+;report_zend_debug = 0
+
+; Store the last error/warning message in $php_errormsg (boolean). Setting this value
+; to On can assist in debugging and is appropriate for development servers. It should
+; however be disabled on production servers.
+; This directive is DEPRECATED.
+; Default Value: Off
+; Development Value: Off
+; Production Value: Off
+; http://php.net/track-errors
+;track_errors = Off
+
+; Turn off normal error reporting and emit XML-RPC error XML
+; http://php.net/xmlrpc-errors
+;xmlrpc_errors = 0
+
+; An XML-RPC faultCode
+;xmlrpc_error_number = 0
+
+; When PHP displays or logs an error, it has the capability of formatting the
+; error message as HTML for easier reading. This directive controls whether
+; the error message is formatted as HTML or not.
+; Note: This directive is hardcoded to Off for the CLI SAPI
+; Default Value: On
+; Development Value: On
+; Production value: On
+; http://php.net/html-errors
+html_errors = On
+
+; If html_errors is set to On *and* docref_root is not empty, then PHP
+; produces clickable error messages that direct to a page describing the error
+; or function causing the error in detail.
+; You can download a copy of the PHP manual from http://php.net/docs
+; and change docref_root to the base URL of your local copy including the
+; leading '/'. You must also specify the file extension being used including
+; the dot. PHP's default behavior is to leave these settings empty, in which
+; case no links to documentation are generated.
+; Note: Never use this feature for production boxes.
+; http://php.net/docref-root
+; Examples
+;docref_root = "/phpmanual/"
+
+; http://php.net/docref-ext
+;docref_ext = .html
+
+; String to output before an error message. PHP's default behavior is to leave
+; this setting blank.
+; http://php.net/error-prepend-string
+; Example:
+;error_prepend_string = "<span style='color: #ff0000'>"
+
+; String to output after an error message. PHP's default behavior is to leave
+; this setting blank.
+; http://php.net/error-append-string
+; Example:
+;error_append_string = "</span>"
+
+; Log errors to specified file. PHP's default behavior is to leave this value
+; empty.
+; http://php.net/error-log
+; Example:
+;error_log = php_errors.log
+; Log errors to syslog (Event Log on Windows).
+;error_log = syslog
+
+;windows.show_crt_warning
+; Default value: 0
+; Development value: 0
+; Production value: 0
+
+;;;;;;;;;;;;;;;;;
+; Data Handling ;
+;;;;;;;;;;;;;;;;;
+
+; The separator used in PHP generated URLs to separate arguments.
+; PHP's default setting is "&".
+; http://php.net/arg-separator.output
+; Example:
+;arg_separator.output = "&amp;"
+
+; List of separator(s) used by PHP to parse input URLs into variables.
+; PHP's default setting is "&".
+; NOTE: Every character in this directive is considered as separator!
+; http://php.net/arg-separator.input
+; Example:
+;arg_separator.input = ";&"
+
+; This directive determines which super global arrays are registered when PHP
+; starts up. G,P,C,E & S are abbreviations for the following respective super
+; globals: GET, POST, COOKIE, ENV and SERVER. There is a performance penalty
+; paid for the registration of these arrays and because ENV is not as commonly
+; used as the others, ENV is not recommended on productions servers. You
+; can still get access to the environment variables through getenv() should you
+; need to.
+; Default Value: "EGPCS"
+; Development Value: "GPCS"
+; Production Value: "GPCS";
+; http://php.net/variables-order
+variables_order = "GPCS"
+
+; This directive determines which super global data (G,P & C) should be
+; registered into the super global array REQUEST. If so, it also determines
+; the order in which that data is registered. The values for this directive
+; are specified in the same manner as the variables_order directive,
+; EXCEPT one. Leaving this value empty will cause PHP to use the value set
+; in the variables_order directive. It does not mean it will leave the super
+; globals array REQUEST empty.
+; Default Value: None
+; Development Value: "GP"
+; Production Value: "GP"
+; http://php.net/request-order
+request_order = "GP"
+
+; This directive determines whether PHP registers $argv & $argc each time it
+; runs. $argv contains an array of all the arguments passed to PHP when a script
+; is invoked. $argc contains an integer representing the number of arguments
+; that were passed when the script was invoked. These arrays are extremely
+; useful when running scripts from the command line. When this directive is
+; enabled, registering these variables consumes CPU cycles and memory each time
+; a script is executed. For performance reasons, this feature should be disabled
+; on production servers.
+; Note: This directive is hardcoded to On for the CLI SAPI
+; Default Value: On
+; Development Value: Off
+; Production Value: Off
+; http://php.net/register-argc-argv
+register_argc_argv = Off
+
+; When enabled, the ENV, REQUEST and SERVER variables are created when they're
+; first used (Just In Time) instead of when the script starts. If these
+; variables are not used within a script, having this directive on will result
+; in a performance gain. The PHP directive register_argc_argv must be disabled
+; for this directive to have any affect.
+; http://php.net/auto-globals-jit
+auto_globals_jit = On
+
+; Whether PHP will read the POST data.
+; This option is enabled by default.
+; Most likely, you won't want to disable this option globally. It causes $_POST
+; and $_FILES to always be empty; the only way you will be able to read the
+; POST data will be through the php://input stream wrapper. This can be useful
+; to proxy requests or to process the POST data in a memory efficient fashion.
+; http://php.net/enable-post-data-reading
+;enable_post_data_reading = Off
+
+; Maximum size of POST data that PHP will accept.
+; Its value may be 0 to disable the limit. It is ignored if POST data reading
+; is disabled through enable_post_data_reading.
+; http://php.net/post-max-size
+post_max_size = 16G
+upload_max_size = 16G
+
+; Automatically add files before PHP document.
+; http://php.net/auto-prepend-file
+auto_prepend_file =
+
+; Automatically add files after PHP document.
+; http://php.net/auto-append-file
+auto_append_file =
+
+; By default, PHP will output a media type using the Content-Type header. To
+; disable this, simply set it to be empty.
+;
+; PHP's built-in default media type is set to text/html.
+; http://php.net/default-mimetype
+default_mimetype = "text/html"
+
+; PHP's default character set is set to UTF-8.
+; http://php.net/default-charset
+default_charset = "UTF-8"
+
+; PHP internal character encoding is set to empty.
+; If empty, default_charset is used.
+; http://php.net/internal-encoding
+;internal_encoding =
+
+; PHP input character encoding is set to empty.
+; If empty, default_charset is used.
+; http://php.net/input-encoding
+;input_encoding =
+
+; PHP output character encoding is set to empty.
+; If empty, default_charset is used.
+; See also output_buffer.
+; http://php.net/output-encoding
+;output_encoding =
+
+;;;;;;;;;;;;;;;;;;;;;;;;;
+; Paths and Directories ;
+;;;;;;;;;;;;;;;;;;;;;;;;;
+
+; UNIX: "/path1:/path2"
+;include_path = ".:/php/includes"
+;
+; Windows: "\path1;\path2"
+;include_path = ".;c:\php\includes"
+;
+; PHP's default setting for include_path is ".;/path/to/php/pear"
+; http://php.net/include-path
+
+; The root of the PHP pages, used only if nonempty.
+; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
+; if you are running php as a CGI under any web server (other than IIS)
+; see documentation for security issues.  The alternate is to use the
+; cgi.force_redirect configuration below
+; http://php.net/doc-root
+doc_root =
+
+; The directory under which PHP opens the script using /~username used only
+; if nonempty.
+; http://php.net/user-dir
+user_dir =
+
+; Directory in which the loadable extensions (modules) reside.
+; http://php.net/extension-dir
+; extension_dir = "./"
+; On windows:
+; extension_dir = "ext"
+
+; Directory where the temporary files should be placed.
+; Defaults to the system default (see sys_get_temp_dir)
+; sys_temp_dir = "/tmp"
+
+; Whether or not to enable the dl() function.  The dl() function does NOT work
+; properly in multithreaded servers, such as IIS or Zeus, and is automatically
+; disabled on them.
+; http://php.net/enable-dl
+enable_dl = Off
+
+; cgi.force_redirect is necessary to provide security running PHP as a CGI under
+; most web servers.  Left undefined, PHP turns this on by default.  You can
+; turn it off here AT YOUR OWN RISK
+; **You CAN safely turn this off for IIS, in fact, you MUST.**
+; http://php.net/cgi.force-redirect
+;cgi.force_redirect = 1
+
+; if cgi.nph is enabled it will force cgi to always sent Status: 200 with
+; every request. PHP's default behavior is to disable this feature.
+;cgi.nph = 1
+
+; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape
+; (iPlanet) web servers, you MAY need to set an environment variable name that PHP
+; will look for to know it is OK to continue execution.  Setting this variable MAY
+; cause security issues, KNOW WHAT YOU ARE DOING FIRST.
+; http://php.net/cgi.redirect-status-env
+;cgi.redirect_status_env =
+
+; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI.  PHP's
+; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok
+; what PATH_INFO is.  For more information on PATH_INFO, see the cgi specs.  Setting
+; this to 1 will cause PHP CGI to fix its paths to conform to the spec.  A setting
+; of zero causes PHP to behave as before.  Default is 1.  You should fix your scripts
+; to use SCRIPT_FILENAME rather than PATH_TRANSLATED.
+; http://php.net/cgi.fix-pathinfo
+cgi.fix_pathinfo=1
+
+; if cgi.discard_path is enabled, the PHP CGI binary can safely be placed outside
+; of the web tree and people will not be able to circumvent .htaccess security.
+; http://php.net/cgi.dicard-path
+;cgi.discard_path=1
+
+; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate
+; security tokens of the calling client.  This allows IIS to define the
+; security context that the request runs under.  mod_fastcgi under Apache
+; does not currently support this feature (03/17/2002)
+; Set to 1 if running under IIS.  Default is zero.
+; http://php.net/fastcgi.impersonate
+;fastcgi.impersonate = 1
+
+; Disable logging through FastCGI connection. PHP's default behavior is to enable
+; this feature.
+;fastcgi.logging = 0
+
+; cgi.rfc2616_headers configuration option tells PHP what type of headers to
+; use when sending HTTP response code. If set to 0, PHP sends Status: header that
+; is supported by Apache. When this option is set to 1, PHP will send
+; RFC2616 compliant header.
+; Default is zero.
+; http://php.net/cgi.rfc2616-headers
+;cgi.rfc2616_headers = 0
+
+; cgi.check_shebang_line controls whether CGI PHP checks for line starting with #!
+; (shebang) at the top of the running script. This line might be needed if the
+; script support running both as stand-alone script and via PHP CGI<. PHP in CGI
+; mode skips this line and ignores its content if this directive is turned on.
+; http://php.net/cgi.check-shebang-line
+;cgi.check_shebang_line=1
+
+;;;;;;;;;;;;;;;;
+; File Uploads ;
+;;;;;;;;;;;;;;;;
+
+; Whether to allow HTTP file uploads.
+; http://php.net/file-uploads
+file_uploads = On
+
+; Temporary directory for HTTP uploaded files (will use system default if not
+; specified).
+; http://php.net/upload-tmp-dir
+;upload_tmp_dir =
+
+; Maximum allowed size for uploaded files.
+; http://php.net/upload-max-filesize
+upload_max_filesize = 16G
+
+; Maximum number of files that can be uploaded via a single request
+max_file_uploads = 20
+
+;;;;;;;;;;;;;;;;;;
+; Fopen wrappers ;
+;;;;;;;;;;;;;;;;;;
+
+; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
+; http://php.net/allow-url-fopen
+allow_url_fopen = On
+
+; Whether to allow include/require to open URLs (like http:// or ftp://) as files.
+; http://php.net/allow-url-include
+allow_url_include = Off
+
+; Define the anonymous ftp password (your email address). PHP's default setting
+; for this is empty.
+; http://php.net/from
+;from="john@doe.com"
+
+; Define the User-Agent string. PHP's default setting for this is empty.
+; http://php.net/user-agent
+;user_agent="PHP"
+
+; Default timeout for socket based streams (seconds)
+; http://php.net/default-socket-timeout
+default_socket_timeout = 3600
+
+; If your scripts have to deal with files from Macintosh systems,
+; or you are running on a Mac and need to deal with files from
+; unix or win32 systems, setting this flag will cause PHP to
+; automatically detect the EOL character in those files so that
+; fgets() and file() will work regardless of the source of the file.
+; http://php.net/auto-detect-line-endings
+;auto_detect_line_endings = Off
+
+;;;;;;;;;;;;;;;;;;;;;;
+; Dynamic Extensions ;
+;;;;;;;;;;;;;;;;;;;;;;
+
+; If you wish to have an extension loaded automatically, use the following
+; syntax:
+;
+;   extension=modulename
+;
+; For example:
+;
+;   extension=mysqli
+; 
+; When the extension library to load is not located in the default extension
+; directory, You may specify an absolute path to the library file:
+;
+;   extension=/path/to/extension/mysqli.so
+;
+; Note : The syntax used in previous PHP versions ('extension=<ext>.so' and
+; 'extension='php_<ext>.dll') is supported for legacy reasons and may be
+; deprecated in a future PHP major version. So, when it is possible, please
+; move to the new ('extension=<ext>) syntax.
+;
+; Notes for Windows environments :
+;
+; - ODBC support is built in, so no dll is needed for it.
+; - Many DLL files are located in the extensions/ (PHP 4) or ext/ (PHP 5+)
+;   extension folders as well as the separate PECL DLL download (PHP 5+).
+;   Be sure to appropriately set the extension_dir directive.
+;
+;extension=bz2
+;extension=curl
+;extension=fileinfo
+;extension=gd2
+;extension=gettext
+;extension=gmp
+;extension=intl
+;extension=imap
+;extension=interbase
+;extension=ldap
+;extension=mbstring
+;extension=exif      ; Must be after mbstring as it depends on it
+;extension=mysqli
+;extension=oci8_12c  ; Use with Oracle Database 12c Instant Client
+;extension=openssl
+;extension=pdo_firebird
+;extension=pdo_mysql
+;extension=pdo_oci
+;extension=pdo_odbc
+;extension=pdo_pgsql
+;extension=pdo_sqlite
+;extension=pgsql
+;extension=shmop
+
+; The MIBS data available in the PHP distribution must be installed.
+; See http://www.php.net/manual/en/snmp.installation.php
+;extension=snmp
+
+;extension=soap
+;extension=sockets
+;extension=sqlite3
+;extension=tidy
+;extension=xmlrpc
+;extension=xsl
+
+;;;;;;;;;;;;;;;;;;;
+; Module Settings ;
+;;;;;;;;;;;;;;;;;;;
+
+[CLI Server]
+; Whether the CLI web server uses ANSI color coding in its terminal output.
+cli_server.color = On
+
+[Date]
+; Defines the default timezone used by the date functions
+; http://php.net/date.timezone
+date.timezone = mytimezone
+
+; http://php.net/date.default-latitude
+;date.default_latitude = 31.7667
+
+; http://php.net/date.default-longitude
+;date.default_longitude = 35.2333
+
+; http://php.net/date.sunrise-zenith
+;date.sunrise_zenith = 90.583333
+
+; http://php.net/date.sunset-zenith
+;date.sunset_zenith = 90.583333
+
+[filter]
+; http://php.net/filter.default
+;filter.default = unsafe_raw
+
+; http://php.net/filter.default-flags
+;filter.default_flags =
+
+[iconv]
+; Use of this INI entry is deprecated, use global input_encoding instead.
+; If empty, default_charset or input_encoding or iconv.input_encoding is used.
+; The precedence is: default_charset < intput_encoding < iconv.input_encoding
+;iconv.input_encoding =
+
+; Use of this INI entry is deprecated, use global internal_encoding instead.
+; If empty, default_charset or internal_encoding or iconv.internal_encoding is used.
+; The precedence is: default_charset < internal_encoding < iconv.internal_encoding
+;iconv.internal_encoding =
+
+; Use of this INI entry is deprecated, use global output_encoding instead.
+; If empty, default_charset or output_encoding or iconv.output_encoding is used.
+; The precedence is: default_charset < output_encoding < iconv.output_encoding
+; To use an output encoding conversion, iconv's output handler must be set
+; otherwise output encoding conversion cannot be performed.
+;iconv.output_encoding =
+
+[intl]
+;intl.default_locale =
+; This directive allows you to produce PHP errors when some error
+; happens within intl functions. The value is the level of the error produced.
+; Default is 0, which does not produce any errors.
+;intl.error_level = E_WARNING
+;intl.use_exceptions = 0
+
+[sqlite3]
+;sqlite3.extension_dir =
+
+[Pcre]
+;PCRE library backtracking limit.
+; http://php.net/pcre.backtrack-limit
+;pcre.backtrack_limit=100000
+
+;PCRE library recursion limit.
+;Please note that if you set this value to a high number you may consume all
+;the available process stack and eventually crash PHP (due to reaching the
+;stack size limit imposed by the Operating System).
+; http://php.net/pcre.recursion-limit
+;pcre.recursion_limit=100000
+
+;Enables or disables JIT compilation of patterns. This requires the PCRE
+;library to be compiled with JIT support.
+;pcre.jit=1
+
+[Pdo]
+; Whether to pool ODBC connections. Can be one of "strict", "relaxed" or "off"
+; http://php.net/pdo-odbc.connection-pooling
+;pdo_odbc.connection_pooling=strict
+
+;pdo_odbc.db2_instance_name
+
+[Pdo_mysql]
+; If mysqlnd is used: Number of cache slots for the internal result set cache
+; http://php.net/pdo_mysql.cache_size
+pdo_mysql.cache_size = 2000
+
+; Default socket name for local MySQL connects.  If empty, uses the built-in
+; MySQL defaults.
+; http://php.net/pdo_mysql.default-socket
+pdo_mysql.default_socket=
+
+[Phar]
+; http://php.net/phar.readonly
+;phar.readonly = On
+
+; http://php.net/phar.require-hash
+;phar.require_hash = On
+
+;phar.cache_list =
+
+[mail function]
+; For Win32 only.
+; http://php.net/smtp
+SMTP = localhost
+; http://php.net/smtp-port
+smtp_port = 25
+
+; For Win32 only.
+; http://php.net/sendmail-from
+;sendmail_from = me@example.com
+
+; For Unix only.  You may supply arguments as well (default: "sendmail -t -i").
+; http://php.net/sendmail-path
+;sendmail_path =
+
+; Force the addition of the specified parameters to be passed as extra parameters
+; to the sendmail binary. These parameters will always replace the value of
+; the 5th parameter to mail().
+;mail.force_extra_parameters =
+
+; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename
+mail.add_x_header = On
+
+; The path to a log file that will log all mail() calls. Log entries include
+; the full path of the script, line number, To address and headers.
+;mail.log =
+; Log mail to syslog (Event Log on Windows).
+;mail.log = syslog
+
+[ODBC]
+; http://php.net/odbc.default-db
+;odbc.default_db    =  Not yet implemented
+
+; http://php.net/odbc.default-user
+;odbc.default_user  =  Not yet implemented
+
+; http://php.net/odbc.default-pw
+;odbc.default_pw    =  Not yet implemented
+
+; Controls the ODBC cursor model.
+; Default: SQL_CURSOR_STATIC (default).
+;odbc.default_cursortype
+
+; Allow or prevent persistent links.
+; http://php.net/odbc.allow-persistent
+odbc.allow_persistent = On
+
+; Check that a connection is still valid before reuse.
+; http://php.net/odbc.check-persistent
+odbc.check_persistent = On
+
+; Maximum number of persistent links.  -1 means no limit.
+; http://php.net/odbc.max-persistent
+odbc.max_persistent = -1
+
+; Maximum number of links (persistent + non-persistent).  -1 means no limit.
+; http://php.net/odbc.max-links
+odbc.max_links = -1
+
+; Handling of LONG fields.  Returns number of bytes to variables.  0 means
+; passthru.
+; http://php.net/odbc.defaultlrl
+odbc.defaultlrl = 4096
+
+; Handling of binary data.  0 means passthru, 1 return as is, 2 convert to char.
+; See the documentation on odbc_binmode and odbc_longreadlen for an explanation
+; of odbc.defaultlrl and odbc.defaultbinmode
+; http://php.net/odbc.defaultbinmode
+odbc.defaultbinmode = 1
+
+;birdstep.max_links = -1
+
+[Interbase]
+; Allow or prevent persistent links.
+ibase.allow_persistent = 1
+
+; Maximum number of persistent links.  -1 means no limit.
+ibase.max_persistent = -1
+
+; Maximum number of links (persistent + non-persistent).  -1 means no limit.
+ibase.max_links = -1
+
+; Default database name for ibase_connect().
+;ibase.default_db =
+
+; Default username for ibase_connect().
+;ibase.default_user =
+
+; Default password for ibase_connect().
+;ibase.default_password =
+
+; Default charset for ibase_connect().
+;ibase.default_charset =
+
+; Default timestamp format.
+ibase.timestampformat = "%Y-%m-%d %H:%M:%S"
+
+; Default date format.
+ibase.dateformat = "%Y-%m-%d"
+
+; Default time format.
+ibase.timeformat = "%H:%M:%S"
+
+[MySQLi]
+
+; Maximum number of persistent links.  -1 means no limit.
+; http://php.net/mysqli.max-persistent
+mysqli.max_persistent = -1
+
+; Allow accessing, from PHP's perspective, local files with LOAD DATA statements
+; http://php.net/mysqli.allow_local_infile
+;mysqli.allow_local_infile = On
+
+; Allow or prevent persistent links.
+; http://php.net/mysqli.allow-persistent
+mysqli.allow_persistent = On
+
+; Maximum number of links.  -1 means no limit.
+; http://php.net/mysqli.max-links
+mysqli.max_links = -1
+
+; If mysqlnd is used: Number of cache slots for the internal result set cache
+; http://php.net/mysqli.cache_size
+mysqli.cache_size = 2000
+
+; Default port number for mysqli_connect().  If unset, mysqli_connect() will use
+; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the
+; compile-time value defined MYSQL_PORT (in that order).  Win32 will only look
+; at MYSQL_PORT.
+; http://php.net/mysqli.default-port
+mysqli.default_port = 3306
+
+; Default socket name for local MySQL connects.  If empty, uses the built-in
+; MySQL defaults.
+; http://php.net/mysqli.default-socket
+mysqli.default_socket =
+
+; Default host for mysql_connect() (doesn't apply in safe mode).
+; http://php.net/mysqli.default-host
+mysqli.default_host =
+
+; Default user for mysql_connect() (doesn't apply in safe mode).
+; http://php.net/mysqli.default-user
+mysqli.default_user =
+
+; Default password for mysqli_connect() (doesn't apply in safe mode).
+; Note that this is generally a *bad* idea to store passwords in this file.
+; *Any* user with PHP access can run 'echo get_cfg_var("mysqli.default_pw")
+; and reveal this password!  And of course, any users with read access to this
+; file will be able to reveal the password as well.
+; http://php.net/mysqli.default-pw
+mysqli.default_pw =
+
+; Allow or prevent reconnect
+mysqli.reconnect = Off
+
+[mysqlnd]
+; Enable / Disable collection of general statistics by mysqlnd which can be
+; used to tune and monitor MySQL operations.
+; http://php.net/mysqlnd.collect_statistics
+mysqlnd.collect_statistics = On
+
+; Enable / Disable collection of memory usage statistics by mysqlnd which can be
+; used to tune and monitor MySQL operations.
+; http://php.net/mysqlnd.collect_memory_statistics
+mysqlnd.collect_memory_statistics = Off
+
+; Records communication from all extensions using mysqlnd to the specified log
+; file.
+; http://php.net/mysqlnd.debug
+;mysqlnd.debug =
+
+; Defines which queries will be logged.
+; http://php.net/mysqlnd.log_mask
+;mysqlnd.log_mask = 0
+
+; Default size of the mysqlnd memory pool, which is used by result sets.
+; http://php.net/mysqlnd.mempool_default_size
+;mysqlnd.mempool_default_size = 16000
+
+; Size of a pre-allocated buffer used when sending commands to MySQL in bytes.
+; http://php.net/mysqlnd.net_cmd_buffer_size
+;mysqlnd.net_cmd_buffer_size = 2048
+
+; Size of a pre-allocated buffer used for reading data sent by the server in
+; bytes.
+; http://php.net/mysqlnd.net_read_buffer_size
+;mysqlnd.net_read_buffer_size = 32768
+
+; Timeout for network requests in seconds.
+; http://php.net/mysqlnd.net_read_timeout
+;mysqlnd.net_read_timeout = 31536000
+
+; SHA-256 Authentication Plugin related. File with the MySQL server public RSA
+; key.
+; http://php.net/mysqlnd.sha256_server_public_key
+;mysqlnd.sha256_server_public_key =
+
+[OCI8]
+
+; Connection: Enables privileged connections using external
+; credentials (OCI_SYSOPER, OCI_SYSDBA)
+; http://php.net/oci8.privileged-connect
+;oci8.privileged_connect = Off
+
+; Connection: The maximum number of persistent OCI8 connections per
+; process. Using -1 means no limit.
+; http://php.net/oci8.max-persistent
+;oci8.max_persistent = -1
+
+; Connection: The maximum number of seconds a process is allowed to
+; maintain an idle persistent connection. Using -1 means idle
+; persistent connections will be maintained forever.
+; http://php.net/oci8.persistent-timeout
+;oci8.persistent_timeout = -1
+
+; Connection: The number of seconds that must pass before issuing a
+; ping during oci_pconnect() to check the connection validity. When
+; set to 0, each oci_pconnect() will cause a ping. Using -1 disables
+; pings completely.
+; http://php.net/oci8.ping-interval
+;oci8.ping_interval = 60
+
+; Connection: Set this to a user chosen connection class to be used
+; for all pooled server requests with Oracle 11g Database Resident
+; Connection Pooling (DRCP).  To use DRCP, this value should be set to
+; the same string for all web servers running the same application,
+; the database pool must be configured, and the connection string must
+; specify to use a pooled server.
+;oci8.connection_class =
+
+; High Availability: Using On lets PHP receive Fast Application
+; Notification (FAN) events generated when a database node fails. The
+; database must also be configured to post FAN events.
+;oci8.events = Off
+
+; Tuning: This option enables statement caching, and specifies how
+; many statements to cache. Using 0 disables statement caching.
+; http://php.net/oci8.statement-cache-size
+;oci8.statement_cache_size = 20
+
+; Tuning: Enables statement prefetching and sets the default number of
+; rows that will be fetched automatically after statement execution.
+; http://php.net/oci8.default-prefetch
+;oci8.default_prefetch = 100
+
+; Compatibility. Using On means oci_close() will not close
+; oci_connect() and oci_new_connect() connections.
+; http://php.net/oci8.old-oci-close-semantics
+;oci8.old_oci_close_semantics = Off
+
+[PostgreSQL]
+; Allow or prevent persistent links.
+; http://php.net/pgsql.allow-persistent
+pgsql.allow_persistent = On
+
+; Detect broken persistent links always with pg_pconnect().
+; Auto reset feature requires a little overheads.
+; http://php.net/pgsql.auto-reset-persistent
+pgsql.auto_reset_persistent = Off
+
+; Maximum number of persistent links.  -1 means no limit.
+; http://php.net/pgsql.max-persistent
+pgsql.max_persistent = -1
+
+; Maximum number of links (persistent+non persistent).  -1 means no limit.
+; http://php.net/pgsql.max-links
+pgsql.max_links = -1
+
+; Ignore PostgreSQL backends Notice message or not.
+; Notice message logging require a little overheads.
+; http://php.net/pgsql.ignore-notice
+pgsql.ignore_notice = 0
+
+; Log PostgreSQL backends Notice message or not.
+; Unless pgsql.ignore_notice=0, module cannot log notice message.
+; http://php.net/pgsql.log-notice
+pgsql.log_notice = 0
+
+[bcmath]
+; Number of decimal digits for all bcmath functions.
+; http://php.net/bcmath.scale
+bcmath.scale = 0
+
+[browscap]
+; http://php.net/browscap
+;browscap = extra/browscap.ini
+
+[Session]
+; Handler used to store/retrieve data.
+; http://php.net/session.save-handler
+session.save_handler = files
+
+; Argument passed to save_handler.  In the case of files, this is the path
+; where data files are stored. Note: Windows users have to change this
+; variable in order to use PHP's session functions.
+;
+; The path can be defined as:
+;
+;     session.save_path = "N;/path"
+;
+; where N is an integer.  Instead of storing all the session files in
+; /path, what this will do is use subdirectories N-levels deep, and
+; store the session data in those directories.  This is useful if
+; your OS has problems with many files in one directory, and is
+; a more efficient layout for servers that handle many sessions.
+;
+; NOTE 1: PHP will not create this directory structure automatically.
+;         You can use the script in the ext/session dir for that purpose.
+; NOTE 2: See the section on garbage collection below if you choose to
+;         use subdirectories for session storage
+;
+; The file storage module creates files using mode 600 by default.
+; You can change that by using
+;
+;     session.save_path = "N;MODE;/path"
+;
+; where MODE is the octal representation of the mode. Note that this
+; does not overwrite the process's umask.
+; http://php.net/session.save-path
+;session.save_path = "/tmp"
+
+; Whether to use strict session mode.
+; Strict session mode does not accept uninitialized session ID and regenerate
+; session ID if browser sends uninitialized session ID. Strict mode protects
+; applications from session fixation via session adoption vulnerability. It is
+; disabled by default for maximum compatibility, but enabling it is encouraged.
+; https://wiki.php.net/rfc/strict_sessions
+session.use_strict_mode = 0
+
+; Whether to use cookies.
+; http://php.net/session.use-cookies
+session.use_cookies = 1
+
+; http://php.net/session.cookie-secure
+;session.cookie_secure =
+
+; This option forces PHP to fetch and use a cookie for storing and maintaining
+; the session id. We encourage this operation as it's very helpful in combating
+; session hijacking when not specifying and managing your own session id. It is
+; not the be-all and end-all of session hijacking defense, but it's a good start.
+; http://php.net/session.use-only-cookies
+session.use_only_cookies = 1
+
+; Name of the session (used as cookie name).
+; http://php.net/session.name
+session.name = PHPSESSID
+
+; Initialize session on request startup.
+; http://php.net/session.auto-start
+session.auto_start = 0
+
+; Lifetime in seconds of cookie or, if 0, until browser is restarted.
+; http://php.net/session.cookie-lifetime
+session.cookie_lifetime = 0
+
+; The path for which the cookie is valid.
+; http://php.net/session.cookie-path
+session.cookie_path = /
+
+; The domain for which the cookie is valid.
+; http://php.net/session.cookie-domain
+session.cookie_domain =
+
+; Whether or not to add the httpOnly flag to the cookie, which makes it inaccessible to browser scripting languages such as JavaScript.
+; http://php.net/session.cookie-httponly
+session.cookie_httponly =
+
+; Handler used to serialize data.  php is the standard serializer of PHP.
+; http://php.net/session.serialize-handler
+session.serialize_handler = php
+
+; Defines the probability that the 'garbage collection' process is started
+; on every session initialization. The probability is calculated by using
+; gc_probability/gc_divisor. Where session.gc_probability is the numerator
+; and gc_divisor is the denominator in the equation. Setting this value to 1
+; when the session.gc_divisor value is 100 will give you approximately a 1% chance
+; the gc will run on any give request.
+; Default Value: 1
+; Development Value: 1
+; Production Value: 1
+; http://php.net/session.gc-probability
+session.gc_probability = 1
+
+; Defines the probability that the 'garbage collection' process is started on every
+; session initialization. The probability is calculated by using the following equation:
+; gc_probability/gc_divisor. Where session.gc_probability is the numerator and
+; session.gc_divisor is the denominator in the equation. Setting this value to 1
+; when the session.gc_divisor value is 100 will give you approximately a 1% chance
+; the gc will run on any give request. Increasing this value to 1000 will give you
+; a 0.1% chance the gc will run on any give request. For high volume production servers,
+; this is a more efficient approach.
+; Default Value: 100
+; Development Value: 1000
+; Production Value: 1000
+; http://php.net/session.gc-divisor
+session.gc_divisor = 1000
+
+; After this number of seconds, stored data will be seen as 'garbage' and
+; cleaned up by the garbage collection process.
+; http://php.net/session.gc-maxlifetime
+session.gc_maxlifetime = 1440
+
+; NOTE: If you are using the subdirectory option for storing session files
+;       (see session.save_path above), then garbage collection does *not*
+;       happen automatically.  You will need to do your own garbage
+;       collection through a shell script, cron entry, or some other method.
+;       For example, the following script would is the equivalent of
+;       setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes):
+;          find /path/to/sessions -cmin +24 -type f | xargs rm
+
+; Check HTTP Referer to invalidate externally stored URLs containing ids.
+; HTTP_REFERER has to contain this substring for the session to be
+; considered as valid.
+; http://php.net/session.referer-check
+session.referer_check =
+
+; Set to {nocache,private,public,} to determine HTTP caching aspects
+; or leave this empty to avoid sending anti-caching headers.
+; http://php.net/session.cache-limiter
+session.cache_limiter = nocache
+
+; Document expires after n minutes.
+; http://php.net/session.cache-expire
+session.cache_expire = 180
+
+; trans sid support is disabled by default.
+; Use of trans sid may risk your users' security.
+; Use this option with caution.
+; - User may send URL contains active session ID
+;   to other person via. email/irc/etc.
+; - URL that contains active session ID may be stored
+;   in publicly accessible computer.
+; - User may access your site with the same session ID
+;   always using URL stored in browser's history or bookmarks.
+; http://php.net/session.use-trans-sid
+session.use_trans_sid = 0
+
+; Set session ID character length. This value could be between 22 to 256.
+; Shorter length than default is supported only for compatibility reason.
+; Users should use 32 or more chars.
+; http://php.net/session.sid-length
+; Default Value: 32
+; Development Value: 26
+; Production Value: 26
+session.sid_length = 26
+
+; The URL rewriter will look for URLs in a defined set of HTML tags.
+; <form> is special; if you include them here, the rewriter will
+; add a hidden <input> field with the info which is otherwise appended
+; to URLs. <form> tag's action attribute URL will not be modified
+; unless it is specified.
+; Note that all valid entries require a "=", even if no value follows.
+; Default Value: "a=href,area=href,frame=src,form="
+; Development Value: "a=href,area=href,frame=src,form="
+; Production Value: "a=href,area=href,frame=src,form="
+; http://php.net/url-rewriter.tags
+session.trans_sid_tags = "a=href,area=href,frame=src,form="
+
+; URL rewriter does not rewrite absolute URLs by default.
+; To enable rewrites for absolute pathes, target hosts must be specified
+; at RUNTIME. i.e. use ini_set()
+; <form> tags is special. PHP will check action attribute's URL regardless
+; of session.trans_sid_tags setting.
+; If no host is defined, HTTP_HOST will be used for allowed host.
+; Example value: php.net,www.php.net,wiki.php.net
+; Use "," for multiple hosts. No spaces are allowed.
+; Default Value: ""
+; Development Value: ""
+; Production Value: ""
+;session.trans_sid_hosts=""
+
+; Define how many bits are stored in each character when converting
+; the binary hash data to something readable.
+; Possible values:
+;   4  (4 bits: 0-9, a-f)
+;   5  (5 bits: 0-9, a-v)
+;   6  (6 bits: 0-9, a-z, A-Z, "-", ",")
+; Default Value: 4
+; Development Value: 5
+; Production Value: 5
+; http://php.net/session.hash-bits-per-character
+session.sid_bits_per_character = 5
+
+; Enable upload progress tracking in $_SESSION
+; Default Value: On
+; Development Value: On
+; Production Value: On
+; http://php.net/session.upload-progress.enabled
+;session.upload_progress.enabled = On
+
+; Cleanup the progress information as soon as all POST data has been read
+; (i.e. upload completed).
+; Default Value: On
+; Development Value: On
+; Production Value: On
+; http://php.net/session.upload-progress.cleanup
+;session.upload_progress.cleanup = On
+
+; A prefix used for the upload progress key in $_SESSION
+; Default Value: "upload_progress_"
+; Development Value: "upload_progress_"
+; Production Value: "upload_progress_"
+; http://php.net/session.upload-progress.prefix
+;session.upload_progress.prefix = "upload_progress_"
+
+; The index name (concatenated with the prefix) in $_SESSION
+; containing the upload progress information
+; Default Value: "PHP_SESSION_UPLOAD_PROGRESS"
+; Development Value: "PHP_SESSION_UPLOAD_PROGRESS"
+; Production Value: "PHP_SESSION_UPLOAD_PROGRESS"
+; http://php.net/session.upload-progress.name
+;session.upload_progress.name = "PHP_SESSION_UPLOAD_PROGRESS"
+
+; How frequently the upload progress should be updated.
+; Given either in percentages (per-file), or in bytes
+; Default Value: "1%"
+; Development Value: "1%"
+; Production Value: "1%"
+; http://php.net/session.upload-progress.freq
+;session.upload_progress.freq =  "1%"
+
+; The minimum delay between updates, in seconds
+; Default Value: 1
+; Development Value: 1
+; Production Value: 1
+; http://php.net/session.upload-progress.min-freq
+;session.upload_progress.min_freq = "1"
+
+; Only write session data when session data is changed. Enabled by default.
+; http://php.net/session.lazy-write
+;session.lazy_write = On
+
+[Assertion]
+; Switch whether to compile assertions at all (to have no overhead at run-time)
+; -1: Do not compile at all
+;  0: Jump over assertion at run-time
+;  1: Execute assertions
+; Changing from or to a negative value is only possible in php.ini! (For turning assertions on and off at run-time, see assert.active, when zend.assertions = 1)
+; Default Value: 1
+; Development Value: 1
+; Production Value: -1
+; http://php.net/zend.assertions
+zend.assertions = -1
+
+; Assert(expr); active by default.
+; http://php.net/assert.active
+;assert.active = On
+
+; Throw an AssertationException on failed assertions
+; http://php.net/assert.exception
+;assert.exception = On
+
+; Issue a PHP warning for each failed assertion. (Overridden by assert.exception if active)
+; http://php.net/assert.warning
+;assert.warning = On
+
+; Don't bail out by default.
+; http://php.net/assert.bail
+;assert.bail = Off
+
+; User-function to be called if an assertion fails.
+; http://php.net/assert.callback
+;assert.callback = 0
+
+; Eval the expression with current error_reporting().  Set to true if you want
+; error_reporting(0) around the eval().
+; http://php.net/assert.quiet-eval
+;assert.quiet_eval = 0
+
+[COM]
+; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs
+; http://php.net/com.typelib-file
+;com.typelib_file =
+
+; allow Distributed-COM calls
+; http://php.net/com.allow-dcom
+;com.allow_dcom = true
+
+; autoregister constants of a components typlib on com_load()
+; http://php.net/com.autoregister-typelib
+;com.autoregister_typelib = true
+
+; register constants casesensitive
+; http://php.net/com.autoregister-casesensitive
+;com.autoregister_casesensitive = false
+
+; show warnings on duplicate constant registrations
+; http://php.net/com.autoregister-verbose
+;com.autoregister_verbose = true
+
+; The default character set code-page to use when passing strings to and from COM objects.
+; Default: system ANSI code page
+;com.code_page=
+
+[mbstring]
+; language for internal character representation.
+; This affects mb_send_mail() and mbstring.detect_order.
+; http://php.net/mbstring.language
+;mbstring.language = Japanese
+
+; Use of this INI entry is deprecated, use global internal_encoding instead.
+; internal/script encoding.
+; Some encoding cannot work as internal encoding. (e.g. SJIS, BIG5, ISO-2022-*)
+; If empty, default_charset or internal_encoding or iconv.internal_encoding is used.
+; The precedence is: default_charset < internal_encoding < iconv.internal_encoding
+;mbstring.internal_encoding =
+
+; Use of this INI entry is deprecated, use global input_encoding instead.
+; http input encoding.
+; mbstring.encoding_traslation = On is needed to use this setting.
+; If empty, default_charset or input_encoding or mbstring.input is used.
+; The precedence is: default_charset < intput_encoding < mbsting.http_input
+; http://php.net/mbstring.http-input
+;mbstring.http_input =
+
+; Use of this INI entry is deprecated, use global output_encoding instead.
+; http output encoding.
+; mb_output_handler must be registered as output buffer to function.
+; If empty, default_charset or output_encoding or mbstring.http_output is used.
+; The precedence is: default_charset < output_encoding < mbstring.http_output
+; To use an output encoding conversion, mbstring's output handler must be set
+; otherwise output encoding conversion cannot be performed.
+; http://php.net/mbstring.http-output
+;mbstring.http_output =
+
+; enable automatic encoding translation according to
+; mbstring.internal_encoding setting. Input chars are
+; converted to internal encoding by setting this to On.
+; Note: Do _not_ use automatic encoding translation for
+;       portable libs/applications.
+; http://php.net/mbstring.encoding-translation
+;mbstring.encoding_translation = Off
+
+; automatic encoding detection order.
+; "auto" detect order is changed according to mbstring.language
+; http://php.net/mbstring.detect-order
+;mbstring.detect_order = auto
+
+; substitute_character used when character cannot be converted
+; one from another
+; http://php.net/mbstring.substitute-character
+;mbstring.substitute_character = none
+
+; overload(replace) single byte functions by mbstring functions.
+; mail(), ereg(), etc are overloaded by mb_send_mail(), mb_ereg(),
+; etc. Possible values are 0,1,2,4 or combination of them.
+; For example, 7 for overload everything.
+; 0: No overload
+; 1: Overload mail() function
+; 2: Overload str*() functions
+; 4: Overload ereg*() functions
+; http://php.net/mbstring.func-overload
+;mbstring.func_overload = 0
+
+; enable strict encoding detection.
+; Default: Off
+;mbstring.strict_detection = On
+
+; This directive specifies the regex pattern of content types for which mb_output_handler()
+; is activated.
+; Default: mbstring.http_output_conv_mimetype=^(text/|application/xhtml\+xml)
+;mbstring.http_output_conv_mimetype=
+
+[gd]
+; Tell the jpeg decode to ignore warnings and try to create
+; a gd image. The warning will then be displayed as notices
+; disabled by default
+; http://php.net/gd.jpeg-ignore-warning
+;gd.jpeg_ignore_warning = 1
+
+[exif]
+; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS.
+; With mbstring support this will automatically be converted into the encoding
+; given by corresponding encode setting. When empty mbstring.internal_encoding
+; is used. For the decode settings you can distinguish between motorola and
+; intel byte order. A decode setting cannot be empty.
+; http://php.net/exif.encode-unicode
+;exif.encode_unicode = ISO-8859-15
+
+; http://php.net/exif.decode-unicode-motorola
+;exif.decode_unicode_motorola = UCS-2BE
+
+; http://php.net/exif.decode-unicode-intel
+;exif.decode_unicode_intel    = UCS-2LE
+
+; http://php.net/exif.encode-jis
+;exif.encode_jis =
+
+; http://php.net/exif.decode-jis-motorola
+;exif.decode_jis_motorola = JIS
+
+; http://php.net/exif.decode-jis-intel
+;exif.decode_jis_intel    = JIS
+
+[Tidy]
+; The path to a default tidy configuration file to use when using tidy
+; http://php.net/tidy.default-config
+;tidy.default_config = /usr/local/lib/php/default.tcfg
+
+; Should tidy clean and repair output automatically?
+; WARNING: Do not use this option if you are generating non-html content
+; such as dynamic images
+; http://php.net/tidy.clean-output
+tidy.clean_output = Off
+
+[soap]
+; Enables or disables WSDL caching feature.
+; http://php.net/soap.wsdl-cache-enabled
+soap.wsdl_cache_enabled=1
+
+; Sets the directory name where SOAP extension will put cache files.
+; http://php.net/soap.wsdl-cache-dir
+soap.wsdl_cache_dir="/tmp"
+
+; (time to live) Sets the number of second while cached file will be used
+; instead of original one.
+; http://php.net/soap.wsdl-cache-ttl
+soap.wsdl_cache_ttl=86400
+
+; Sets the size of the cache limit. (Max. number of WSDL files to cache)
+soap.wsdl_cache_limit = 5
+
+[sysvshm]
+; A default size of the shared memory segment
+;sysvshm.init_mem = 10000
+
+[ldap]
+; Sets the maximum number of open links or -1 for unlimited.
+ldap.max_links = -1
+
+[dba]
+;dba.default_handler=
+
+[opcache]
+; Determines if Zend OPCache is enabled
+opcache.enable=1
+
+; Determines if Zend OPCache is enabled for the CLI version of PHP
+opcache.enable_cli=1
+
+; The OPcache shared memory storage size.
+opcache.memory_consumption=128
+
+; The amount of memory for interned strings in Mbytes.
+opcache.interned_strings_buffer=8
+
+; The maximum number of keys (scripts) in the OPcache hash table.
+; Only numbers between 200 and 1000000 are allowed.
+opcache.max_accelerated_files=10000
+
+; The maximum percentage of "wasted" memory until a restart is scheduled.
+;opcache.max_wasted_percentage=5
+
+; When this directive is enabled, the OPcache appends the current working
+; directory to the script key, thus eliminating possible collisions between
+; files with the same name (basename). Disabling the directive improves
+; performance, but may break existing applications.
+;opcache.use_cwd=1
+
+; When disabled, you must reset the OPcache manually or restart the
+; webserver for changes to the filesystem to take effect.
+;opcache.validate_timestamps=1
+
+; How often (in seconds) to check file timestamps for changes to the shared
+; memory storage allocation. ("1" means validate once per second, but only
+; once per request. "0" means always validate)
+opcache.revalidate_freq=1
+
+; Enables or disables file search in include_path optimization
+;opcache.revalidate_path=0
+
+; If disabled, all PHPDoc comments are dropped from the code to reduce the
+; size of the optimized code.
+opcache.save_comments=1
+
+; Allow file existence override (file_exists, etc.) performance feature.
+;opcache.enable_file_override=0
+
+; A bitmask, where each bit enables or disables the appropriate OPcache
+; passes
+;opcache.optimization_level=0xffffffff
+
+;opcache.inherited_hack=1
+;opcache.dups_fix=0
+
+; The location of the OPcache blacklist file (wildcards allowed).
+; Each OPcache blacklist file is a text file that holds the names of files
+; that should not be accelerated. The file format is to add each filename
+; to a new line. The filename may be a full path or just a file prefix
+; (i.e., /var/www/x  blacklists all the files and directories in /var/www
+; that start with 'x'). Line starting with a ; are ignored (comments).
+;opcache.blacklist_filename=
+
+; Allows exclusion of large files from being cached. By default all files
+; are cached.
+;opcache.max_file_size=0
+
+; Check the cache checksum each N requests.
+; The default value of "0" means that the checks are disabled.
+;opcache.consistency_checks=0
+
+; How long to wait (in seconds) for a scheduled restart to begin if the cache
+; is not being accessed.
+;opcache.force_restart_timeout=180
+
+; OPcache error_log file name. Empty string assumes "stderr".
+;opcache.error_log=
+
+; All OPcache errors go to the Web server log.
+; By default, only fatal errors (level 0) or errors (level 1) are logged.
+; You can also enable warnings (level 2), info messages (level 3) or
+; debug messages (level 4).
+;opcache.log_verbosity_level=1
+
+; Preferred Shared Memory back-end. Leave empty and let the system decide.
+;opcache.preferred_memory_model=
+
+; Protect the shared memory from unexpected writing during script execution.
+; Useful for internal debugging only.
+;opcache.protect_memory=0
+
+; Allows calling OPcache API functions only from PHP scripts which path is
+; started from specified string. The default "" means no restriction
+;opcache.restrict_api=
+
+; Mapping base of shared memory segments (for Windows only). All the PHP
+; processes have to map shared memory into the same address space. This
+; directive allows to manually fix the "Unable to reattach to base address"
+; errors.
+;opcache.mmap_base=
+
+; Enables and sets the second level cache directory.
+; It should improve performance when SHM memory is full, at server restart or
+; SHM reset. The default "" disables file based caching.
+;opcache.file_cache=
+
+; Enables or disables opcode caching in shared memory.
+;opcache.file_cache_only=0
+
+; Enables or disables checksum validation when script loaded from file cache.
+;opcache.file_cache_consistency_checks=1
+
+; Implies opcache.file_cache_only=1 for a certain process that failed to
+; reattach to the shared memory (for Windows only). Explicitly enabled file
+; cache is required.
+;opcache.file_cache_fallback=1
+
+; Enables or disables copying of PHP code (text segment) into HUGE PAGES.
+; This should improve performance, but requires appropriate OS configuration.
+;opcache.huge_code_pages=1
+
+; Validate cached file permissions.
+;opcache.validate_permission=0
+
+; Prevent name collisions in chroot'ed environment.
+;opcache.validate_root=0
+
+[curl]
+; A default value for the CURLOPT_CAINFO option. This is required to be an
+; absolute path.
+;curl.cainfo =
+
+[openssl]
+; The location of a Certificate Authority (CA) file on the local filesystem
+; to use when verifying the identity of SSL/TLS peers. Most users should
+; not specify a value for this directive as PHP will attempt to use the
+; OS-managed cert stores in its absence. If specified, this value may still
+; be overridden on a per-stream basis via the "cafile" SSL stream context
+; option.
+;openssl.cafile=
+
+; If openssl.cafile is not specified or if the CA file is not found, the
+; directory pointed to by openssl.capath is searched for a suitable
+; certificate. This value must be a correctly hashed certificate directory.
+; Most users should not specify a value for this directive as PHP will
+; attempt to use the OS-managed cert stores in its absence. If specified,
+; this value may still be overridden on a per-stream basis via the "capath"
+; SSL stream context option.
+;openssl.capath=
+
+; Local Variables:
+; tab-width: 4
+; End:
diff --git a/jails/nextcloud/includes/redis.conf b/jails/nextcloud/includes/redis.conf
new file mode 100755
index 00000000..ae47f742
--- /dev/null
+++ b/jails/nextcloud/includes/redis.conf
@@ -0,0 +1,1052 @@
+# Redis configuration file example.
+#
+# Note that in order to read the configuration file, Redis must be
+# started with the file path as first argument:
+#
+# ./redis-server /path/to/redis.conf
+
+# Note on units: when memory size is needed, it is possible to specify
+# it in the usual form of 1k 5GB 4M and so forth:
+#
+# 1k => 1000 bytes
+# 1kb => 1024 bytes
+# 1m => 1000000 bytes
+# 1mb => 1024*1024 bytes
+# 1g => 1000000000 bytes
+# 1gb => 1024*1024*1024 bytes
+#
+# units are case insensitive so 1GB 1Gb 1gB are all the same.
+
+################################## INCLUDES ###################################
+
+# Include one or more other config files here.  This is useful if you
+# have a standard template that goes to all Redis servers but also need
+# to customize a few per-server settings.  Include files can include
+# other files, so use this wisely.
+#
+# Notice option "include" won't be rewritten by command "CONFIG REWRITE"
+# from admin or Redis Sentinel. Since Redis always uses the last processed
+# line as value of a configuration directive, you'd better put includes
+# at the beginning of this file to avoid overwriting config change at runtime.
+#
+# If instead you are interested in using includes to override configuration
+# options, it is better to use include as the last line.
+#
+# include /path/to/local.conf
+# include /path/to/other.conf
+
+################################## NETWORK #####################################
+
+# By default, if no "bind" configuration directive is specified, Redis listens
+# for connections from all the network interfaces available on the server.
+# It is possible to listen to just one or multiple selected interfaces using
+# the "bind" configuration directive, followed by one or more IP addresses.
+#
+# Examples:
+#
+# bind 192.168.1.100 10.0.0.1
+# bind 127.0.0.1 ::1
+#
+# ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the
+# internet, binding to all the interfaces is dangerous and will expose the
+# instance to everybody on the internet. So by default we uncomment the
+# following bind directive, that will force Redis to listen only into
+# the IPv4 lookback interface address (this means Redis will be able to
+# accept connections only from clients running into the same computer it
+# is running).
+#
+# IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES
+# JUST COMMENT THE FOLLOWING LINE.
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+bind 127.0.0.1
+
+# Protected mode is a layer of security protection, in order to avoid that
+# Redis instances left open on the internet are accessed and exploited.
+#
+# When protected mode is on and if:
+#
+# 1) The server is not binding explicitly to a set of addresses using the
+#    "bind" directive.
+# 2) No password is configured.
+#
+# The server only accepts connections from clients connecting from the
+# IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain
+# sockets.
+#
+# By default protected mode is enabled. You should disable it only if
+# you are sure you want clients from other hosts to connect to Redis
+# even if no authentication is configured, nor a specific set of interfaces
+# are explicitly listed using the "bind" directive.
+protected-mode yes
+
+# Accept connections on the specified port, default is 6379 (IANA #815344).
+# If port 0 is specified Redis will not listen on a TCP socket.
+port 0
+
+# TCP listen() backlog.
+#
+# In high requests-per-second environments you need an high backlog in order
+# to avoid slow clients connections issues. Note that the Linux kernel
+# will silently truncate it to the value of /proc/sys/net/core/somaxconn so
+# make sure to raise both the value of somaxconn and tcp_max_syn_backlog
+# in order to get the desired effect.
+tcp-backlog 511
+
+# Unix socket.
+#
+# Specify the path for the Unix socket that will be used to listen for
+# incoming connections. There is no default, so Redis will not listen
+# on a unix socket when not specified.
+#
+unixsocket /tmp/redis.sock
+unixsocketperm 777
+
+# Close the connection after a client is idle for N seconds (0 to disable)
+timeout 0
+
+# TCP keepalive.
+#
+# If non-zero, use SO_KEEPALIVE to send TCP ACKs to clients in absence
+# of communication. This is useful for two reasons:
+#
+# 1) Detect dead peers.
+# 2) Take the connection alive from the point of view of network
+#    equipment in the middle.
+#
+# On Linux, the specified value (in seconds) is the period used to send ACKs.
+# Note that to close the connection the double of the time is needed.
+# On other kernels the period depends on the kernel configuration.
+#
+# A reasonable value for this option is 300 seconds, which is the new
+# Redis default starting with Redis 3.2.1.
+tcp-keepalive 300
+
+################################# GENERAL #####################################
+
+# By default Redis does not run as a daemon. Use 'yes' if you need it.
+# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
+daemonize yes
+
+# If you run Redis from upstart or systemd, Redis can interact with your
+# supervision tree. Options:
+#   supervised no      - no supervision interaction
+#   supervised upstart - signal upstart by putting Redis into SIGSTOP mode
+#   supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET
+#   supervised auto    - detect upstart or systemd method based on
+#                        UPSTART_JOB or NOTIFY_SOCKET environment variables
+# Note: these supervision methods only signal "process is ready."
+#       They do not enable continuous liveness pings back to your supervisor.
+supervised no
+
+# If a pid file is specified, Redis writes it where specified at startup
+# and removes it at exit.
+#
+# When the server runs non daemonized, no pid file is created if none is
+# specified in the configuration. When the server is daemonized, the pid file
+# is used even if not specified, defaulting to "/var/run/redis.pid".
+#
+# Creating a pid file is best effort: if Redis is not able to create it
+# nothing bad happens, the server will start and run normally.
+pidfile /var/run/redis/redis.pid
+
+# Specify the server verbosity level.
+# This can be one of:
+# debug (a lot of information, useful for development/testing)
+# verbose (many rarely useful info, but not a mess like the debug level)
+# notice (moderately verbose, what you want in production probably)
+# warning (only very important / critical messages are logged)
+loglevel notice
+
+# Specify the log file name. Also the empty string can be used to force
+# Redis to log on the standard output. Note that if you use standard
+# output for logging but daemonize, logs will be sent to /dev/null
+logfile /var/log/redis/redis.log
+
+# To enable logging to the system logger, just set 'syslog-enabled' to yes,
+# and optionally update the other syslog parameters to suit your needs.
+# syslog-enabled no
+
+# Specify the syslog identity.
+# syslog-ident redis
+
+# Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7.
+# syslog-facility local0
+
+# Set the number of databases. The default database is DB 0, you can select
+# a different one on a per-connection basis using SELECT <dbid> where
+# dbid is a number between 0 and 'databases'-1
+databases 16
+
+################################ SNAPSHOTTING  ################################
+#
+# Save the DB on disk:
+#
+#   save <seconds> <changes>
+#
+#   Will save the DB if both the given number of seconds and the given
+#   number of write operations against the DB occurred.
+#
+#   In the example below the behaviour will be to save:
+#   after 900 sec (15 min) if at least 1 key changed
+#   after 300 sec (5 min) if at least 10 keys changed
+#   after 60 sec if at least 10000 keys changed
+#
+#   Note: you can disable saving completely by commenting out all "save" lines.
+#
+#   It is also possible to remove all the previously configured save
+#   points by adding a save directive with a single empty string argument
+#   like in the following example:
+#
+#   save ""
+
+save 900 1
+save 300 10
+save 60 10000
+
+# By default Redis will stop accepting writes if RDB snapshots are enabled
+# (at least one save point) and the latest background save failed.
+# This will make the user aware (in a hard way) that data is not persisting
+# on disk properly, otherwise chances are that no one will notice and some
+# disaster will happen.
+#
+# If the background saving process will start working again Redis will
+# automatically allow writes again.
+#
+# However if you have setup your proper monitoring of the Redis server
+# and persistence, you may want to disable this feature so that Redis will
+# continue to work as usual even if there are problems with disk,
+# permissions, and so forth.
+stop-writes-on-bgsave-error yes
+
+# Compress string objects using LZF when dump .rdb databases?
+# For default that's set to 'yes' as it's almost always a win.
+# If you want to save some CPU in the saving child set it to 'no' but
+# the dataset will likely be bigger if you have compressible values or keys.
+rdbcompression yes
+
+# Since version 5 of RDB a CRC64 checksum is placed at the end of the file.
+# This makes the format more resistant to corruption but there is a performance
+# hit to pay (around 10%) when saving and loading RDB files, so you can disable it
+# for maximum performances.
+#
+# RDB files created with checksum disabled have a checksum of zero that will
+# tell the loading code to skip the check.
+rdbchecksum yes
+
+# The filename where to dump the DB
+dbfilename dump.rdb
+
+# The working directory.
+#
+# The DB will be written inside this directory, with the filename specified
+# above using the 'dbfilename' configuration directive.
+#
+# The Append Only File will also be created inside this directory.
+#
+# Note that you must specify a directory here, not a file name.
+dir /var/db/redis/
+
+################################# REPLICATION #################################
+
+# Master-Slave replication. Use slaveof to make a Redis instance a copy of
+# another Redis server. A few things to understand ASAP about Redis replication.
+#
+# 1) Redis replication is asynchronous, but you can configure a master to
+#    stop accepting writes if it appears to be not connected with at least
+#    a given number of slaves.
+# 2) Redis slaves are able to perform a partial resynchronization with the
+#    master if the replication link is lost for a relatively small amount of
+#    time. You may want to configure the replication backlog size (see the next
+#    sections of this file) with a sensible value depending on your needs.
+# 3) Replication is automatic and does not need user intervention. After a
+#    network partition slaves automatically try to reconnect to masters
+#    and resynchronize with them.
+#
+# slaveof <masterip> <masterport>
+
+# If the master is password protected (using the "requirepass" configuration
+# directive below) it is possible to tell the slave to authenticate before
+# starting the replication synchronization process, otherwise the master will
+# refuse the slave request.
+#
+# masterauth <master-password>
+
+# When a slave loses its connection with the master, or when the replication
+# is still in progress, the slave can act in two different ways:
+#
+# 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will
+#    still reply to client requests, possibly with out of date data, or the
+#    data set may just be empty if this is the first synchronization.
+#
+# 2) if slave-serve-stale-data is set to 'no' the slave will reply with
+#    an error "SYNC with master in progress" to all the kind of commands
+#    but to INFO and SLAVEOF.
+#
+slave-serve-stale-data yes
+
+# You can configure a slave instance to accept writes or not. Writing against
+# a slave instance may be useful to store some ephemeral data (because data
+# written on a slave will be easily deleted after resync with the master) but
+# may also cause problems if clients are writing to it because of a
+# misconfiguration.
+#
+# Since Redis 2.6 by default slaves are read-only.
+#
+# Note: read only slaves are not designed to be exposed to untrusted clients
+# on the internet. It's just a protection layer against misuse of the instance.
+# Still a read only slave exports by default all the administrative commands
+# such as CONFIG, DEBUG, and so forth. To a limited extent you can improve
+# security of read only slaves using 'rename-command' to shadow all the
+# administrative / dangerous commands.
+slave-read-only yes
+
+# Replication SYNC strategy: disk or socket.
+#
+# -------------------------------------------------------
+# WARNING: DISKLESS REPLICATION IS EXPERIMENTAL CURRENTLY
+# -------------------------------------------------------
+#
+# New slaves and reconnecting slaves that are not able to continue the replication
+# process just receiving differences, need to do what is called a "full
+# synchronization". An RDB file is transmitted from the master to the slaves.
+# The transmission can happen in two different ways:
+#
+# 1) Disk-backed: The Redis master creates a new process that writes the RDB
+#                 file on disk. Later the file is transferred by the parent
+#                 process to the slaves incrementally.
+# 2) Diskless: The Redis master creates a new process that directly writes the
+#              RDB file to slave sockets, without touching the disk at all.
+#
+# With disk-backed replication, while the RDB file is generated, more slaves
+# can be queued and served with the RDB file as soon as the current child producing
+# the RDB file finishes its work. With diskless replication instead once
+# the transfer starts, new slaves arriving will be queued and a new transfer
+# will start when the current one terminates.
+#
+# When diskless replication is used, the master waits a configurable amount of
+# time (in seconds) before starting the transfer in the hope that multiple slaves
+# will arrive and the transfer can be parallelized.
+#
+# With slow disks and fast (large bandwidth) networks, diskless replication
+# works better.
+repl-diskless-sync no
+
+# When diskless replication is enabled, it is possible to configure the delay
+# the server waits in order to spawn the child that transfers the RDB via socket
+# to the slaves.
+#
+# This is important since once the transfer starts, it is not possible to serve
+# new slaves arriving, that will be queued for the next RDB transfer, so the server
+# waits a delay in order to let more slaves arrive.
+#
+# The delay is specified in seconds, and by default is 5 seconds. To disable
+# it entirely just set it to 0 seconds and the transfer will start ASAP.
+repl-diskless-sync-delay 5
+
+# Slaves send PINGs to server in a predefined interval. It's possible to change
+# this interval with the repl_ping_slave_period option. The default value is 10
+# seconds.
+#
+# repl-ping-slave-period 10
+
+# The following option sets the replication timeout for:
+#
+# 1) Bulk transfer I/O during SYNC, from the point of view of slave.
+# 2) Master timeout from the point of view of slaves (data, pings).
+# 3) Slave timeout from the point of view of masters (REPLCONF ACK pings).
+#
+# It is important to make sure that this value is greater than the value
+# specified for repl-ping-slave-period otherwise a timeout will be detected
+# every time there is low traffic between the master and the slave.
+#
+# repl-timeout 60
+
+# Disable TCP_NODELAY on the slave socket after SYNC?
+#
+# If you select "yes" Redis will use a smaller number of TCP packets and
+# less bandwidth to send data to slaves. But this can add a delay for
+# the data to appear on the slave side, up to 40 milliseconds with
+# Linux kernels using a default configuration.
+#
+# If you select "no" the delay for data to appear on the slave side will
+# be reduced but more bandwidth will be used for replication.
+#
+# By default we optimize for low latency, but in very high traffic conditions
+# or when the master and slaves are many hops away, turning this to "yes" may
+# be a good idea.
+repl-disable-tcp-nodelay no
+
+# Set the replication backlog size. The backlog is a buffer that accumulates
+# slave data when slaves are disconnected for some time, so that when a slave
+# wants to reconnect again, often a full resync is not needed, but a partial
+# resync is enough, just passing the portion of data the slave missed while
+# disconnected.
+#
+# The bigger the replication backlog, the longer the time the slave can be
+# disconnected and later be able to perform a partial resynchronization.
+#
+# The backlog is only allocated once there is at least a slave connected.
+#
+# repl-backlog-size 1mb
+
+# After a master has no longer connected slaves for some time, the backlog
+# will be freed. The following option configures the amount of seconds that
+# need to elapse, starting from the time the last slave disconnected, for
+# the backlog buffer to be freed.
+#
+# A value of 0 means to never release the backlog.
+#
+# repl-backlog-ttl 3600
+
+# The slave priority is an integer number published by Redis in the INFO output.
+# It is used by Redis Sentinel in order to select a slave to promote into a
+# master if the master is no longer working correctly.
+#
+# A slave with a low priority number is considered better for promotion, so
+# for instance if there are three slaves with priority 10, 100, 25 Sentinel will
+# pick the one with priority 10, that is the lowest.
+#
+# However a special priority of 0 marks the slave as not able to perform the
+# role of master, so a slave with priority of 0 will never be selected by
+# Redis Sentinel for promotion.
+#
+# By default the priority is 100.
+slave-priority 100
+
+# It is possible for a master to stop accepting writes if there are less than
+# N slaves connected, having a lag less or equal than M seconds.
+#
+# The N slaves need to be in "online" state.
+#
+# The lag in seconds, that must be <= the specified value, is calculated from
+# the last ping received from the slave, that is usually sent every second.
+#
+# This option does not GUARANTEE that N replicas will accept the write, but
+# will limit the window of exposure for lost writes in case not enough slaves
+# are available, to the specified number of seconds.
+#
+# For example to require at least 3 slaves with a lag <= 10 seconds use:
+#
+# min-slaves-to-write 3
+# min-slaves-max-lag 10
+#
+# Setting one or the other to 0 disables the feature.
+#
+# By default min-slaves-to-write is set to 0 (feature disabled) and
+# min-slaves-max-lag is set to 10.
+
+# A Redis master is able to list the address and port of the attached
+# slaves in different ways. For example the "INFO replication" section
+# offers this information, which is used, among other tools, by
+# Redis Sentinel in order to discover slave instances.
+# Another place where this info is available is in the output of the
+# "ROLE" command of a masteer.
+#
+# The listed IP and address normally reported by a slave is obtained
+# in the following way:
+#
+#   IP: The address is auto detected by checking the peer address
+#   of the socket used by the slave to connect with the master.
+#
+#   Port: The port is communicated by the slave during the replication
+#   handshake, and is normally the port that the slave is using to
+#   list for connections.
+#
+# However when port forwarding or Network Address Translation (NAT) is
+# used, the slave may be actually reachable via different IP and port
+# pairs. The following two options can be used by a slave in order to
+# report to its master a specific set of IP and port, so that both INFO
+# and ROLE will report those values.
+#
+# There is no need to use both the options if you need to override just
+# the port or the IP address.
+#
+# slave-announce-ip 5.5.5.5
+# slave-announce-port 1234
+
+################################## SECURITY ###################################
+
+# Require clients to issue AUTH <PASSWORD> before processing any other
+# commands.  This might be useful in environments in which you do not trust
+# others with access to the host running redis-server.
+#
+# This should stay commented out for backward compatibility and because most
+# people do not need auth (e.g. they run their own servers).
+#
+# Warning: since Redis is pretty fast an outside user can try up to
+# 150k passwords per second against a good box. This means that you should
+# use a very strong password otherwise it will be very easy to break.
+#
+# requirepass foobared
+
+# Command renaming.
+#
+# It is possible to change the name of dangerous commands in a shared
+# environment. For instance the CONFIG command may be renamed into something
+# hard to guess so that it will still be available for internal-use tools
+# but not available for general clients.
+#
+# Example:
+#
+# rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52
+#
+# It is also possible to completely kill a command by renaming it into
+# an empty string:
+#
+# rename-command CONFIG ""
+#
+# Please note that changing the name of commands that are logged into the
+# AOF file or transmitted to slaves may cause problems.
+
+################################### LIMITS ####################################
+
+# Set the max number of connected clients at the same time. By default
+# this limit is set to 10000 clients, however if the Redis server is not
+# able to configure the process file limit to allow for the specified limit
+# the max number of allowed clients is set to the current file limit
+# minus 32 (as Redis reserves a few file descriptors for internal uses).
+#
+# Once the limit is reached Redis will close all the new connections sending
+# an error 'max number of clients reached'.
+#
+# maxclients 10000
+
+# Don't use more memory than the specified amount of bytes.
+# When the memory limit is reached Redis will try to remove keys
+# according to the eviction policy selected (see maxmemory-policy).
+#
+# If Redis can't remove keys according to the policy, or if the policy is
+# set to 'noeviction', Redis will start to reply with errors to commands
+# that would use more memory, like SET, LPUSH, and so on, and will continue
+# to reply to read-only commands like GET.
+#
+# This option is usually useful when using Redis as an LRU cache, or to set
+# a hard memory limit for an instance (using the 'noeviction' policy).
+#
+# WARNING: If you have slaves attached to an instance with maxmemory on,
+# the size of the output buffers needed to feed the slaves are subtracted
+# from the used memory count, so that network problems / resyncs will
+# not trigger a loop where keys are evicted, and in turn the output
+# buffer of slaves is full with DELs of keys evicted triggering the deletion
+# of more keys, and so forth until the database is completely emptied.
+#
+# In short... if you have slaves attached it is suggested that you set a lower
+# limit for maxmemory so that there is some free RAM on the system for slave
+# output buffers (but this is not needed if the policy is 'noeviction').
+#
+# maxmemory <bytes>
+
+# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
+# is reached. You can select among five behaviors:
+#
+# volatile-lru -> remove the key with an expire set using an LRU algorithm
+# allkeys-lru -> remove any key according to the LRU algorithm
+# volatile-random -> remove a random key with an expire set
+# allkeys-random -> remove a random key, any key
+# volatile-ttl -> remove the key with the nearest expire time (minor TTL)
+# noeviction -> don't expire at all, just return an error on write operations
+#
+# Note: with any of the above policies, Redis will return an error on write
+#       operations, when there are no suitable keys for eviction.
+#
+#       At the date of writing these commands are: set setnx setex append
+#       incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd
+#       sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby
+#       zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby
+#       getset mset msetnx exec sort
+#
+# The default is:
+#
+# maxmemory-policy noeviction
+
+# LRU and minimal TTL algorithms are not precise algorithms but approximated
+# algorithms (in order to save memory), so you can tune it for speed or
+# accuracy. For default Redis will check five keys and pick the one that was
+# used less recently, you can change the sample size using the following
+# configuration directive.
+#
+# The default of 5 produces good enough results. 10 Approximates very closely
+# true LRU but costs a bit more CPU. 3 is very fast but not very accurate.
+#
+# maxmemory-samples 5
+
+############################## APPEND ONLY MODE ###############################
+
+# By default Redis asynchronously dumps the dataset on disk. This mode is
+# good enough in many applications, but an issue with the Redis process or
+# a power outage may result into a few minutes of writes lost (depending on
+# the configured save points).
+#
+# The Append Only File is an alternative persistence mode that provides
+# much better durability. For instance using the default data fsync policy
+# (see later in the config file) Redis can lose just one second of writes in a
+# dramatic event like a server power outage, or a single write if something
+# wrong with the Redis process itself happens, but the operating system is
+# still running correctly.
+#
+# AOF and RDB persistence can be enabled at the same time without problems.
+# If the AOF is enabled on startup Redis will load the AOF, that is the file
+# with the better durability guarantees.
+#
+# Please check http://redis.io/topics/persistence for more information.
+
+appendonly no
+
+# The name of the append only file (default: "appendonly.aof")
+
+appendfilename "appendonly.aof"
+
+# The fsync() call tells the Operating System to actually write data on disk
+# instead of waiting for more data in the output buffer. Some OS will really flush
+# data on disk, some other OS will just try to do it ASAP.
+#
+# Redis supports three different modes:
+#
+# no: don't fsync, just let the OS flush the data when it wants. Faster.
+# always: fsync after every write to the append only log. Slow, Safest.
+# everysec: fsync only one time every second. Compromise.
+#
+# The default is "everysec", as that's usually the right compromise between
+# speed and data safety. It's up to you to understand if you can relax this to
+# "no" that will let the operating system flush the output buffer when
+# it wants, for better performances (but if you can live with the idea of
+# some data loss consider the default persistence mode that's snapshotting),
+# or on the contrary, use "always" that's very slow but a bit safer than
+# everysec.
+#
+# More details please check the following article:
+# http://antirez.com/post/redis-persistence-demystified.html
+#
+# If unsure, use "everysec".
+
+# appendfsync always
+appendfsync everysec
+# appendfsync no
+
+# When the AOF fsync policy is set to always or everysec, and a background
+# saving process (a background save or AOF log background rewriting) is
+# performing a lot of I/O against the disk, in some Linux configurations
+# Redis may block too long on the fsync() call. Note that there is no fix for
+# this currently, as even performing fsync in a different thread will block
+# our synchronous write(2) call.
+#
+# In order to mitigate this problem it's possible to use the following option
+# that will prevent fsync() from being called in the main process while a
+# BGSAVE or BGREWRITEAOF is in progress.
+#
+# This means that while another child is saving, the durability of Redis is
+# the same as "appendfsync none". In practical terms, this means that it is
+# possible to lose up to 30 seconds of log in the worst scenario (with the
+# default Linux settings).
+#
+# If you have latency problems turn this to "yes". Otherwise leave it as
+# "no" that is the safest pick from the point of view of durability.
+
+no-appendfsync-on-rewrite no
+
+# Automatic rewrite of the append only file.
+# Redis is able to automatically rewrite the log file implicitly calling
+# BGREWRITEAOF when the AOF log size grows by the specified percentage.
+#
+# This is how it works: Redis remembers the size of the AOF file after the
+# latest rewrite (if no rewrite has happened since the restart, the size of
+# the AOF at startup is used).
+#
+# This base size is compared to the current size. If the current size is
+# bigger than the specified percentage, the rewrite is triggered. Also
+# you need to specify a minimal size for the AOF file to be rewritten, this
+# is useful to avoid rewriting the AOF file even if the percentage increase
+# is reached but it is still pretty small.
+#
+# Specify a percentage of zero in order to disable the automatic AOF
+# rewrite feature.
+
+auto-aof-rewrite-percentage 100
+auto-aof-rewrite-min-size 64mb
+
+# An AOF file may be found to be truncated at the end during the Redis
+# startup process, when the AOF data gets loaded back into memory.
+# This may happen when the system where Redis is running
+# crashes, especially when an ext4 filesystem is mounted without the
+# data=ordered option (however this can't happen when Redis itself
+# crashes or aborts but the operating system still works correctly).
+#
+# Redis can either exit with an error when this happens, or load as much
+# data as possible (the default now) and start if the AOF file is found
+# to be truncated at the end. The following option controls this behavior.
+#
+# If aof-load-truncated is set to yes, a truncated AOF file is loaded and
+# the Redis server starts emitting a log to inform the user of the event.
+# Otherwise if the option is set to no, the server aborts with an error
+# and refuses to start. When the option is set to no, the user requires
+# to fix the AOF file using the "redis-check-aof" utility before to restart
+# the server.
+#
+# Note that if the AOF file will be found to be corrupted in the middle
+# the server will still exit with an error. This option only applies when
+# Redis will try to read more data from the AOF file but not enough bytes
+# will be found.
+aof-load-truncated yes
+
+################################ LUA SCRIPTING  ###############################
+
+# Max execution time of a Lua script in milliseconds.
+#
+# If the maximum execution time is reached Redis will log that a script is
+# still in execution after the maximum allowed time and will start to
+# reply to queries with an error.
+#
+# When a long running script exceeds the maximum execution time only the
+# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be
+# used to stop a script that did not yet called write commands. The second
+# is the only way to shut down the server in the case a write command was
+# already issued by the script but the user doesn't want to wait for the natural
+# termination of the script.
+#
+# Set it to 0 or a negative value for unlimited execution without warnings.
+lua-time-limit 5000
+
+################################ REDIS CLUSTER  ###############################
+#
+# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+# WARNING EXPERIMENTAL: Redis Cluster is considered to be stable code, however
+# in order to mark it as "mature" we need to wait for a non trivial percentage
+# of users to deploy it in production.
+# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#
+# Normal Redis instances can't be part of a Redis Cluster; only nodes that are
+# started as cluster nodes can. In order to start a Redis instance as a
+# cluster node enable the cluster support uncommenting the following:
+#
+# cluster-enabled yes
+
+# Every cluster node has a cluster configuration file. This file is not
+# intended to be edited by hand. It is created and updated by Redis nodes.
+# Every Redis Cluster node requires a different cluster configuration file.
+# Make sure that instances running in the same system do not have
+# overlapping cluster configuration file names.
+#
+# cluster-config-file nodes-6379.conf
+
+# Cluster node timeout is the amount of milliseconds a node must be unreachable
+# for it to be considered in failure state.
+# Most other internal time limits are multiple of the node timeout.
+#
+# cluster-node-timeout 15000
+
+# A slave of a failing master will avoid to start a failover if its data
+# looks too old.
+#
+# There is no simple way for a slave to actually have a exact measure of
+# its "data age", so the following two checks are performed:
+#
+# 1) If there are multiple slaves able to failover, they exchange messages
+#    in order to try to give an advantage to the slave with the best
+#    replication offset (more data from the master processed).
+#    Slaves will try to get their rank by offset, and apply to the start
+#    of the failover a delay proportional to their rank.
+#
+# 2) Every single slave computes the time of the last interaction with
+#    its master. This can be the last ping or command received (if the master
+#    is still in the "connected" state), or the time that elapsed since the
+#    disconnection with the master (if the replication link is currently down).
+#    If the last interaction is too old, the slave will not try to failover
+#    at all.
+#
+# The point "2" can be tuned by user. Specifically a slave will not perform
+# the failover if, since the last interaction with the master, the time
+# elapsed is greater than:
+#
+#   (node-timeout * slave-validity-factor) + repl-ping-slave-period
+#
+# So for example if node-timeout is 30 seconds, and the slave-validity-factor
+# is 10, and assuming a default repl-ping-slave-period of 10 seconds, the
+# slave will not try to failover if it was not able to talk with the master
+# for longer than 310 seconds.
+#
+# A large slave-validity-factor may allow slaves with too old data to failover
+# a master, while a too small value may prevent the cluster from being able to
+# elect a slave at all.
+#
+# For maximum availability, it is possible to set the slave-validity-factor
+# to a value of 0, which means, that slaves will always try to failover the
+# master regardless of the last time they interacted with the master.
+# (However they'll always try to apply a delay proportional to their
+# offset rank).
+#
+# Zero is the only value able to guarantee that when all the partitions heal
+# the cluster will always be able to continue.
+#
+# cluster-slave-validity-factor 10
+
+# Cluster slaves are able to migrate to orphaned masters, that are masters
+# that are left without working slaves. This improves the cluster ability
+# to resist to failures as otherwise an orphaned master can't be failed over
+# in case of failure if it has no working slaves.
+#
+# Slaves migrate to orphaned masters only if there are still at least a
+# given number of other working slaves for their old master. This number
+# is the "migration barrier". A migration barrier of 1 means that a slave
+# will migrate only if there is at least 1 other working slave for its master
+# and so forth. It usually reflects the number of slaves you want for every
+# master in your cluster.
+#
+# Default is 1 (slaves migrate only if their masters remain with at least
+# one slave). To disable migration just set it to a very large value.
+# A value of 0 can be set but is useful only for debugging and dangerous
+# in production.
+#
+# cluster-migration-barrier 1
+
+# By default Redis Cluster nodes stop accepting queries if they detect there
+# is at least an hash slot uncovered (no available node is serving it).
+# This way if the cluster is partially down (for example a range of hash slots
+# are no longer covered) all the cluster becomes, eventually, unavailable.
+# It automatically returns available as soon as all the slots are covered again.
+#
+# However sometimes you want the subset of the cluster which is working,
+# to continue to accept queries for the part of the key space that is still
+# covered. In order to do so, just set the cluster-require-full-coverage
+# option to no.
+#
+# cluster-require-full-coverage yes
+
+# In order to setup your cluster make sure to read the documentation
+# available at http://redis.io web site.
+
+################################## SLOW LOG ###################################
+
+# The Redis Slow Log is a system to log queries that exceeded a specified
+# execution time. The execution time does not include the I/O operations
+# like talking with the client, sending the reply and so forth,
+# but just the time needed to actually execute the command (this is the only
+# stage of command execution where the thread is blocked and can not serve
+# other requests in the meantime).
+#
+# You can configure the slow log with two parameters: one tells Redis
+# what is the execution time, in microseconds, to exceed in order for the
+# command to get logged, and the other parameter is the length of the
+# slow log. When a new command is logged the oldest one is removed from the
+# queue of logged commands.
+
+# The following time is expressed in microseconds, so 1000000 is equivalent
+# to one second. Note that a negative number disables the slow log, while
+# a value of zero forces the logging of every command.
+slowlog-log-slower-than 10000
+
+# There is no limit to this length. Just be aware that it will consume memory.
+# You can reclaim memory used by the slow log with SLOWLOG RESET.
+slowlog-max-len 128
+
+################################ LATENCY MONITOR ##############################
+
+# The Redis latency monitoring subsystem samples different operations
+# at runtime in order to collect data related to possible sources of
+# latency of a Redis instance.
+#
+# Via the LATENCY command this information is available to the user that can
+# print graphs and obtain reports.
+#
+# The system only logs operations that were performed in a time equal or
+# greater than the amount of milliseconds specified via the
+# latency-monitor-threshold configuration directive. When its value is set
+# to zero, the latency monitor is turned off.
+#
+# By default latency monitoring is disabled since it is mostly not needed
+# if you don't have latency issues, and collecting data has a performance
+# impact, that while very small, can be measured under big load. Latency
+# monitoring can easily be enabled at runtime using the command
+# "CONFIG SET latency-monitor-threshold <milliseconds>" if needed.
+latency-monitor-threshold 0
+
+############################# EVENT NOTIFICATION ##############################
+
+# Redis can notify Pub/Sub clients about events happening in the key space.
+# This feature is documented at http://redis.io/topics/notifications
+#
+# For instance if keyspace events notification is enabled, and a client
+# performs a DEL operation on key "foo" stored in the Database 0, two
+# messages will be published via Pub/Sub:
+#
+# PUBLISH __keyspace@0__:foo del
+# PUBLISH __keyevent@0__:del foo
+#
+# It is possible to select the events that Redis will notify among a set
+# of classes. Every class is identified by a single character:
+#
+#  K     Keyspace events, published with __keyspace@<db>__ prefix.
+#  E     Keyevent events, published with __keyevent@<db>__ prefix.
+#  g     Generic commands (non-type specific) like DEL, EXPIRE, RENAME, ...
+#  $     String commands
+#  l     List commands
+#  s     Set commands
+#  h     Hash commands
+#  z     Sorted set commands
+#  x     Expired events (events generated every time a key expires)
+#  e     Evicted events (events generated when a key is evicted for maxmemory)
+#  A     Alias for g$lshzxe, so that the "AKE" string means all the events.
+#
+#  The "notify-keyspace-events" takes as argument a string that is composed
+#  of zero or multiple characters. The empty string means that notifications
+#  are disabled.
+#
+#  Example: to enable list and generic events, from the point of view of the
+#           event name, use:
+#
+#  notify-keyspace-events Elg
+#
+#  Example 2: to get the stream of the expired keys subscribing to channel
+#             name __keyevent@0__:expired use:
+#
+#  notify-keyspace-events Ex
+#
+#  By default all notifications are disabled because most users don't need
+#  this feature and the feature has some overhead. Note that if you don't
+#  specify at least one of K or E, no events will be delivered.
+notify-keyspace-events ""
+
+############################### ADVANCED CONFIG ###############################
+
+# Hashes are encoded using a memory efficient data structure when they have a
+# small number of entries, and the biggest entry does not exceed a given
+# threshold. These thresholds can be configured using the following directives.
+hash-max-ziplist-entries 512
+hash-max-ziplist-value 64
+
+# Lists are also encoded in a special way to save a lot of space.
+# The number of entries allowed per internal list node can be specified
+# as a fixed maximum size or a maximum number of elements.
+# For a fixed maximum size, use -5 through -1, meaning:
+# -5: max size: 64 Kb  <-- not recommended for normal workloads
+# -4: max size: 32 Kb  <-- not recommended
+# -3: max size: 16 Kb  <-- probably not recommended
+# -2: max size: 8 Kb   <-- good
+# -1: max size: 4 Kb   <-- good
+# Positive numbers mean store up to _exactly_ that number of elements
+# per list node.
+# The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size),
+# but if your use case is unique, adjust the settings as necessary.
+list-max-ziplist-size -2
+
+# Lists may also be compressed.
+# Compress depth is the number of quicklist ziplist nodes from *each* side of
+# the list to *exclude* from compression.  The head and tail of the list
+# are always uncompressed for fast push/pop operations.  Settings are:
+# 0: disable all list compression
+# 1: depth 1 means "don't start compressing until after 1 node into the list,
+#    going from either the head or tail"
+#    So: [head]->node->node->...->node->[tail]
+#    [head], [tail] will always be uncompressed; inner nodes will compress.
+# 2: [head]->[next]->node->node->...->node->[prev]->[tail]
+#    2 here means: don't compress head or head->next or tail->prev or tail,
+#    but compress all nodes between them.
+# 3: [head]->[next]->[next]->node->node->...->node->[prev]->[prev]->[tail]
+# etc.
+list-compress-depth 0
+
+# Sets have a special encoding in just one case: when a set is composed
+# of just strings that happen to be integers in radix 10 in the range
+# of 64 bit signed integers.
+# The following configuration setting sets the limit in the size of the
+# set in order to use this special memory saving encoding.
+set-max-intset-entries 512
+
+# Similarly to hashes and lists, sorted sets are also specially encoded in
+# order to save a lot of space. This encoding is only used when the length and
+# elements of a sorted set are below the following limits:
+zset-max-ziplist-entries 128
+zset-max-ziplist-value 64
+
+# HyperLogLog sparse representation bytes limit. The limit includes the
+# 16 bytes header. When an HyperLogLog using the sparse representation crosses
+# this limit, it is converted into the dense representation.
+#
+# A value greater than 16000 is totally useless, since at that point the
+# dense representation is more memory efficient.
+#
+# The suggested value is ~ 3000 in order to have the benefits of
+# the space efficient encoding without slowing down too much PFADD,
+# which is O(N) with the sparse encoding. The value can be raised to
+# ~ 10000 when CPU is not a concern, but space is, and the data set is
+# composed of many HyperLogLogs with cardinality in the 0 - 15000 range.
+hll-sparse-max-bytes 3000
+
+# Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in
+# order to help rehashing the main Redis hash table (the one mapping top-level
+# keys to values). The hash table implementation Redis uses (see dict.c)
+# performs a lazy rehashing: the more operation you run into a hash table
+# that is rehashing, the more rehashing "steps" are performed, so if the
+# server is idle the rehashing is never complete and some more memory is used
+# by the hash table.
+#
+# The default is to use this millisecond 10 times every second in order to
+# actively rehash the main dictionaries, freeing memory when possible.
+#
+# If unsure:
+# use "activerehashing no" if you have hard latency requirements and it is
+# not a good thing in your environment that Redis can reply from time to time
+# to queries with 2 milliseconds delay.
+#
+# use "activerehashing yes" if you don't have such hard requirements but
+# want to free memory asap when possible.
+activerehashing yes
+
+# The client output buffer limits can be used to force disconnection of clients
+# that are not reading data from the server fast enough for some reason (a
+# common reason is that a Pub/Sub client can't consume messages as fast as the
+# publisher can produce them).
+#
+# The limit can be set differently for the three different classes of clients:
+#
+# normal -> normal clients including MONITOR clients
+# slave  -> slave clients
+# pubsub -> clients subscribed to at least one pubsub channel or pattern
+#
+# The syntax of every client-output-buffer-limit directive is the following:
+#
+# client-output-buffer-limit <class> <hard limit> <soft limit> <soft seconds>
+#
+# A client is immediately disconnected once the hard limit is reached, or if
+# the soft limit is reached and remains reached for the specified number of
+# seconds (continuously).
+# So for instance if the hard limit is 32 megabytes and the soft limit is
+# 16 megabytes / 10 seconds, the client will get disconnected immediately
+# if the size of the output buffers reach 32 megabytes, but will also get
+# disconnected if the client reaches 16 megabytes and continuously overcomes
+# the limit for 10 seconds.
+#
+# By default normal clients are not limited because they don't receive data
+# without asking (in a push way), but just after a request, so only
+# asynchronous clients may create a scenario where data is requested faster
+# than it can read.
+#
+# Instead there is a default limit for pubsub and slave clients, since
+# subscribers and slaves receive data in a push fashion.
+#
+# Both the hard or the soft limit can be disabled by setting them to zero.
+client-output-buffer-limit normal 0 0 0
+client-output-buffer-limit slave 256mb 64mb 60
+client-output-buffer-limit pubsub 32mb 8mb 60
+
+# Redis calls an internal function to perform many background tasks, like
+# closing connections of clients in timeout, purging expired keys that are
+# never requested, and so forth.
+#
+# Not all tasks are performed with the same frequency, but Redis checks for
+# tasks to perform according to the specified "hz" value.
+#
+# By default "hz" is set to 10. Raising the value will use more CPU when
+# Redis is idle, but at the same time will make Redis more responsive when
+# there are many keys expiring at the same time, and timeouts may be
+# handled with more precision.
+#
+# The range is between 1 and 500, however a value over 100 is usually not
+# a good idea. Most users should use the default of 10 and raise this up to
+# 100 only in environments where very low latency is required.
+hz 10
+
+# When a child rewrites the AOF file, if the following option is enabled
+# the file will be fsync-ed every 32 MB of data generated. This is useful
+# in order to commit the file to the disk more incrementally and avoid
+# big latency spikes.
+aof-rewrite-incremental-fsync yes
diff --git a/jails/nextcloud/includes/remove-staging.sh b/jails/nextcloud/includes/remove-staging.sh
new file mode 100755
index 00000000..63c68891
--- /dev/null
+++ b/jails/nextcloud/includes/remove-staging.sh
@@ -0,0 +1,5 @@
+#!/usr/local/bin/bash
+# Remove acme-staging CA from Caddyfile, so Caddy gets production certs
+
+sed -ri.bak 's/-staging//' /usr/local/www/Caddyfile
+service caddy restart
diff --git a/jails/nextcloud/includes/www-crontab b/jails/nextcloud/includes/www-crontab
new file mode 100755
index 00000000..7592ab6c
--- /dev/null
+++ b/jails/nextcloud/includes/www-crontab
@@ -0,0 +1 @@
+*/5 * * * * /usr/local/bin/php -f /usr/local/www/nextcloud/cron.php
diff --git a/jails/nextcloud/includes/www.conf b/jails/nextcloud/includes/www.conf
new file mode 100755
index 00000000..e7287bba
--- /dev/null
+++ b/jails/nextcloud/includes/www.conf
@@ -0,0 +1,417 @@
+; Start a new pool named 'www'.
+; the variable $pool can be used in any directive and will be replaced by the
+; pool name ('www' here)
+[www]
+
+; Per pool prefix
+; It only applies on the following directives:
+; - 'access.log'
+; - 'slowlog'
+; - 'listen' (unixsocket)
+; - 'chroot'
+; - 'chdir'
+; - 'php_values'
+; - 'php_admin_values'
+; When not set, the global prefix (or /usr/local) applies instead.
+; Note: This directive can also be relative to the global prefix.
+; Default Value: none
+;prefix = /path/to/pools/$pool
+
+; Unix user/group of processes
+; Note: The user is mandatory. If the group is not set, the default user's group
+;       will be used.
+user = www
+group = www
+
+; The address on which to accept FastCGI requests.
+; Valid syntaxes are:
+;   'ip.add.re.ss:port'    - to listen on a TCP socket to a specific IPv4 address on
+;                            a specific port;
+;   '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on
+;                            a specific port;
+;   'port'                 - to listen on a TCP socket to all addresses
+;                            (IPv6 and IPv4-mapped) on a specific port;
+;   '/path/to/unix/socket' - to listen on a unix socket.
+; Note: This value is mandatory.
+listen = 127.0.0.1:9000
+
+; Set listen(2) backlog.
+; Default Value: 511 (-1 on FreeBSD and OpenBSD)
+;listen.backlog = 511
+
+; Set permissions for unix socket, if one is used. In Linux, read/write
+; permissions must be set in order to allow connections from a web server. Many
+; BSD-derived systems allow connections regardless of permissions.
+; Default Values: user and group are set as the running user
+;                 mode is set to 0660
+;listen.owner = www
+;listen.group = www
+;listen.mode = 0660
+; When POSIX Access Control Lists are supported you can set them using
+; these options, value is a comma separated list of user/group names.
+; When set, listen.owner and listen.group are ignored
+;listen.acl_users =
+;listen.acl_groups =
+
+; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect.
+; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
+; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address
+; must be separated by a comma. If this value is left blank, connections will be
+; accepted from any ip address.
+; Default Value: any
+;listen.allowed_clients = 127.0.0.1
+
+; Specify the nice(2) priority to apply to the pool processes (only if set)
+; The value can vary from -19 (highest priority) to 20 (lower priority)
+; Note: - It will only work if the FPM master process is launched as root
+;       - The pool processes will inherit the master process priority
+;         unless it specified otherwise
+; Default Value: no set
+; process.priority = -19
+
+; Choose how the process manager will control the number of child processes.
+; Possible Values:
+;   static  - a fixed number (pm.max_children) of child processes;
+;   dynamic - the number of child processes are set dynamically based on the
+;             following directives. With this process management, there will be
+;             always at least 1 children.
+;             pm.max_children      - the maximum number of children that can
+;                                    be alive at the same time.
+;             pm.start_servers     - the number of children created on startup.
+;             pm.min_spare_servers - the minimum number of children in 'idle'
+;                                    state (waiting to process). If the number
+;                                    of 'idle' processes is less than this
+;                                    number then some children will be created.
+;             pm.max_spare_servers - the maximum number of children in 'idle'
+;                                    state (waiting to process). If the number
+;                                    of 'idle' processes is greater than this
+;                                    number then some children will be killed.
+;  ondemand - no children are created at startup. Children will be forked when
+;             new requests will connect. The following parameter are used:
+;             pm.max_children           - the maximum number of children that
+;                                         can be alive at the same time.
+;             pm.process_idle_timeout   - The number of seconds after which
+;                                         an idle process will be killed.
+; Note: This value is mandatory.
+pm = dynamic
+
+; The number of child processes to be created when pm is set to 'static' and the
+; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'.
+; This value sets the limit on the number of simultaneous requests that will be
+; served. Equivalent to the ApacheMaxClients directive with mpm_prefork.
+; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP
+; CGI. The below defaults are based on a server without much resources. Don't
+; forget to tweak pm.* to fit your needs.
+; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand'
+; Note: This value is mandatory.
+pm.max_children = 10
+
+; The number of child processes created on startup.
+; Note: Used only when pm is set to 'dynamic'
+; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2
+pm.start_servers = 2
+
+; The desired minimum number of idle server processes.
+; Note: Used only when pm is set to 'dynamic'
+; Note: Mandatory when pm is set to 'dynamic'
+pm.min_spare_servers = 1
+
+; The desired maximum number of idle server processes.
+; Note: Used only when pm is set to 'dynamic'
+; Note: Mandatory when pm is set to 'dynamic'
+pm.max_spare_servers = 3
+
+; The number of seconds after which an idle process will be killed.
+; Note: Used only when pm is set to 'ondemand'
+; Default Value: 10s
+;pm.process_idle_timeout = 10s;
+
+; The number of requests each child process should execute before respawning.
+; This can be useful to work around memory leaks in 3rd party libraries. For
+; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
+; Default Value: 0
+;pm.max_requests = 500
+
+; The URI to view the FPM status page. If this value is not set, no URI will be
+; recognized as a status page. It shows the following informations:
+;   pool                 - the name of the pool;
+;   process manager      - static, dynamic or ondemand;
+;   start time           - the date and time FPM has started;
+;   start since          - number of seconds since FPM has started;
+;   accepted conn        - the number of request accepted by the pool;
+;   listen queue         - the number of request in the queue of pending
+;                          connections (see backlog in listen(2));
+;   max listen queue     - the maximum number of requests in the queue
+;                          of pending connections since FPM has started;
+;   listen queue len     - the size of the socket queue of pending connections;
+;   idle processes       - the number of idle processes;
+;   active processes     - the number of active processes;
+;   total processes      - the number of idle + active processes;
+;   max active processes - the maximum number of active processes since FPM
+;                          has started;
+;   max children reached - number of times, the process limit has been reached,
+;                          when pm tries to start more children (works only for
+;                          pm 'dynamic' and 'ondemand');
+; Value are updated in real time.
+; Example output:
+;   pool:                 www
+;   process manager:      static
+;   start time:           01/Jul/2011:17:53:49 +0200
+;   start since:          62636
+;   accepted conn:        190460
+;   listen queue:         0
+;   max listen queue:     1
+;   listen queue len:     42
+;   idle processes:       4
+;   active processes:     11
+;   total processes:      15
+;   max active processes: 12
+;   max children reached: 0
+;
+; By default the status page output is formatted as text/plain. Passing either
+; 'html', 'xml' or 'json' in the query string will return the corresponding
+; output syntax. Example:
+;   http://www.foo.bar/status
+;   http://www.foo.bar/status?json
+;   http://www.foo.bar/status?html
+;   http://www.foo.bar/status?xml
+;
+; By default the status page only outputs short status. Passing 'full' in the
+; query string will also return status for each pool process.
+; Example:
+;   http://www.foo.bar/status?full
+;   http://www.foo.bar/status?json&full
+;   http://www.foo.bar/status?html&full
+;   http://www.foo.bar/status?xml&full
+; The Full status returns for each process:
+;   pid                  - the PID of the process;
+;   state                - the state of the process (Idle, Running, ...);
+;   start time           - the date and time the process has started;
+;   start since          - the number of seconds since the process has started;
+;   requests             - the number of requests the process has served;
+;   request duration     - the duration in µs of the requests;
+;   request method       - the request method (GET, POST, ...);
+;   request URI          - the request URI with the query string;
+;   content length       - the content length of the request (only with POST);
+;   user                 - the user (PHP_AUTH_USER) (or '-' if not set);
+;   script               - the main script called (or '-' if not set);
+;   last request cpu     - the %cpu the last request consumed
+;                          it's always 0 if the process is not in Idle state
+;                          because CPU calculation is done when the request
+;                          processing has terminated;
+;   last request memory  - the max amount of memory the last request consumed
+;                          it's always 0 if the process is not in Idle state
+;                          because memory calculation is done when the request
+;                          processing has terminated;
+; If the process is in Idle state, then informations are related to the
+; last request the process has served. Otherwise informations are related to
+; the current request being served.
+; Example output:
+;   ************************
+;   pid:                  31330
+;   state:                Running
+;   start time:           01/Jul/2011:17:53:49 +0200
+;   start since:          63087
+;   requests:             12808
+;   request duration:     1250261
+;   request method:       GET
+;   request URI:          /test_mem.php?N=10000
+;   content length:       0
+;   user:                 -
+;   script:               /home/fat/web/docs/php/test_mem.php
+;   last request cpu:     0.00
+;   last request memory:  0
+;
+; Note: There is a real-time FPM status monitoring sample web page available
+;       It's available in: /usr/local/share/php/fpm/status.html
+;
+; Note: The value must start with a leading slash (/). The value can be
+;       anything, but it may not be a good idea to use the .php extension or it
+;       may conflict with a real PHP file.
+; Default Value: not set
+;pm.status_path = /status
+
+; The ping URI to call the monitoring page of FPM. If this value is not set, no
+; URI will be recognized as a ping page. This could be used to test from outside
+; that FPM is alive and responding, or to
+; - create a graph of FPM availability (rrd or such);
+; - remove a server from a group if it is not responding (load balancing);
+; - trigger alerts for the operating team (24/7).
+; Note: The value must start with a leading slash (/). The value can be
+;       anything, but it may not be a good idea to use the .php extension or it
+;       may conflict with a real PHP file.
+; Default Value: not set
+;ping.path = /ping
+
+; This directive may be used to customize the response of a ping request. The
+; response is formatted as text/plain with a 200 response code.
+; Default Value: pong
+;ping.response = pong
+
+; The access log file
+; Default: not set
+;access.log = log/$pool.access.log
+
+; The access log format.
+; The following syntax is allowed
+;  %%: the '%' character
+;  %C: %CPU used by the request
+;      it can accept the following format:
+;      - %{user}C for user CPU only
+;      - %{system}C for system CPU only
+;      - %{total}C  for user + system CPU (default)
+;  %d: time taken to serve the request
+;      it can accept the following format:
+;      - %{seconds}d (default)
+;      - %{miliseconds}d
+;      - %{mili}d
+;      - %{microseconds}d
+;      - %{micro}d
+;  %e: an environment variable (same as $_ENV or $_SERVER)
+;      it must be associated with embraces to specify the name of the env
+;      variable. Some exemples:
+;      - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e
+;      - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e
+;  %f: script filename
+;  %l: content-length of the request (for POST request only)
+;  %m: request method
+;  %M: peak of memory allocated by PHP
+;      it can accept the following format:
+;      - %{bytes}M (default)
+;      - %{kilobytes}M
+;      - %{kilo}M
+;      - %{megabytes}M
+;      - %{mega}M
+;  %n: pool name
+;  %o: output header
+;      it must be associated with embraces to specify the name of the header:
+;      - %{Content-Type}o
+;      - %{X-Powered-By}o
+;      - %{Transfert-Encoding}o
+;      - ....
+;  %p: PID of the child that serviced the request
+;  %P: PID of the parent of the child that serviced the request
+;  %q: the query string
+;  %Q: the '?' character if query string exists
+;  %r: the request URI (without the query string, see %q and %Q)
+;  %R: remote IP address
+;  %s: status (response code)
+;  %t: server time the request was received
+;      it can accept a strftime(3) format:
+;      %d/%b/%Y:%H:%M:%S %z (default)
+;      The strftime(3) format must be encapsuled in a %{<strftime_format>}t tag
+;      e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
+;  %T: time the log has been written (the request has finished)
+;      it can accept a strftime(3) format:
+;      %d/%b/%Y:%H:%M:%S %z (default)
+;      The strftime(3) format must be encapsuled in a %{<strftime_format>}t tag
+;      e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
+;  %u: remote user
+;
+; Default: "%R - %u %t \"%m %r\" %s"
+;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"
+
+; The log file for slow requests
+; Default Value: not set
+; Note: slowlog is mandatory if request_slowlog_timeout is set
+;slowlog = log/$pool.log.slow
+
+; The timeout for serving a single request after which a PHP backtrace will be
+; dumped to the 'slowlog' file. A value of '0s' means 'off'.
+; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
+; Default Value: 0
+;request_slowlog_timeout = 0
+
+; Depth of slow log stack trace.
+; Default Value: 20
+;request_slowlog_trace_depth = 20
+
+; The timeout for serving a single request after which the worker process will
+; be killed. This option should be used when the 'max_execution_time' ini option
+; does not stop script execution for some reason. A value of '0' means 'off'.
+; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
+; Default Value: 0
+;request_terminate_timeout = 0
+
+; Set open file descriptor rlimit.
+; Default Value: system defined value
+;rlimit_files = 1024
+
+; Set max core size rlimit.
+; Possible Values: 'unlimited' or an integer greater or equal to 0
+; Default Value: system defined value
+;rlimit_core = 0
+
+; Chroot to this directory at the start. This value must be defined as an
+; absolute path. When this value is not set, chroot is not used.
+; Note: you can prefix with '$prefix' to chroot to the pool prefix or one
+; of its subdirectories. If the pool prefix is not set, the global prefix
+; will be used instead.
+; Note: chrooting is a great security feature and should be used whenever
+;       possible. However, all PHP paths will be relative to the chroot
+;       (error_log, sessions.save_path, ...).
+; Default Value: not set
+;chroot =
+
+; Chdir to this directory at the start.
+; Note: relative path can be used.
+; Default Value: current directory or / when chroot
+;chdir = /var/www
+
+; Redirect worker stdout and stderr into main error log. If not set, stdout and
+; stderr will be redirected to /dev/null according to FastCGI specs.
+; Note: on highloaded environement, this can cause some delay in the page
+; process time (several ms).
+; Default Value: no
+;catch_workers_output = yes
+
+; Clear environment in FPM workers
+; Prevents arbitrary environment variables from reaching FPM worker processes
+; by clearing the environment in workers before env vars specified in this
+; pool configuration are added.
+; Setting to "no" will make all environment variables available to PHP code
+; via getenv(), $_ENV and $_SERVER.
+; Default Value: yes
+;clear_env = no
+
+; Limits the extensions of the main script FPM will allow to parse. This can
+; prevent configuration mistakes on the web server side. You should only limit
+; FPM to .php extensions to prevent malicious users to use other extensions to
+; execute php code.
+; Note: set an empty value to allow all extensions.
+; Default Value: .php
+;security.limit_extensions = .php .php3 .php4 .php5 .php7
+
+; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from
+; the current environment.
+; Default Value: clean env
+env[HOSTNAME] = $HOSTNAME
+env[PATH] = /usr/local/bin:/usr/bin:/bin
+env[TMP] = /tmp
+env[TMPDIR] = /tmp
+env[TEMP] = /tmp
+
+; Additional php.ini defines, specific to this pool of workers. These settings
+; overwrite the values previously defined in the php.ini. The directives are the
+; same as the PHP SAPI:
+;   php_value/php_flag             - you can set classic ini defines which can
+;                                    be overwritten from PHP call 'ini_set'.
+;   php_admin_value/php_admin_flag - these directives won't be overwritten by
+;                                     PHP call 'ini_set'
+; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no.
+
+; Defining 'extension' will load the corresponding shared extension from
+; extension_dir. Defining 'disable_functions' or 'disable_classes' will not
+; overwrite previously defined php.ini values, but will append the new value
+; instead.
+
+; Note: path INI options can be relative and will be expanded with the prefix
+; (pool, global or /usr/local)
+
+; Default Value: nothing is defined by default except the values in php.ini and
+;                specified at startup with the -d argument
+;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com
+;php_flag[display_errors] = off
+;php_admin_value[error_log] = /var/log/fpm-php.www.log
+;php_admin_flag[log_errors] = on
+;php_admin_value[memory_limit] = 32M
diff --git a/jails/nextcloud/install.sh b/jails/nextcloud/install.sh
new file mode 100755
index 00000000..73738743
--- /dev/null
+++ b/jails/nextcloud/install.sh
@@ -0,0 +1,350 @@
+#!/usr/local/bin/bash
+# This script installs the current release of Nextcloud into a create jail
+# Based on the example by danb35: https://github.com/danb35/freenas-iocage-nextcloud
+
+
+# Initialise defaults
+JAIL_NAME="nextcloud"
+JAIL_IP="$(sed 's|\(.*\)/.*|\1|' <<<"${nextcloud_ip4_addr}" )"
+DATABASE="$nextcloud_database"
+INCLUDES_PATH="${SCRIPT_DIR}/jails/nextcloud/includes"
+STANDALONE_CERT=${nextcloud_standalone_cert}
+SELFSIGNED_CERT=${nextcloud_selfsigned_cert}
+DNS_CERT=${nextcloud_dns_cert}
+NO_CERT=${nextcloud_no_cert}
+DL_FLAGS=${nextcloud_dl_flags}
+DNS_SETTING=${nextcloud_dns_settings}
+CERT_EMAIL=${nextcloud_cert_email}
+HOST_NAME=${nextcloud_host_name}
+
+# Only generate new DB passwords when using buildin database
+# Set DB username and database to fixed "nextcloud"
+
+if [ "${DATABASE}" = "pgsql-external" ]; then
+  DB_NAME="PostgreSQL"
+  DB_HOST="${nextcloud_db_host}"
+  DB_DATABASE="${nextcloud_db_database}"
+  DB_USER="${nextcloud_db_user}"
+  DB_PASSWORD="${nextcloud_db_password}"
+elif [ "${DATABASE}" = "mariadb-external" ]; then
+  DB_NAME="MariaDB"
+  DB_HOST="${nextcloud_db_host}"
+  DB_DATABASE="${nextcloud_db_database}"
+  DB_USER="${nextcloud_db_user}"
+  DB_PASSWORD="${nextcloud_db_password}"
+elif [ "${DATABASE}" = "mariadb-jail" ]; then
+  DB_DATABASE="nextcloud"
+  DB_USER="nextcloud"
+  DB_HOST="$(sed 's|\(.*\)/.*|\1|' <<<"${mariadb_ip4_addr}"):3306"
+  DB_PASSWORD="${nextcloud_db_password}"
+else
+  echo "Invalid ${JAIL_NAME}_database selected please select one from the following options:"
+  echo "mariadb-jail, mariadb-external, pgsql-external"
+  exit 1
+fi
+
+
+ADMIN_PASSWORD=$(openssl rand -base64 12)
+
+#####
+# 
+# Input Sanity Check 
+#
+#####
+
+
+# Check that necessary variables were set by nextcloud-config
+if [ -z "${nextcloud_ip4_addr}" ]; then
+  echo 'Configuration error: The Nextcloud jail does NOT accept DHCP'
+  echo 'Please reinstall using a fixed IP adress'
+  exit 1
+fi
+
+if [ -z "${DB_PASSWORD}" ]; then
+  echo 'Configuration error: The Nextcloud Jail needs a database password'
+  echo 'Please reinstall with a defifined: db_password'
+  exit 1
+fi
+
+if [ -z "${DB_USER}" ]; then
+  echo 'Configuration error: The Nextcloud Jail needs a database user'
+  echo 'Please reinstall with a defifined: db_user'
+  exit 1
+fi
+
+if [ -z "${DB_HOST}" ]; then
+	echo 'Configuration error: The Nextcloud Jail needs a database host'
+  echo 'Please reinstall with a defifined: db_host'
+  exit 1
+fi
+
+if [ -z "${DB_DATABASE}" ]; then
+	echo 'Configuration error: The Nextcloud Jail needs a database name'
+  echo 'Please reinstall with a defifined: db_database'
+  exit 1
+fi
+
+if [ -z "${nextcloud_time_zone}" ]; then
+  echo 'Configuration error: TIME_ZONE must be set'
+  exit 1
+fi
+if [ -z "${HOST_NAME}" ]; then
+  echo 'Configuration error: HOST_NAME must be set'
+  exit 1
+fi
+if [ $STANDALONE_CERT -eq 0 ] && [ $DNS_CERT -eq 0 ] && [ $NO_CERT -eq 0 ] && [ $SELFSIGNED_CERT -eq 0 ]; then
+  echo 'Configuration error: Either STANDALONE_CERT, DNS_CERT, NO_CERT,'
+  echo 'or SELFSIGNED_CERT must be set to 1.'
+  exit 1
+fi
+if [ $STANDALONE_CERT -eq 1 ] && [ $DNS_CERT -eq 1 ] ; then
+  echo 'Configuration error: Only one of STANDALONE_CERT and DNS_CERT'
+  echo 'may be set to 1.'
+  exit 1
+fi
+
+if [ $DNS_CERT -eq 1 ] && [ -z "${DNS_PLUGIN}" ] ; then
+  echo "DNS_PLUGIN must be set to a supported DNS provider."
+  echo "See https://caddyserver.com/docs under the heading of \"DNS Providers\" for list."
+  echo "Be sure to omit the prefix of \"tls.dns.\"."
+  exit 1
+fi  
+if [ $DNS_CERT -eq 1 ] && [ -z "${DNS_ENV}" ] ; then
+  echo "DNS_ENV must be set to a your DNS provider\'s authentication credentials."
+  echo "See https://caddyserver.com/docs under the heading of \"DNS Providers\" for more."
+  exit 1
+fi  
+
+if [ $DNS_CERT -eq 1 ] ; then
+  DL_FLAGS="tls.dns.${DNS_PLUGIN}"
+  DNS_SETTING="dns ${DNS_PLUGIN}"
+fi
+
+# Make sure DB_PATH is empty -- if not, MariaDB/PostgreSQL will choke
+if [ "$(ls -A "/mnt/${global_dataset_config}/${JAIL_NAME}/config")" ]; then
+	echo "Reinstall of Nextcloud detected... "
+	echo "External database selected, unable to verify compatibility. REINSTALL MIGHT NOT WORK... Continuing"
+	REINSTALL="true"
+fi
+
+
+#####
+	# 
+# Fstab And Mounts
+#
+#####
+
+# Create and Mount portsnap
+createmount ${JAIL_NAME} ${global_dataset_config}/portsnap
+createmount ${JAIL_NAME} ${global_dataset_config}/portsnap/db /var/db/portsnap
+createmount ${JAIL_NAME} ${global_dataset_config}/portsnap/ports /usr/ports
+
+# Create and Mount Nextcloud, Config and Files
+createmount ${JAIL_NAME} ${global_dataset_config}/${JAIL_NAME}/config /usr/local/www/nextcloud/config
+createmount ${JAIL_NAME} ${global_dataset_config}/${JAIL_NAME}/themes /usr/local/www/nextcloud/themes
+createmount ${JAIL_NAME} ${global_dataset_config}/${JAIL_NAME}/files /config/files
+
+# Install includes fstab
+iocage exec "${JAIL_NAME}" mkdir -p /mnt/includes
+iocage fstab -a "${JAIL_NAME}" "${INCLUDES_PATH}" /mnt/includes nullfs rw 0 0
+
+
+iocage exec "${JAIL_NAME}" chown -R www:www /config/files
+iocage exec "${JAIL_NAME}" chmod -R 770 /config/files
+
+
+#####
+# 
+# Basic dependency install
+#
+#####
+
+iocage exec "${JAIL_NAME}" "if [ -z /usr/ports ]; then portsnap fetch extract; else portsnap auto; fi"
+
+if [ "${DATABASE}" = "mariadb-external" ] || [ "${DATABASE}" = "mariadb-jail" ]; then
+  iocage exec "${JAIL_NAME}" pkg install -qy mariadb103-client php73-pdo_mysql php73-mysqli
+elif [ "${DATABASE}" = "pgsql-external" ]; then
+  iocage exec "${JAIL_NAME}" pkg install -qy postgresql10-client php73-pgsql php73-pdo_pgsql
+fi
+
+fetch -o /tmp https://getcaddy.com
+if ! iocage exec "${JAIL_NAME}" bash -s personal "${DL_FLAGS}" < /tmp/getcaddy.com
+then
+	echo "Failed to download/install Caddy"
+	exit 1
+fi
+
+iocage exec "${JAIL_NAME}" sysrc redis_enable="YES"
+iocage exec "${JAIL_NAME}" sysrc php_fpm_enable="YES"
+iocage exec "${JAIL_NAME}" sh -c "make -C /usr/ports/www/php73-opcache clean install BATCH=yes"
+iocage exec "${JAIL_NAME}" sh -c "make -C /usr/ports/devel/php73-pcntl clean install BATCH=yes"
+
+
+#####
+# 
+# Install Nextcloud
+#
+#####
+
+FILE="latest-18.tar.bz2"
+if ! iocage exec "${JAIL_NAME}" fetch -o /tmp https://download.nextcloud.com/server/releases/"${FILE}" https://download.nextcloud.com/server/releases/"${FILE}".asc https://nextcloud.com/nextcloud.asc
+then
+	echo "Failed to download Nextcloud"
+	exit 1
+fi
+iocage exec "${JAIL_NAME}" gpg --import /tmp/nextcloud.asc
+if ! iocage exec "${JAIL_NAME}" gpg --verify /tmp/"${FILE}".asc
+then
+	echo "GPG Signature Verification Failed!"
+	echo "The Nextcloud download is corrupt."
+	exit 1
+fi
+iocage exec "${JAIL_NAME}" tar xjf /tmp/"${FILE}" -C /usr/local/www/
+iocage exec "${JAIL_NAME}" chown -R www:www /usr/local/www/nextcloud/
+
+
+# Generate and install self-signed cert, if necessary
+if [ $SELFSIGNED_CERT -eq 1 ] && [ ! -f "/mnt/${global_dataset_config}/${JAIL_NAME}/ssl/privkey.pem" ]; then
+	echo "No ssl certificate present, generating self signed certificate"
+	if [ ! -d "/mnt/${global_dataset_config}/${JAIL_NAME}/ssl" ]; then
+		echo "cert folder not existing... creating..."
+		iocage exec ${JAIL_NAME} mkdir /config/ssl
+	fi
+	openssl req -new -newkey rsa:4096 -days 3650 -nodes -x509 -subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=${HOST_NAME}" -keyout "${INCLUDES_PATH}"/privkey.pem -out "${INCLUDES_PATH}"/fullchain.pem
+	iocage exec "${JAIL_NAME}" cp /mnt/includes/privkey.pem /config/ssl/privkey.pem
+	iocage exec "${JAIL_NAME}" cp /mnt/includes/fullchain.pem /config/ssl/fullchain.pem
+fi
+
+# Copy and edit pre-written config files
+iocage exec "${JAIL_NAME}" cp -f /mnt/includes/php.ini /usr/local/etc/php.ini
+iocage exec "${JAIL_NAME}" cp -f /mnt/includes/redis.conf /usr/local/etc/redis.conf
+iocage exec "${JAIL_NAME}" cp -f /mnt/includes/www.conf /usr/local/etc/php-fpm.d/
+if [ $STANDALONE_CERT -eq 1 ] || [ $DNS_CERT -eq 1 ]; then
+  iocage exec "${JAIL_NAME}" cp -f /mnt/includes/remove-staging.sh /root/
+fi
+if [ $NO_CERT -eq 1 ]; then
+  echo "Copying Caddyfile for no SSL"
+  iocage exec "${JAIL_NAME}" cp -f /mnt/includes/Caddyfile-nossl /usr/local/www/Caddyfile
+elif [ $SELFSIGNED_CERT -eq 1 ]; then
+  echo "Copying Caddyfile for self-signed cert"
+  iocage exec "${JAIL_NAME}" cp -f /mnt/includes/Caddyfile-selfsigned /usr/local/www/Caddyfile
+else
+  echo "Copying Caddyfile for Let's Encrypt cert"
+  iocage exec "${JAIL_NAME}" cp -f /mnt/includes/Caddyfile /usr/local/www/
+fi
+iocage exec "${JAIL_NAME}" cp -f /mnt/includes/caddy /usr/local/etc/rc.d/
+
+
+iocage exec "${JAIL_NAME}" sed -i '' "s/yourhostnamehere/${HOST_NAME}/" /usr/local/www/Caddyfile
+iocage exec "${JAIL_NAME}" sed -i '' "s/DNS-PLACEHOLDER/${DNS_SETTING}/" /usr/local/www/Caddyfile
+iocage exec "${JAIL_NAME}" sed -i '' "s/JAIL-IP/${JAIL_IP}/" /usr/local/www/Caddyfile
+iocage exec "${JAIL_NAME}" sed -i '' "s|mytimezone|${nextcloud_time_zone}|" /usr/local/etc/php.ini
+
+iocage exec "${JAIL_NAME}" sysrc caddy_enable="YES"
+iocage exec "${JAIL_NAME}" sysrc caddy_cert_email="${CERT_EMAIL}"
+iocage exec "${JAIL_NAME}" sysrc caddy_SNI_default="${HOST_NAME}"
+iocage exec "${JAIL_NAME}" sysrc caddy_env="${DNS_ENV}"
+
+iocage restart "${JAIL_NAME}"
+
+if [ "${REINSTALL}" == "true" ]; then
+	echo "Reinstall detected, skipping generaion of new config and database"
+else
+	
+	# Secure database, set root password, create Nextcloud DB, user, and password
+	if  [ "${DATABASE}" = "mariadb-jail" ]; then
+		iocage exec "mariadb" mysql -u root -e "CREATE DATABASE ${DB_DATABASE};"
+		iocage exec "mariadb" mysql -u root -e "GRANT ALL ON ${DB_DATABASE}.* TO ${DB_USER}@${JAIL_IP} IDENTIFIED BY '${DB_PASSWORD}';"
+		iocage exec "mariadb" mysqladmin reload
+	fi
+	
+	
+	# Save passwords for later reference
+	iocage exec "${JAIL_NAME}" echo "${DB_NAME} root password is ${DB_ROOT_PASSWORD}" > /root/${JAIL_NAME}_db_password.txt
+	iocage exec "${JAIL_NAME}" echo "Nextcloud database password is ${DB_PASSWORD}" >> /root/${JAIL_NAME}_db_password.txt
+	iocage exec "${JAIL_NAME}" echo "Nextcloud Administrator password is ${ADMIN_PASSWORD}" >> /root/${JAIL_NAME}_db_password.txt
+	
+	# CLI installation and configuration of Nextcloud
+	if [ "${DATABASE}" = "mariadb-external" ] || [ "${DATABASE}" = "mariadb-jail" ]; then
+		iocage exec "${JAIL_NAME}" su -m www -c "php /usr/local/www/nextcloud/occ maintenance:install --database=\"mysql\" --database-name=\"${DB_DATABASE}\" --database-user=\"${DB_USER}\" --database-pass=\"${DB_PASSWORD}\" --database-host=\"${DB_HOST}\" --admin-user=\"admin\" --admin-pass=\"${ADMIN_PASSWORD}\" --data-dir=\"/config/files\""
+		iocage exec "${JAIL_NAME}" su -m www -c "php /usr/local/www/nextcloud/occ config:system:set mysql.utf8mb4 --type boolean --value=\"true\""
+	elif [ "${DATABASE}" = "pgsql-external" ]; then
+		iocage exec "${JAIL_NAME}" su -m www -c "php /usr/local/www/nextcloud/occ maintenance:install --database=\"pgsql\" --database-name=\"${DB_DATABASE}\" --database-user=\"${DB_USER}\" --database-pass=\"${DB_PASSWORD}\" --database-host=\"${DB_HOST}\" --admin-user=\"admin\" --admin-pass=\"${ADMIN_PASSWORD}\" --data-dir=\"/config/files\""
+	fi
+	iocage exec "${JAIL_NAME}" su -m www -c "php /usr/local/www/nextcloud/occ db:add-missing-indices"
+	iocage exec "${JAIL_NAME}" su -m www -c "php /usr/local/www/nextcloud/occ db:convert-filecache-bigint --no-interaction"
+	iocage exec "${JAIL_NAME}" su -m www -c "php /usr/local/www/nextcloud/occ config:system:set logtimezone --value=\"${nextcloud_time_zone}\""
+	iocage exec "${JAIL_NAME}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set log_type --value="file"'
+	iocage exec "${JAIL_NAME}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set logfile --value="/var/log/nextcloud.log"'
+	iocage exec "${JAIL_NAME}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set loglevel --value="2"'
+	iocage exec "${JAIL_NAME}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set logrotate_size --value="104847600"'
+	iocage exec "${JAIL_NAME}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set memcache.local --value="\OC\Memcache\APCu"'
+	iocage exec "${JAIL_NAME}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set redis host --value="/tmp/redis.sock"'
+	iocage exec "${JAIL_NAME}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set redis port --value=0 --type=integer'
+	iocage exec "${JAIL_NAME}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set memcache.locking --value="\OC\Memcache\Redis"'
+	if [ $NO_CERT -eq 1 ]; then
+		iocage exec "${JAIL_NAME}" su -m www -c "php /usr/local/www/nextcloud/occ config:system:set overwrite.cli.url --value=\"http://${HOST_NAME}/\""
+	else
+		iocage exec "${JAIL_NAME}" su -m www -c "php /usr/local/www/nextcloud/occ config:system:set overwrite.cli.url --value=\"https://${HOST_NAME}/\""
+	fi
+	iocage exec "${JAIL_NAME}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set htaccess.RewriteBase --value="/"'
+	iocage exec "${JAIL_NAME}" su -m www -c 'php /usr/local/www/nextcloud/occ maintenance:update:htaccess'
+	iocage exec "${JAIL_NAME}" su -m www -c "php /usr/local/www/nextcloud/occ config:system:set trusted_domains 1 --value=\"${HOST_NAME}\""
+	iocage exec "${JAIL_NAME}" su -m www -c "php /usr/local/www/nextcloud/occ config:system:set trusted_domains 2 --value=\"${JAIL_IP}\""
+	iocage exec "${JAIL_NAME}" su -m www -c 'php /usr/local/www/nextcloud/occ app:enable encryption'
+	iocage exec "${JAIL_NAME}" su -m www -c 'php /usr/local/www/nextcloud/occ encryption:enable'
+	iocage exec "${JAIL_NAME}" su -m www -c 'php /usr/local/www/nextcloud/occ encryption:disable'
+	iocage exec "${JAIL_NAME}" su -m www -c 'php /usr/local/www/nextcloud/occ background:cron'
+	
+fi
+
+iocage exec "${JAIL_NAME}" touch /var/log/nextcloud.log
+iocage exec "${JAIL_NAME}" chown www /var/log/nextcloud.log
+iocage exec "${JAIL_NAME}" su -m www -c 'php -f /usr/local/www/nextcloud/cron.php'
+iocage exec "${JAIL_NAME}" crontab -u www /mnt/includes/www-crontab
+
+# Don't need /mnt/includes any more, so unmount it
+iocage fstab -r "${JAIL_NAME}" "${INCLUDES_PATH}" /mnt/includes nullfs rw 0 0
+
+# Done!
+echo "Installation complete!"
+if [ $NO_CERT -eq 1 ]; then
+  echo "Using your web browser, go to http://${HOST_NAME} to log in"
+else
+  echo "Using your web browser, go to https://${HOST_NAME} to log in"
+fi
+
+if [ "${REINSTALL}" == "true" ]; then
+	echo "You did a reinstall, please use your old database and account credentials"
+else
+
+	echo "Default user is admin, password is ${ADMIN_PASSWORD}"
+	echo ""
+
+	echo "Database Information"
+	echo "--------------------"
+	echo "Database user = ${DB_USER}"
+	echo "Database password = ${DB_PASSWORD}"
+	echo ""
+	echo "All passwords are saved in /root/${JAIL_NAME}_db_password.txt"
+fi
+
+echo ""
+if [ $STANDALONE_CERT -eq 1 ] || [ $DNS_CERT -eq 1 ]; then
+  echo "You have obtained your Let's Encrypt certificate using the staging server."
+  echo "This certificate will not be trusted by your browser and will cause SSL errors"
+  echo "when you connect.  Once you've verified that everything else is working"
+  echo "correctly, you should issue a trusted certificate.  To do this, run:"
+  echo "  iocage exec ${JAIL_NAME} /root/remove-staging.sh"
+  echo ""
+elif [ $SELFSIGNED_CERT -eq 1 ]; then
+  echo "You have chosen to create a self-signed TLS certificate for your Nextcloud"
+  echo "installation.  This certificate will not be trusted by your browser and"
+  echo "will cause SSL errors when you connect.  If you wish to replace this certificate"
+  echo "with one obtained elsewhere, the private key is located at:"
+  echo "/config/ssl/privkey.pem"
+  echo "The full chain (server + intermediate certificates together) is at:"
+  echo "/config/ssl/fullchain.pem"
+  echo ""
+fi
+
diff --git a/jails/nextcloud/update.sh b/jails/nextcloud/update.sh
new file mode 100755
index 00000000..cf90b555
--- /dev/null
+++ b/jails/nextcloud/update.sh
@@ -0,0 +1,6 @@
+#!/usr/local/bin/bash
+# This file contains the update script for nextcloud
+
+echo "running nextcloud update"
+iocage exec -f nextcloud su -m www -c "php /usr/local/www/nextcloud/updater/updater.phar  --no-interaction"
+iocage exec nextcloud service caddy restart
diff --git a/jails/organizr/includes/custom/organizr.conf b/jails/organizr/includes/custom/organizr.conf
old mode 100644
new mode 100755
diff --git a/jails/organizr/includes/custom/phpblock.conf b/jails/organizr/includes/custom/phpblock.conf
old mode 100644
new mode 100755
diff --git a/jails/organizr/includes/nginx.conf b/jails/organizr/includes/nginx.conf
old mode 100644
new mode 100755
index 04ab189b..2af8652d
--- a/jails/organizr/includes/nginx.conf
+++ b/jails/organizr/includes/nginx.conf
@@ -19,7 +19,7 @@ http {
 		listen 443 ssl;
 		server_name localhost;
 		include custom/organizr.conf;
-		ssl_certificate /config/cert/Organizr-Cert.crt; # Replace with actually valid certificate
-		ssl_certificate_key /config/cert/Organizr-Cert.key; # Replace with actually valid certificate
+		ssl_certificate /config/ssl/Organizr-Cert.crt; # Replace with actually valid certificate
+		ssl_certificate_key /config/ssl/Organizr-Cert.key; # Replace with actually valid certificate
 	}
 }
\ No newline at end of file
diff --git a/jails/organizr/install.sh b/jails/organizr/install.sh
index b5904ee5..9a2a5e86 100755
--- a/jails/organizr/install.sh
+++ b/jails/organizr/install.sh
@@ -12,19 +12,18 @@ mv /mnt/${global_dataset_iocage}/jails/organizr/root/usr/local/etc/nginx/nginx.c
 cp ${SCRIPT_DIR}/jails/organizr/includes/nginx.conf /mnt/${global_dataset_iocage}/jails/organizr/root/usr/local/etc/nginx/nginx.conf
 cp -Rf ${SCRIPT_DIR}/jails/organizr/includes/custom /mnt/${global_dataset_iocage}/jails/organizr/root/usr/local/etc/nginx/custom
 
-if [ ! -d "/mnt/${global_dataset_config}/organizr/cert" ]; then
+if [ ! -d "/mnt/${global_dataset_config}/organizr/ssl" ]; then
 	echo "cert folder not existing... creating..."
-	iocage exec organizr mkdir /config/cert
+	iocage exec organizr mkdir /config/ssl
 fi
 
-if [ -f "/mnt/${global_dataset_config}/organizr/cert/Organizr-Cert.crt" ]; then
+if [ -f "/mnt/${global_dataset_config}/organizr/ssl/Organizr-Cert.crt" ]; then
     echo "certificate exist... Skipping cert generation"
 else
 	"No ssl certificate present, generating self signed certificate"
 	openssl req -new -newkey rsa:2048 -days 365 -nodes -x509 -subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=localhost" -keyout /mnt/${global_dataset_config}/organizr/cert/Organizr-Cert.key -out /mnt/${global_dataset_config}/organizr/cert/Organizr-Cert.crt
 fi
 
-
 iocage exec organizr git clone https://github.com/causefx/Organizr.git /usr/local/www/Organizr
 iocage exec organizr chown -R www:www /usr/local/www /config /usr/local/etc/nginx/nginx.conf /usr/local/etc/nginx/custom
 iocage exec organizr ln -s /config/config.php /usr/local/www/Organizr/api/config/config.php
diff --git a/jails/organizr/readme.md b/jails/organizr/readme.md
new file mode 100755
index 00000000..19525226
--- /dev/null
+++ b/jails/organizr/readme.md
@@ -0,0 +1,99 @@
+# Original README from the Organizr github repo:
+
+https://github.com/causefx/Organizr
+
+
+<p align="center"><img src="https://github.com/causefx/Organizr/raw/v2-develop/plugins/images/organizr/logo-wide.png"></p>
+
+[![Percentage of issues still open](http://isitmaintained.com/badge/open/causefx/Organizr.svg)](http://isitmaintained.com/project/causefx/Organizr "Percentage of issues still open")
+[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/causefx/Organizr.svg)](http://isitmaintained.com/project/causefx/Organizr "Average time to resolve an issue")
+[![GitHub stars](https://img.shields.io/github/stars/causefx/Organizr.svg)](https://github.com/causefx/Organizr/stargazers)
+[![GitHub forks](https://img.shields.io/github/forks/causefx/Organizr.svg)](https://github.com/causefx/Organizr/network)
+[![Docker pulls](https://img.shields.io/docker/pulls/organizrtools/organizr-v2.svg)](https://hub.docker.com/r/organizrtools/organizr-v2)
+[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://paypal.me/causefx)
+[![Beerpay](https://beerpay.io/causefx/Organizr/badge.svg?style=beer-square)](https://beerpay.io/causefx/Organizr)  [![Beerpay](https://beerpay.io/causefx/Organizr/make-wish.svg?style=flat-square)](https://beerpay.io/causefx/Organizr?focus=wish)
+
+<img src="https://user-images.githubusercontent.com/16184466/53614282-a91e9e00-3b96-11e9-9b3e-d249775ecaa1.png">
+
+Do you have quite a bit of services running on your computer or server?  Do you have a lot of bookmarks or have to memorize a bunch of ip's and ports?  Well, Organizr is here to help with that.  Organizr allows you to setup "Tabs" that will be loaded all in one webpage.  You can then work on your server with ease.  Want to give users access to some Tabs?  No problem, just enable user support and have them make an account.  Want guests to be able to visit too?  Enable Guest support for those tabs.
+
+<img src="https://user-images.githubusercontent.com/16184466/53614285-a9b73480-3b96-11e9-835e-9fadd045582b.png">
+
+- PHP 7.1.3+
+- [Official Site](https://organizr.app) - Will be refreshed soon!
+- [Official Discord](https://organizr.app/discord)
+- [See Wiki](https://github.com/causefx/Organizr/wiki) - Will be updated soon!
+- [Docker](https://hub.docker.com/r/organizrtools/organizr-v2/)
+
+<img src="https://user-images.githubusercontent.com/16184466/53614284-a9b73480-3b96-11e9-9bea-d7a30b294267.png">
+
+<img src="https://user-images.githubusercontent.com/16184466/53615855-35cc5a80-3b9d-11e9-882b-f09f3eb18173.png" width="23%"></img> <img src="https://user-images.githubusercontent.com/16184466/53615856-35cc5a80-3b9d-11e9-8428-1f2ae05da2c9.png" width="23%"></img> <img src="https://user-images.githubusercontent.com/16184466/53615857-35cc5a80-3b9d-11e9-82bf-91987c529e72.png" width="23%"></img> <img src="https://user-images.githubusercontent.com/16184466/53615858-35cc5a80-3b9d-11e9-8149-01a7fcd9160a.png" width="23%"></img> 
+
+[![Organizr Overview](https://img.youtube.com/vi/LZL4smFB6wU/0.jpg)](https://www.youtube.com/watch?v=LZL4smFB6wU)
+
+<img src="https://user-images.githubusercontent.com/16184466/53614283-a9b73480-3b96-11e9-90ef-6e752e067884.png">
+
+- Login with Plex/Emby/LDAP or sFTP credentials
+- Custom tabs for your services
+- Fullscreen Support
+- Pin/Unpin sidebar
+- Mobile support
+- Set default page on launch
+- Upload new icons with ease
+- Enable or disable iFrame for your tabs
+- User management support: Create, delete and promote users from the user management console
+- Unlimited User Groups
+- Theme-able
+- Personalise any theme: Customise the look and feel of Organizr with access to the colour palette
+- Organizr login log viewer 
+- Fail2ban support (see wiki)
+- Nginx Auth_Request support
+- Protect new user account creation with registration password
+- 'Forgot Password' support [receive an email with your new password, prerequisites: mail server setup]
+- Multiple login support
+- Keyboard shortcut support (Check help tab in settings)
+- Gravatar Support
+- Customise the top bar by adding your own site logo or site name
+- Additional language support
+- Quick access tabs [access your tabs quickly e.g. www.example.com/#Sonarr]
+- Many more...
+
+<img src="https://user-images.githubusercontent.com/16184466/53614286-a9b73480-3b96-11e9-8495-4944b85b1313.png">
+
+[![Feature Requests](http://feathub.com/causefx/Organizr?format=svg)](http://feathub.com/causefx/Organizr)
+
+<img src="https://user-images.githubusercontent.com/16184466/53667702-fcdcc600-3c2e-11e9-8828-860e531e8096.png">
+
+##### Usage
+```
+docker create \
+  --name=organizr \
+  -v <path to data>:/config \
+  -e PGID=<gid> -e PUID=<uid>  \
+  -p 80:80 \
+  organizrtools/organizr-v2
+```
+##### Parameters
+The parameters are split into two halves, separated by a colon, the left hand side representing the host and the right the container side. For example with a port -p external:internal - what this shows is the port mapping from internal to external of the container. So `-p 8080:80` would expose port 80 from inside the container to be accessible from the host's IP on port 8080 and `http://192.168.x.x:8080` would show you what's running INSIDE the container on port 80.
+
+* `-p 80` - The port(s)
+* `-v /config` - Mapping the config files for Organizr
+* `-e PGID` Used for GroupID - see below for explanation
+* `-e PUID` Used for UserID - see below for explanation
+
+##### Info
+* Shell access whilst the container is running: `docker exec -it organizr /bin/bash`
+* To monitor the logs of the container in realtime: `docker logs -f organizr`
+* Container version number: `docker inspect -f '{{ index .Config.Labels "build_version" }}' organizr`
+* Image version number: `docker inspect -f '{{ index .Config.Labels "build_version" }}' organizrtools/docker-organizr-v2`
+
+<img src="https://user-images.githubusercontent.com/16184466/53614287-a9b73480-3b96-11e9-9c8e-e32b4ae20c0d.png">
+
+<p align="center"><a href="https://www.browserstack.com"><img src="https://avatars2.githubusercontent.com/u/1119453?s=200&v=4g"></a></p>
+<p align="center"><a href="https://www.browserstack.com">BrowserStack</a> for allowing us to use their platform for testing</p>
+<p>This project is supported by:</p>
+<p>
+  <a href="https://www.digitalocean.com/">
+    <img src="https://opensource.nyc3.cdn.digitaloceanspaces.com/attribution/assets/SVG/DO_Logo_horizontal_blue.svg" width="201px">
+  </a>
+</p>
\ No newline at end of file
diff --git a/jails/plex/includes/FreeBSD.conf b/jails/plex/includes/FreeBSD.conf
old mode 100644
new mode 100755
diff --git a/jails/plex/install.sh b/jails/plex/install.sh
index 4b6d6ef0..e5bc94ba 100755
--- a/jails/plex/install.sh
+++ b/jails/plex/install.sh
@@ -2,43 +2,17 @@
 # This file contains the install script for plex
 
 iocage exec plex mkdir -p /usr/local/etc/pkg/repos
-iocage exec plex mkdir -p /mnt/media
-iocage exec plex mkdir -p /mnt/media/movies
-iocage exec plex mkdir -p /mnt/media/music
-iocage exec plex mkdir -p /mnt/media/shows
+
 
 # Change to to more frequent FreeBSD repo to stay up-to-date with plex more.
 cp ${SCRIPT_DIR}/jails/plex/includes/FreeBSD.conf /mnt/${global_dataset_iocage}/jails/plex/root/usr/local/etc/pkg/repos/FreeBSD.conf
 
 
 # Check if datasets for media librarys exist, create them if they do not.
-if [ ! -d "/mnt/${global_dataset_media}" ]; then
-	echo "Media dataset does not exist... Creating... ${global_dataset_media}"
-	zfs create ${global_dataset_media}
-fi
-
-iocage fstab -a plex /mnt/${global_dataset_media} /mnt/media nullfs rw 0 0
-
-if [ ! -d "/mnt/${global_dataset_media}/shows" ]; then
-	echo "TV Shows dataset does not exist... Creating... ${global_dataset_media}/shows"
-	zfs create ${global_dataset_media}/shows
-fi
-
-iocage fstab -a plex /mnt/${global_dataset_media}/shows /mnt/media/shows nullfs rw 0 0
-
-if [ ! -d "/mnt/${global_dataset_media}/music" ]; then
-	echo "music dataset does not exist... Creating... ${global_dataset_media}/music"
-	zfs create ${global_dataset_media}/music
-fi
-
-iocage fstab -a plex /mnt/${global_dataset_media}/music /mnt/media/music nullfs rw 0 0
-
-if [ ! -d "/mnt/${global_dataset_media}/movies" ]; then
-	echo "movies dataset does not exist... Creating... ${global_dataset_media}/movies"
-	zfs create ${global_dataset_media}/movies
-fi
-
-iocage fstab -a plex /mnt/${global_dataset_media}/movies /mnt/media/movies nullfs rw 0 0
+createmount plex ${global_dataset_media} /mnt/media
+createmount plex ${global_dataset_media}/movies /mnt/media/movies
+createmount plex ${global_dataset_media}/music /mnt/media/music
+createmount plex ${global_dataset_media}/shows /mnt/media/shows
 
 
 iocage exec plex chown -R plex:plex /config
diff --git a/jails/plex/readme.md b/jails/plex/readme.md
new file mode 100755
index 00000000..2cac133d
--- /dev/null
+++ b/jails/plex/readme.md
@@ -0,0 +1,7 @@
+# Plex
+
+For more information about plex, please see the Plex website:
+
+# Original plex install script guide
+
+https://www.ixsystems.com/community/resources/fn11-3-iocage-jails-plex-tautulli-sonarr-radarr-lidarr-jackett-transmission-organizr.58/
\ No newline at end of file
diff --git a/jails/radarr/includes/radarr.rc b/jails/radarr/includes/radarr.rc
old mode 100644
new mode 100755
diff --git a/jails/radarr/install.sh b/jails/radarr/install.sh
index 95982878..1d71fb94 100755
--- a/jails/radarr/install.sh
+++ b/jails/radarr/install.sh
@@ -1,34 +1,13 @@
 #!/usr/local/bin/bash
 # This file contains the install script for radarr
 
-iocage exec radarr mkdir -p /mnt/movies
-iocage exec radarr mkdir -p /mnt/fetched
-
 # Check if dataset for completed download and it parent dataset exist, create if they do not.
-if [ ! -d "/mnt/${global_dataset_downloads}" ]; then
-	echo "Downloads dataset does not exist... Creating... ${global_dataset_downloads}"
-	zfs create ${global_dataset_downloads}
-fi
-
-if [ ! -d "/mnt/${global_dataset_downloads}/complete" ]; then
-	echo "Completed Downloads dataset does not exist... Creating... ${global_dataset_downloads}/complete"
-	zfs create ${global_dataset_downloads}/complete
-fi
-
-iocage fstab -a radarr /mnt/${global_dataset_downloads}/complete /mnt/fetched nullfs rw 0 0
+createmount radarr ${global_dataset_downloads}
+createmount radarr ${global_dataset_downloads}/complete /mnt/fetched
 
 # Check if dataset for media library and the dataset for movies exist, create if they do not.
-if [ ! -d "/mnt/${global_dataset_media}" ]; then
-	echo "Media dataset does not exist... Creating... ${global_dataset_media}"
-	zfs create ${global_dataset_media}
-fi
-
-if [ ! -d "/mnt/${global_dataset_media}/movies" ]; then
-	echo "Movies dataset does not exist... Creating... ${global_dataset_media}/movies"
-	zfs create ${global_dataset_media}/movies
-fi
-
-iocage fstab -a radarr /mnt/${global_dataset_media}/movies /mnt/movies nullfs rw 0 0
+createmount radarr ${global_dataset_media}
+createmount radarr ${global_dataset_media}/movies /mnt/movies
 
 iocage exec radarr ln -s /usr/local/bin/mono /usr/bin/mono
 iocage exec radarr "fetch https://github.com/Radarr/Radarr/releases/download/v0.2.0.1480/Radarr.develop.0.2.0.1480.linux.tar.gz -o /usr/local/share"
diff --git a/jails/radarr/readme.md b/jails/radarr/readme.md
new file mode 100755
index 00000000..14337343
--- /dev/null
+++ b/jails/radarr/readme.md
@@ -0,0 +1,168 @@
+# Original README from the radarr github:
+
+https://github.com/Radarr/Radarr
+
+# Radarr
+
+<p align="center">
+<img src="/Logo/text256.png" alt="Radarr">
+</p>
+
+**New UI Development:** For an overview of the new UI development see [DEVELOPMENT.md](https://github.com/Radarr/Radarr/blob/aphrodite/DEVELOPMENT.md).
+
+Radarr is an __independent__ fork of [Sonarr](https://github.com/Sonarr/Sonarr) reworked for automatically downloading movies via Usenet and BitTorrent.
+
+The project was inspired by other Usenet/BitTorrent movie downloaders such as CouchPotato.
+
+See the [Roadmap blogpost](https://blog.radarr.video/development/update/2018/11/11/roadmap-update.html) for an overview of planned features.
+
+## Getting Started
+
+[![Installation](https://img.shields.io/badge/wiki-installation-brightgreen.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/wiki/Installation)
+[![Docker](https://img.shields.io/badge/wiki-docker-1488C6.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/wiki/Docker)
+[![Setup Guide](https://img.shields.io/badge/wiki-setup_guide-orange.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/wiki/Setup-Guide)
+[![FAQ](https://img.shields.io/badge/wiki-FAQ-BF55EC.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/wiki/FAQ)
+
+* [Install Radarr for your desired OS](https://github.com/Radarr/Radarr/wiki/Installation) *or* use [Docker](https://github.com/Radarr/Radarr/wiki/Docker)
+* *For Linux users*, run `radarr` and *optionally* have [Radarr start automatically](https://github.com/Radarr/Radarr/wiki/Autostart-on-Linux)
+* Connect to the UI through <http://localhost:7878> or <http://your-ip:7878> in your web browser
+* See the [Setup Guide](https://github.com/Radarr/Radarr/wiki/Setup-Guide) for further configuration
+
+## Downloads
+
+| Release Type    | Branch: develop (stable)                                                                                                                                                     | Branch: nightly (semi-unstable)                                                                                                                                                                | Branch: aphrodite (very-unstable)                                                                                                                                              |
+|-----------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Binary Releases | [![GitHub Releases](https://img.shields.io/badge/downloads-releases-brightgreen.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/releases)                 | [![AppVeyor Builds](https://img.shields.io/badge/downloads-nightly-green.svg?maxAge=60&style=flat-square)](https://ci.appveyor.com/project/galli-leo/radarr-usby1/branch/develop/artifacts)    |                                                                                                                                                                                |
+| Docker          | [![Docker release](https://img.shields.io/badge/linuxserver-radarr:latest-blue.svg?colorB=1488C6&maxAge=60&style=flat-square)](https://hub.docker.com/r/linuxserver/radarr)  | [![Docker nightly](https://img.shields.io/badge/linuxserver-radarr:nightly-blue.svg?colorB=1488C6&maxAge=60&style=flat-square)](https://hub.docker.com/r/linuxserver/radarr)                   | [![Docker aphrodite](https://img.shields.io/badge/linuxserver-radarr:preview-blue.svg?colorB=1488C6&maxAge=60&style=flat-square)](https://hub.docker.com/r/linuxserver/radarr) |
+| Docker          | [![Docker release](https://img.shields.io/badge/hotio-radarr:latest-blue.svg?colorB=1488C6&maxAge=60&style=flat-square)](https://hub.docker.com/r/hotio/radarr)              | [![Docker nightly](https://img.shields.io/badge/hotio-radarr:unstable-blue.svg?colorB=1488C6&maxAge=60&style=flat-square)](https://hub.docker.com/r/hotio/radarr)                              | [![Docker aphrodite](https://img.shields.io/badge/hotio-radarr:aphrodite-blue.svg?colorB=1488C6&maxAge=60&style=flat-square)](https://hub.docker.com/r/hotio/radarr)           |
+
+## Support
+
+[![OpenCollective](https://opencollective.com/radarr/tiers/backer/badge.svg)](#backers)
+[![OpenCollective](https://opencollective.com/radarr/tiers/flexible-sponsor/badge.svg)](#flexible-sponsors)
+[![OpenCollective](https://opencollective.com/radarr/tiers/sponsor/badge.svg)](#sponsors)
+
+[![Discord](https://img.shields.io/badge/discord-chat-7289DA.svg?maxAge=60&style=flat-square)](https://discord.gg/AD3UP37)
+[![Reddit](https://img.shields.io/badge/reddit-discussion-FF4500.svg?maxAge=60&style=flat-square)](https://www.reddit.com/r/radarr)
+[![Feathub](https://img.shields.io/badge/feathub-requests-lightgrey.svg?maxAge=60&style=flat-square)](http://feathub.com/Radarr/Radarr)
+[![GitHub](https://img.shields.io/badge/github-issues-red.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/issues)
+[![GitHub Wiki](https://img.shields.io/badge/github-wiki-181717.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/wiki)
+
+## Status
+
+[![GitHub issues](https://img.shields.io/github/issues/radarr/radarr.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/issues)
+[![GitHub pull requests](https://img.shields.io/github/issues-pr/radarr/radarr.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/pulls)
+[![GNU GPL v3](https://img.shields.io/badge/license-GNU%20GPL%20v3-blue.svg?maxAge=60&style=flat-square)](http://www.gnu.org/licenses/gpl.html)
+[![Copyright 2010-2017](https://img.shields.io/badge/copyright-2017-blue.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr)
+[![Github Releases](https://img.shields.io/github/downloads/Radarr/Radarr/total.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/releases/)
+[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/radarr.svg?maxAge=60&style=flat-square)](https://hub.docker.com/r/linuxserver/radarr/)
+[![Changelog](https://img.shields.io/github/commit-activity/w/radarr/radarr.svg?style=flat-square)](/CHANGELOG.md#unreleased)
+
+| Service  | Master                      | Develop                      |
+|----------|:---------------------------:|:----------------------------:|
+| AppVeyor | [![AppVeyor](https://img.shields.io/appveyor/ci/galli-leo/Radarr/master.svg?maxAge=60&style=flat-square)](https://ci.appveyor.com/project/galli-leo/Radarr) | [![AppVeyor](https://img.shields.io/appveyor/ci/galli-leo/Radarr-usby1/develop.svg?maxAge=60&style=flat-square)](https://ci.appveyor.com/project/galli-leo/Radarr-usby1) |
+| Travis   | [![Travis](https://img.shields.io/travis/Radarr/Radarr/master.svg?maxAge=60&style=flat-square)](https://travis-ci.org/Radarr/Radarr) | [![Travis](https://img.shields.io/travis/Radarr/Radarr/develop.svg?maxAge=60&style=flat-square)](https://travis-ci.org/Radarr/Radarr) |
+
+### [Site and API Status](https://status.radarr.video)
+
+| API | Updates | Sites  |
+|-------|:----:|:----:|
+| [![API V2 (develop)](http://status.radarr.video/component/1/shield?style=flat-square)](https://api.radarr.video/v2/) | [![Update Server](http://status.radarr.video/component/4/shield?style=flat-square)](https://radarr.aeonlucid.com) | [![Radarr Mappings](http://status.radarr.video/component/6/shield?style=flat-square)](https://mappings.radarr.video/)
+| [![API Staging (nightly)](http://status.radarr.video/component/2/shield?style=flat-square)](https://staging.api.radarr.video/) | [![Github Updates](http://status.radarr.video/component/5/shield?style=flat-square)](https://api.github.com/v3/) | [![Main Site](http://status.radarr.video/component/7/shield?style=flat-square)](https://radarr.video/)
+
+Radarr is currently undergoing rapid development and pull requests are actively added into the repository.
+
+## Features
+
+### Current Features
+
+* Adding new movies with lots of information, such as trailers, ratings, etc.
+* Support for major platforms: Windows, Linux, macOS, Raspberry Pi, etc.
+* Can watch for better quality of the movies you have and do an automatic upgrade. *eg. from DVD to Blu-Ray*
+* Automatic failed download handling will try another release if one fails
+* Manual search so you can pick any release or to see why a release was not downloaded automatically
+* Full integration with SABnzbd and NZBGet
+* Automatically searching for releases as well as RSS Sync
+* Automatically importing downloaded movies
+* Recognizing Special Editions, Director's Cut, etc.
+* Identifying releases with hardcoded subs
+* All indexers supported by Sonarr also supported
+* New PassThePopcorn Indexer
+* QBittorrent, Deluge, rTorrent, Transmission and uTorrent download client (Other clients are coming)
+* New TorrentPotato Indexer
+* Torznab Indexer now supports Movies (Works well with [Jackett](https://github.com/Jackett/Jackett))
+* Scanning PreDB to know when a new release is available
+* Importing movies from various online sources, such as IMDb Watchlists (A complete list can be found [here](https://github.com/Radarr/Radarr/issues/114))
+* Full integration with Kodi, Plex (notification, library update)
+* And a beautiful UI
+* Importing Metadata such as trailers or subtitles
+* Adding metadata such as posters and information for Kodi and others to use
+* Advanced customization for profiles, such that Radarr will always download the copy you want
+
+### Planned Features
+
+See the [Roadmap blogpost](https://blog.radarr.video/development/update/2018/11/11/roadmap-update.html) for an overview of planned features.
+
+#### [Feature Requests](http://feathub.com/Radarr/Radarr)
+
+## Configuring the Development Environment
+
+### Requirements
+
+* [Visual Studio Community 2019](https://www.visualstudio.com/vs/community/) or [Rider](http://www.jetbrains.com/rider/)
+* [Git](https://git-scm.com/downloads)
+* [Node.js](https://nodejs.org/en/download/)
+* [Yarn](https://yarnpkg.com/)
+
+### Setup
+
+* Make sure all the required software mentioned above are installed
+* Clone the repository into your development machine ([*info*](https://help.github.com/desktop/guides/contributing/working-with-your-remote-repository-on-github-or-github-enterprise))
+* Grab the submodules `git submodule init && git submodule update`
+* Install the required Node Packages `yarn install`
+* Start gulp to monitor your dev environment for any changes that need post processing using `yarn start` command.
+
+> **Notice**  
+> Gulp must be running at all times while you are working with Radarr client source files.
+
+### Build
+
+* To build run `sh build.sh`
+
+**Note:** Windows users must have bash available to do this. If you installed git, you should have a git bash utility that works.
+
+### Development
+
+* Open `Radarr.sln` in Visual Studio 2017 or run the build.sh script, if Mono is installed. Alternatively you can use Jetbrains Rider, since it works on all Platforms.
+* Make sure `NzbDrone.Console` is set as the startup project
+* Run `build.sh` before running
+
+## Supporters
+
+This project would not be possible without the support by these amazing folks. [**Become a sponsor or backer**](https://opencollective.com/radarr) to help us out!
+
+### Sponsors
+
+[![Sponsors](https://opencollective.com/radarr/tiers/sponsor.svg)](https://opencollective.com/radarr/order/3851)
+
+### Flexible Sponsors
+
+[![Flexible Sponsors](https://opencollective.com/radarr/tiers/flexible-sponsor.svg?avatarHeight=54)](https://opencollective.com/radarr/order/3856)
+
+### Backers
+
+[![Backers](https://opencollective.com/radarr/tiers/backer.svg?avatarHeight=48)](https://opencollective.com/radarr/order/3850)
+
+### JetBrains
+
+Thank you to [<img src="/Logo/jetbrains.svg" alt="JetBrains" width="32"> JetBrains](http://www.jetbrains.com/) for providing us with free licenses to their great tools
+
+* [<img src="/Logo/resharper.svg" alt="ReSharper" width="32"> ReSharper](http://www.jetbrains.com/resharper/)
+* [<img src="/Logo/webstorm.svg" alt="WebStorm" width="32"> WebStorm](http://www.jetbrains.com/webstorm/)
+* [<img src="/Logo/rider.svg" alt="Rider" width="32"> Rider](http://www.jetbrains.com/rider/)
+* [<img src="/Logo/dottrace.svg" alt="dotTrace" width="32"> dotTrace](http://www.jetbrains.com/dottrace/)
+
+## License
+
+* [GNU GPL v3](http://www.gnu.org/licenses/gpl.html)
+* Copyright 2010-2019
diff --git a/jails/sonarr/includes/sonarr.rc b/jails/sonarr/includes/sonarr.rc
old mode 100644
new mode 100755
diff --git a/jails/sonarr/install.sh b/jails/sonarr/install.sh
index 4da5ea9f..7e28487a 100755
--- a/jails/sonarr/install.sh
+++ b/jails/sonarr/install.sh
@@ -1,35 +1,13 @@
 #!/usr/local/bin/bash
 # This file contains the install script for sonarr
 
-iocage exec sonarr mkdir -p /mnt/shows
-iocage exec sonarr mkdir -p /mnt/fetched
-
 # Check if dataset for completed download and it parent dataset exist, create if they do not.
-if [ ! -d "/mnt/${global_dataset_downloads}" ]; then
-	echo "Downloads dataset does not exist... Creating... ${global_dataset_downloads}"
-	zfs create ${global_dataset_downloads}
-fi
-
-if [ ! -d "/mnt/${global_dataset_downloads}/complete" ]; then
-	echo "Completed Downloads dataset does not exist... Creating... ${global_dataset_downloads}/complete"
-	zfs create ${global_dataset_downloads}/complete
-fi
-
-iocage fstab -a sonarr /mnt/${global_dataset_downloads}/complete /mnt/fetched nullfs rw 0 0
+createmount sonarr ${global_dataset_downloads}
+createmount sonarr ${global_dataset_downloads}/complete /mnt/fetched
 
 # Check if dataset for media library and the dataset for tv shows exist, create if they do not.
-if [ ! -d "/mnt/${global_dataset_media}" ]; then
-	echo "Media dataset does not exist... Creating... ${global_dataset_media}"
-	zfs create ${global_dataset_media}
-fi
-
-if [ ! -d "/mnt/${global_dataset_media}/shows" ]; then
-	echo "TV Shows dataset does not exist... Creating... ${global_dataset_media}/shows"
-	zfs create ${global_dataset_media}/shows
-fi
-
-iocage fstab -a sonarr /mnt/${global_dataset_media}/shows /mnt/shows nullfs rw 0 0
-
+createmount sonarr ${global_dataset_media}
+createmount sonarr ${global_dataset_media}/shows /mnt/shows
 
 iocage exec sonarr ln -s /usr/local/bin/mono /usr/bin/mono
 iocage exec sonarr "fetch http://download.sonarr.tv/v2/master/mono/NzbDrone.master.tar.gz -o /usr/local/share"
diff --git a/jails/sonarr/readme.md b/jails/sonarr/readme.md
new file mode 100755
index 00000000..b6f379b6
--- /dev/null
+++ b/jails/sonarr/readme.md
@@ -0,0 +1,63 @@
+# Original README from the sonarr github:
+
+https://github.com/Sonarr/Sonarr
+
+# Sonarr
+
+
+Sonarr is a PVR for Usenet and BitTorrent users. It can monitor multiple RSS feeds for new episodes of your favorite shows and will grab, sort and rename them. It can also be configured to automatically upgrade the quality of files already downloaded when a better quality format becomes available.
+
+## Major Features Include:
+
+* Support for major platforms: Windows, Linux, macOS, Raspberry Pi, etc.
+* Automatically detects new episodes
+* Can scan your existing library and download any missing episodes
+* Can watch for better quality of the episodes you already have and do an automatic upgrade. *eg. from DVD to Blu-Ray*
+* Automatic failed download handling will try another release if one fails
+* Manual search so you can pick any release or to see why a release was not downloaded automatically
+* Fully configurable episode renaming
+* Full integration with SABnzbd and NZBGet
+* Full integration with Kodi, Plex (notification, library update, metadata)
+* Full support for specials and multi-episode releases
+* And a beautiful UI
+
+## Configuring Development Environment:
+
+### Requirements
+
+* [Visual Studio 2017](https://www.visualstudio.com/vs/)
+* [Git](https://git-scm.com/downloads)
+* [NodeJS](https://nodejs.org/en/download/)
+* [Yarn](https://yarnpkg.com/)
+
+### Setup
+
+* Make sure all the required software mentioned above are installed
+* Clone the repository into your development machine. [*info*](https://help.github.com/en/articles/working-with-forks)
+* Grab the submodules `git submodule init && git submodule update`
+* Install the required Node Packages `yarn`
+
+### Backend Development
+
+* Run `yarn build` to build the UI
+* Open `Sonarr.sln` in Visual Studio
+* Make sure `NzbDrone.Console` is set as the startup project
+* Build `NzbDrone.Windows` and `NzbDrone.Mono` projects
+* Build Solution
+
+### UI Development
+
+* Run `yarn watch` to build UI and rebuild automatically when changes are detected
+* Run Sonarr.Console.exe (or debug in Visual Studio)
+
+### License
+
+
+* [GNU GPL v3](http://www.gnu.org/licenses/gpl.html)
+* Copyright 2010-2019
+
+### Sponsors
+
+* [JetBrains](http://www.jetbrains.com/) for providing us with free licenses to their great tools
+    * [ReSharper](http://www.jetbrains.com/resharper/)
+    * [TeamCity](http://www.jetbrains.com/teamcity/)
diff --git a/jails/tautulli/readme.md b/jails/tautulli/readme.md
new file mode 100755
index 00000000..db612709
--- /dev/null
+++ b/jails/tautulli/readme.md
@@ -0,0 +1,67 @@
+# Original README from the tautulli github:
+
+https://github.com/Tautulli/Tautulli
+
+# Tautulli
+
+A python based web application for monitoring, analytics and notifications for [Plex Media Server](https://plex.tv).
+
+This project is based on code from [Headphones](https://github.com/rembo10/headphones) and [PlexWatchWeb](https://github.com/ecleese/plexWatchWeb).
+
+## Features
+
+* Responsive web design viewable on desktop, tablet and mobile web browsers.
+* Themed to complement Plex/Web.
+* Easy configuration setup (no separate web server required).
+* Monitor current Plex Media Server activity.
+* Fully customizable notifications for stream activity and recently added media.
+* Top statistics on home page with configurable duration and measurement metric.
+* Global watching history with search/filtering & dynamic column sorting.
+* Full user list with general information and comparison stats.
+* Individual user information including devices IP addresses.
+* Complete library statistics and media file information.
+* Rich analytics presented using Highcharts graphing.
+* Beautiful content information pages.
+* Full sync list data on all users syncing items from your library.
+* And many more!!
+
+## Preview
+
+* [Full preview gallery available on our website](https://tautulli.com)
+
+![Tautulli Homepage](https://tautulli.com/images/screenshots/activity-compressed.jpg?v=2)
+
+## Installation & Support
+
+[![Python](https://img.shields.io/badge/python-v2.7.17-blue?style=flat-square)](https://python.org/downloads/release/python-2717/)
+[![Docker Pulls](https://img.shields.io/docker/pulls/tautulli/tautulli?style=flat-square)](https://hub.docker.com/r/tautulli/tautulli)
+[![Docker Stars](https://img.shields.io/docker/stars/tautulli/tautulli?style=flat-square)](https://hub.docker.com/r/tautulli/tautulli)
+
+| Status | Branch: `master` | Branch: `beta` | Branch: `nightly` |
+| --- | --- | --- | --- |
+| Release | [![Release@master](https://img.shields.io/github/v/release/Tautulli/Tautulli?style=flat-square)](https://github.com/Tautulli/Tautulli/releases/latest) <br> [![Release Date@master](https://img.shields.io/github/release-date/Tautulli/Tautulli?style=flat-square&color=blue)](https://github.com/Tautulli/Tautulli/releases/latest) | [![Release@beta](https://img.shields.io/github/v/release/Tautulli/Tautulli?include_prereleases&style=flat-square)](https://github.com/Tautulli/Tautulli/releases) <br> [![Commits@nightly](https://img.shields.io/github/commits-since/Tautulli/Tautulli/latest/beta?style=flat-square&color=blue)](https://github.com/Tautulli/Tautulli/commits/beta) | [![Last Commits@nightly](https://img.shields.io/github/last-commit/Tautulli/Tautulli/nightly?style=flat-square&color=blue)](https://github.com/Tautulli/Tautulli/commits/nightly) <br> [![Commits@nightly](https://img.shields.io/github/commits-since/Tautulli/Tautulli/latest/nightly?style=flat-square&color=blue)](https://github.com/Tautulli/Tautulli/commits/nightly) |
+| Docker  | [![Docker@master](https://img.shields.io/badge/tautulli-tautulli:latest-blue?style=flat-square)](https://hub.docker.com/r/tautulli/tautulli) <br> [![Docker Build@master](https://img.shields.io/github/workflow/status/Tautulli/Tautulli/Publish%20Docker%20Branch/master?style=flat-square)](https://github.com/Tautulli/Tautulli/actions?query=branch%3Amaster) | [![Docker@beta](https://img.shields.io/badge/tautulli-tautulli:beta-blue?style=flat-square)](https://hub.docker.com/r/tautulli/tautulli) <br> [![Docker Build@beta](https://img.shields.io/github/workflow/status/Tautulli/Tautulli/Publish%20Docker%20Branch/beta?style=flat-square)](https://github.com/Tautulli/Tautulli/actions?query=branch%3Abeta) | [![Docker@nightly](https://img.shields.io/badge/tautulli-tautulli:nightly-blue?style=flat-square)](https://hub.docker.com/r/tautulli/tautulli) <br> [![Docker Build@nightly](https://img.shields.io/github/workflow/status/Tautulli/Tautulli/Publish%20Docker%20Branch/nightly?style=flat-square)](https://github.com/Tautulli/Tautulli/actions?query=branch%3Anightly) |
+
+[![Wiki](https://img.shields.io/badge/github-wiki-black?style=flat-square)](https://github.com/Tautulli/Tautulli-Wiki/wiki)
+[![Discord](https://img.shields.io/discord/183396325142822912?label=discord&style=flat-square&color=7289DA)](https://tautulli.com/discord)
+[![Reddit](https://img.shields.io/reddit/subreddit-subscribers/tautulli?label=reddit&style=flat-square&color=FF5700)](https://www.reddit.com/r/Tautulli/)
+[![Plex Forums](https://img.shields.io/badge/plex%20forums-discussion-E5A00D?style=flat-square)](https://forums.plex.tv/t/tautulli-monitor-your-plex-media-server/225242)
+
+* Read the [Installation Guides](https://github.com/Tautulli/Tautulli-Wiki/wiki/Installation) for instructions to install Tautulli.
+* The [Frequently Asked Questions](https://github.com/Tautulli/Tautulli-Wiki/wiki/Frequently-Asked-Questions) in the wiki can help you with common problems.
+* Support is available on [Discord](https://tautulli.com/discord), [Reddit](https://www.reddit.com/r/Tautulli), or the [Plex Forums](https://forums.plex.tv/t/tautulli-monitor-your-plex-media-server/225242).
+
+## Issues & Feature Requests
+
+[![Issues](https://img.shields.io/badge/github-issues-red?style=flat-square)](https://github.com/Tautulli/Tautulli-Issues)
+[![Feathub](https://img.shields.io/badge/feathub-requests-lightgrey?style=flat-square)](https://feathub.com/Tautulli/Tautulli)
+
+* Please see the [Issues Repository](https://github.com/Tautulli/Tautulli-Issues).
+
+## License
+
+[![License](https://img.shields.io/github/license/Tautulli/Tautulli?style=flat-square)](https://github.com/Tautulli/Tautulli/blob/master/LICENSE)
+
+This is free software under the GPL v3 open source license. Feel free to do with it what you wish, but any modification must be open sourced. A copy of the license is included.
+
+This software includes Highsoft software libraries which you may freely distribute for non-commercial use. Commerical users must licence this software, for more information visit https://shop.highsoft.com/faq/non-commercial#non-commercial-redistribution.
\ No newline at end of file
diff --git a/jails/transmission/install.sh b/jails/transmission/install.sh
index 25af1d31..f2af7b55 100755
--- a/jails/transmission/install.sh
+++ b/jails/transmission/install.sh
@@ -1,36 +1,16 @@
 #!/usr/local/bin/bash
 # This file contains the install script for transmission
 
-iocage exec transmission mkdir -p /mnt/downloads
-iocage exec transmission mkdir -p /mnt/downloads/complete
-iocage exec transmission mkdir -p /mnt/downloads/incomplete
-
 # Check if dataset Downloads dataset exist, create if they do not.
-if [ ! -d "/mnt/${global_dataset_downloads}" ]; then
-	echo "Downloads dataset does not exist... Creating... ${global_dataset_downloads}"
-	zfs create ${global_dataset_downloads}
-fi
-
-iocage fstab -a transmission /mnt/${global_dataset_downloads} /mnt/downloads nullfs rw 0 0
+createmount transmission ${global_dataset_downloads} /mnt/downloads
 
 # Check if dataset Complete Downloads dataset exist, create if they do not.
-if [ ! -d "/mnt/${global_dataset_downloads}/complete" ]; then
-	echo "Completed Downloads dataset does not exist... Creating... ${global_dataset_downloads}/complete"
-	zfs create ${global_dataset_downloads}/complete
-fi
-
-iocage fstab -a transmission /mnt/${global_dataset_downloads}/complete /mnt/downloads/complete nullfs rw 0 0
+createmount transmission ${global_dataset_downloads}/complete /mnt/downloads/complete
 
 # Check if dataset InComplete Downloads dataset exist, create if they do not.
-if [ ! -d "/mnt/${global_dataset_downloads}/incomplete" ]; then
-	echo "Completed Downloads dataset does not exist... Creating... ${global_dataset_downloads}/incomplete"
-	zfs create ${global_dataset_downloads}/incomplete
-fi
-
-iocage fstab -a transmission /mnt/${global_dataset_downloads}/incomplete /mnt/downloads/incomplete nullfs rw 0 0
+createmount transmission ${global_dataset_downloads}/incomplete /mnt/downloads/incomplete
 
 
-iocage exec transmission mkdir -p /config
 iocage exec transmission chown -R transmission:transmission /config
 iocage exec transmission sysrc "transmission_enable=YES"
 iocage exec transmission sysrc "transmission_conf_dir=/config"
diff --git a/jails/transmission/readme.md b/jails/transmission/readme.md
new file mode 100755
index 00000000..a2573b3d
--- /dev/null
+++ b/jails/transmission/readme.md
@@ -0,0 +1,81 @@
+# Original README from the transmission github:
+
+https://github.com/transmission/transmission
+
+# Transmission
+
+## About
+
+Transmission is a fast, easy, and free BitTorrent client. It comes in several flavors:
+  * A native Mac OS X GUI application
+  * GTK+ and Qt GUI applications for Linux, BSD, etc.
+  * A headless daemon for servers and routers
+  * A web UI for remote controlling any of the above
+
+Visit https://transmissionbt.com/ for more information.
+
+## Command line interface notes
+
+Transmission is fully supported in transmission-remote, the preferred cli client.
+
+Three standalone tools to examine, create, and edit .torrent files exist: transmission-show, transmission-create, and transmission-edit, respectively.
+
+Prior to development of transmission-remote, the standalone client transmission-cli was created. Limited to a single torrent at a time, transmission-cli is deprecated and exists primarily to support older hardware dependent upon it. In almost all instances, transmission-remote should be used instead.
+
+Different distributions may choose to package any or all of these tools in one or more separate packages.
+
+## Building
+
+Transmission has an Xcode project file (Transmission.xcodeproj) for building in Xcode.
+
+For a more detailed description, and dependencies, visit: https://github.com/transmission/transmission/wiki
+
+### Building a Transmission release from the command line
+
+    $ tar xf transmission-2.92.tar.xz
+    $ cd transmission-2.92
+    $ mkdir build
+    $ cd build
+    $ cmake ..
+    $ make
+    $ sudo make install
+
+### Building Transmission from the nightly builds
+
+Download a tarball from https://build.transmissionbt.com/job/trunk-linux/ and follow the steps from the previous section.
+
+If you're new to building programs from source code, this is typically easier than building from Git.
+
+### Building Transmission from Git (first time)
+
+    $ git clone https://github.com/transmission/transmission Transmission
+    $ cd Transmission
+    $ git submodule update --init
+    $ mkdir build
+    $ cd build
+    $ cmake ..
+    $ make
+    $ sudo make install
+
+### Building Transmission from Git (updating)
+
+    $ cd Transmission/build
+    $ make clean
+    $ git pull --rebase --prune
+    $ git submodule update
+    $ cmake ..
+    $ make
+    $ sudo make install
+
+## Contributing
+
+### Code Style
+
+You would want to setup your editor to make use of uncrustify.cfg and .jsbeautifyrc configuration files located in the root of this repository.
+
+If for some reason you are unwilling or unable to do so, there is a shell script which you could run either directly or via docker-compose:
+
+    $ ./code_style.sh
+    or
+    $ docker-compose build --pull
+    $ docker-compose run --rm code_style
diff --git a/wiki/test.md b/wiki/test.md
new file mode 100644
index 00000000..45c0a5a8
--- /dev/null
+++ b/wiki/test.md
@@ -0,0 +1 @@
+wiki test placeholder

From a0660b0377953f7e942225523c677419e562f586 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sat, 14 Mar 2020 00:06:09 +0100
Subject: [PATCH 074/147] Add bitwarden to readme

---
 docs/Readme.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Readme.md b/docs/Readme.md
index 9e42dfc9..6b48c6a6 100644
--- a/docs/Readme.md
+++ b/docs/Readme.md
@@ -71,6 +71,7 @@ Basic means: The same setup as a FreeNAS plugin would've, DHCP on bridge0.
 - organizr
 - py-kms
 - nextcloud
+- bitwarden
 
 #### Backend
 - mariadb

From 99a86b66121a5c67de4b27717af12235209ef476 Mon Sep 17 00:00:00 2001
From: Dis McCarthy <397465+disconn3ct@users.noreply.github.com>
Date: Sun, 5 Apr 2020 10:31:45 -0400
Subject: [PATCH 075/147] Typo fix

Add missing 'echo'.
---
 jails/organizr/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jails/organizr/install.sh b/jails/organizr/install.sh
index 9a2a5e86..ede4060d 100755
--- a/jails/organizr/install.sh
+++ b/jails/organizr/install.sh
@@ -20,7 +20,7 @@ fi
 if [ -f "/mnt/${global_dataset_config}/organizr/ssl/Organizr-Cert.crt" ]; then
     echo "certificate exist... Skipping cert generation"
 else
-	"No ssl certificate present, generating self signed certificate"
+	echo "No ssl certificate present, generating self signed certificate"
 	openssl req -new -newkey rsa:2048 -days 365 -nodes -x509 -subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=localhost" -keyout /mnt/${global_dataset_config}/organizr/cert/Organizr-Cert.key -out /mnt/${global_dataset_config}/organizr/cert/Organizr-Cert.crt
 fi
 

From df5566b170cdb53c214afa43eebe3ed46718b932 Mon Sep 17 00:00:00 2001
From: Dis McCarthy <397465+disconn3ct@users.noreply.github.com>
Date: Mon, 6 Apr 2020 07:59:16 -0400
Subject: [PATCH 076/147] fix ssl path, minor language tweaks (#49)

Co-authored-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
---
 jails/organizr/install.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jails/organizr/install.sh b/jails/organizr/install.sh
index ede4060d..4f5e55ed 100755
--- a/jails/organizr/install.sh
+++ b/jails/organizr/install.sh
@@ -13,15 +13,15 @@ cp ${SCRIPT_DIR}/jails/organizr/includes/nginx.conf /mnt/${global_dataset_iocage
 cp -Rf ${SCRIPT_DIR}/jails/organizr/includes/custom /mnt/${global_dataset_iocage}/jails/organizr/root/usr/local/etc/nginx/custom
 
 if [ ! -d "/mnt/${global_dataset_config}/organizr/ssl" ]; then
-	echo "cert folder not existing... creating..."
+	echo "cert folder doesn't exist... creating..."
 	iocage exec organizr mkdir /config/ssl
 fi
 
 if [ -f "/mnt/${global_dataset_config}/organizr/ssl/Organizr-Cert.crt" ]; then
-    echo "certificate exist... Skipping cert generation"
+    echo "certificate exists... Skipping cert generation"
 else
 	echo "No ssl certificate present, generating self signed certificate"
-	openssl req -new -newkey rsa:2048 -days 365 -nodes -x509 -subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=localhost" -keyout /mnt/${global_dataset_config}/organizr/cert/Organizr-Cert.key -out /mnt/${global_dataset_config}/organizr/cert/Organizr-Cert.crt
+	openssl req -new -newkey rsa:2048 -days 365 -nodes -x509 -subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=localhost" -keyout /mnt/${global_dataset_config}/organizr/ssl/Organizr-Cert.key -out /mnt/${global_dataset_config}/organizr/ssl/Organizr-Cert.crt
 fi
 
 iocage exec organizr git clone https://github.com/causefx/Organizr.git /usr/local/www/Organizr

From d5f613617e7a7d94073a068f9ab38338a6cf1750 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sat, 25 Apr 2020 16:30:14 +0200
Subject: [PATCH 077/147] Create shellcheck.yml

---
 .github/workflows/shellcheck.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 .github/workflows/shellcheck.yml

diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml
new file mode 100644
index 00000000..0da492dd
--- /dev/null
+++ b/.github/workflows/shellcheck.yml
@@ -0,0 +1,17 @@
+# This is a workflow to run shellcheck on all scripts
+name: Shellcheck Workflow
+
+# Controls when the action will run. Triggers the workflow on push or pull request 
+# events but only for the master branch
+on:
+  pull_request:
+    branches:
+      - master
+      - dev
+
+jobs:
+  shellcheck:
+    steps:
+      - uses: actions/checkout@v1
+      - name: Shell Linter
+        uses: azohra/shell-linter@v0.3.0

From ad7f0813a378fcc81a51eb465c40d850fbe2b8ab Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sun, 26 Apr 2020 14:38:31 +0200
Subject: [PATCH 078/147] delete wiki generation action

This is going to be replaced in 1.2
---
 .github/workflows/main.yml | 39 --------------------------------------
 1 file changed, 39 deletions(-)
 delete mode 100644 .github/workflows/main.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
deleted file mode 100644
index c7d70678..00000000
--- a/.github/workflows/main.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-# This is a basic workflow to help you get started with Actions
-
-name: Master workflow
-
-# Controls when the action will run. Triggers the workflow on push or pull request 
-# events but only for the master branch
-on:
-  push:
-    branches: [ master ]
-
-
-jobs:
-  create-wiki:
-    runs-on: ubuntu-latest
-    steps:
-    - name: checkout
-      uses: actions/checkout@master
-    - name: rename-readme
-      run: |
-        for pathname in jails/*/README.MD; do ! cp "$pathname" "wiki/$( basename "$( dirname "$pathname" )" ).md"; done
-        for pathname in jails/*/README.md; do ! cp "$pathname" "wiki/$( basename "$( dirname "$pathname" )" ).md"; done 
-        for pathname in jails/*/readme.md; do ! cp "$pathname" "wiki/$( basename "$( dirname "$pathname" )" ).md"; done
-        for pathname in jails/*/Readme.md; do ! cp "$pathname" "wiki/$( basename "$( dirname "$pathname" )" ).md"; done
-      shell: bash
-    - name: copy file
-      uses: canastro/copy-file-action@master
-      with:
-        source: "jails/**/*.md"
-        target: "wiki/"
-    - name: Upload wiki to Wiki
-      uses: docker://decathlon/wiki-page-creator-action:latest
-      env:
-        ACTION_MAIL: ornias1993@users.noreply.github.com
-        ACTION_NAME: ornias1993
-        GH_PAT: ${{ secrets.WIKI_GH_PAT }}
-        MD_FOLDER: wiki
-        OWNER: ornias1993
-        REPO_NAME: jailman
-        SKIP_MD: README.md

From 8721fcb2780b687669b3772e3283aebf0a8688b7 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sat, 14 Mar 2020 00:00:50 +0100
Subject: [PATCH 079/147] placeholder, dev wipe

---
 placeholder | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 placeholder

diff --git a/placeholder b/placeholder
new file mode 100644
index 00000000..e69de29b

From a1cdb585f2be51bee087cc88f559b355ba8a0ce1 Mon Sep 17 00:00:00 2001
From: Matt Coleman <mdcoleman001@gmail.com>
Date: Mon, 6 Apr 2020 08:00:13 -0400
Subject: [PATCH 080/147] Add InfluxDB (#45)

Add influxDB jail

Co-authored-by: colemamd <root@freenas.colemanonline.net>
---
 config.yml.example                    |   8 +-
 jails/influxdb/includes/influxdb.conf | 586 ++++++++++++++++++++++++++
 jails/influxdb/install.sh             |  46 ++
 jails/influxdb/readme.md              | 262 ++++++++++++
 jails/influxdb/update.sh              |   6 +
 5 files changed, 907 insertions(+), 1 deletion(-)
 create mode 100644 jails/influxdb/includes/influxdb.conf
 create mode 100755 jails/influxdb/install.sh
 create mode 100644 jails/influxdb/readme.md
 create mode 100644 jails/influxdb/update.sh

diff --git a/config.yml.example b/config.yml.example
index 55cda37a..f3404be2 100644
--- a/config.yml.example
+++ b/config.yml.example
@@ -19,7 +19,7 @@ global:
 
 
 # Example configuration, showing how to customise network config. 
-# Ese the same jailname on both sides of this variable example: example
+# Use the same jailname on both sides of this variable example: example
 example: example
   #interfaces is optional and will be autmatically replace with vnet0:bridge0 if not present
   interfaces: vnet0:bridge0
@@ -92,3 +92,9 @@ bitwarden: bitwarden
   db_password: "YourDBPasswordHerePLEASE"
   type: mariadb
   admin_token: "PUTYOURADMINTOKENHEREANDREMOVETHIS"
+
+influxdb: influxdb
+  ip4_addr: 192.168.1.250/24
+  gateway: 192.168.1.1
+  pkgs: influxdb
+  database: influxdb
diff --git a/jails/influxdb/includes/influxdb.conf b/jails/influxdb/includes/influxdb.conf
new file mode 100644
index 00000000..ad9533b0
--- /dev/null
+++ b/jails/influxdb/includes/influxdb.conf
@@ -0,0 +1,586 @@
+### Welcome to the InfluxDB configuration file.
+
+# The values in this file override the default values used by the system if
+# a config option is not specified. The commented out lines are the configuration
+# field and the default value used. Uncommenting a line and changing the value
+# will change the value used at runtime when the process is restarted.
+
+# Once every 24 hours InfluxDB will report usage data to usage.influxdata.com
+# The data includes a random ID, os, arch, version, the number of series and other
+# usage data. No data from user databases is ever transmitted.
+# Change this option to true to disable reporting.
+# reporting-disabled = false
+
+# Bind address to use for the RPC service for backup and restore.
+# bind-address = "127.0.0.1:8088"
+
+###
+### [meta]
+###
+### Controls the parameters for the Raft consensus group that stores metadata
+### about the InfluxDB cluster.
+###
+
+[meta]
+  # Where the metadata/raft database is stored
+  dir = "/config/influxdb/database/meta"
+
+  # Automatically create a default retention policy when creating a database.
+  # retention-autocreate = true
+
+  # If log messages are printed for the meta service
+  # logging-enabled = true
+
+###
+### [data]
+###
+### Controls where the actual shard data for InfluxDB lives and how it is
+### flushed from the WAL. "dir" may need to be changed to a suitable place
+### for your system, but the WAL settings are an advanced configuration. The
+### defaults should work for most systems.
+###
+
+[data]
+  # The directory where the TSM storage engine stores TSM files.
+  dir = "/config/influxdb/database/data"
+
+  # The directory where the TSM storage engine stores WAL files.
+  wal-dir = "/config/influxdb/database/wal"
+
+  # The amount of time that a write will wait before fsyncing.  A duration
+  # greater than 0 can be used to batch up multiple fsync calls.  This is useful for slower
+  # disks or when WAL write contention is seen.  A value of 0s fsyncs every write to the WAL.
+  # Values in the range of 0-100ms are recommended for non-SSD disks.
+  # wal-fsync-delay = "0s"
+
+
+  # The type of shard index to use for new shards.  The default is an in-memory index that is
+  # recreated at startup.  A value of "tsi1" will use a disk based index that supports higher
+  # cardinality datasets.
+  # index-version = "inmem"
+
+  # Trace logging provides more verbose output around the tsm engine. Turning
+  # this on can provide more useful output for debugging tsm engine issues.
+  # trace-logging-enabled = false
+
+  # Whether queries should be logged before execution. Very useful for troubleshooting, but will
+  # log any sensitive data contained within a query.
+  # query-log-enabled = true
+
+  # Validates incoming writes to ensure keys only have valid unicode characters.
+  # This setting will incur a small overhead because every key must be checked.
+  # validate-keys = false
+
+  # Settings for the TSM engine
+
+  # CacheMaxMemorySize is the maximum size a shard's cache can
+  # reach before it starts rejecting writes.
+  # Valid size suffixes are k, m, or g (case insensitive, 1024 = 1k).
+  # Values without a size suffix are in bytes.
+  # cache-max-memory-size = "1g"
+
+  # CacheSnapshotMemorySize is the size at which the engine will
+  # snapshot the cache and write it to a TSM file, freeing up memory
+  # Valid size suffixes are k, m, or g (case insensitive, 1024 = 1k).
+  # Values without a size suffix are in bytes.
+  # cache-snapshot-memory-size = "25m"
+
+  # CacheSnapshotWriteColdDuration is the length of time at
+  # which the engine will snapshot the cache and write it to
+  # a new TSM file if the shard hasn't received writes or deletes
+  # cache-snapshot-write-cold-duration = "10m"
+
+  # CompactFullWriteColdDuration is the duration at which the engine
+  # will compact all TSM files in a shard if it hasn't received a
+  # write or delete
+  # compact-full-write-cold-duration = "4h"
+
+  # The maximum number of concurrent full and level compactions that can run at one time.  A
+  # value of 0 results in 50% of runtime.GOMAXPROCS(0) used at runtime.  Any number greater
+  # than 0 limits compactions to that value.  This setting does not apply
+  # to cache snapshotting.
+  # max-concurrent-compactions = 0
+
+  # CompactThroughput is the rate limit in bytes per second that we
+  # will allow TSM compactions to write to disk. Note that short bursts are allowed
+  # to happen at a possibly larger value, set by CompactThroughputBurst
+  # compact-throughput = "48m"
+
+  # CompactThroughputBurst is the rate limit in bytes per second that we
+  # will allow TSM compactions to write to disk.
+  # compact-throughput-burst = "48m"
+
+  # If true, then the mmap advise value MADV_WILLNEED will be provided to the kernel with respect to
+  # TSM files. This setting has been found to be problematic on some kernels, and defaults to off.
+  # It might help users who have slow disks in some cases.
+  # tsm-use-madv-willneed = false
+
+  # Settings for the inmem index
+
+  # The maximum series allowed per database before writes are dropped.  This limit can prevent
+  # high cardinality issues at the database level.  This limit can be disabled by setting it to
+  # 0.
+  # max-series-per-database = 1000000
+
+  # The maximum number of tag values per tag that are allowed before writes are dropped.  This limit
+  # can prevent high cardinality tag values from being written to a measurement.  This limit can be
+  # disabled by setting it to 0.
+  # max-values-per-tag = 100000
+
+  # Settings for the tsi1 index
+
+  # The threshold, in bytes, when an index write-ahead log file will compact
+  # into an index file. Lower sizes will cause log files to be compacted more
+  # quickly and result in lower heap usage at the expense of write throughput.
+  # Higher sizes will be compacted less frequently, store more series in-memory,
+  # and provide higher write throughput.
+  # Valid size suffixes are k, m, or g (case insensitive, 1024 = 1k).
+  # Values without a size suffix are in bytes.
+  # max-index-log-file-size = "1m"
+
+  # The size of the internal cache used in the TSI index to store previously 
+  # calculated series results. Cached results will be returned quickly from the cache rather
+  # than needing to be recalculated when a subsequent query with a matching tag key/value 
+  # predicate is executed. Setting this value to 0 will disable the cache, which may
+  # lead to query performance issues.
+  # This value should only be increased if it is known that the set of regularly used 
+  # tag key/value predicates across all measurements for a database is larger than 100. An
+  # increase in cache size may lead to an increase in heap usage.
+  series-id-set-cache-size = 100
+
+###
+### [coordinator]
+###
+### Controls the clustering service configuration.
+###
+
+[coordinator]
+  # The default time a write request will wait until a "timeout" error is returned to the caller.
+  # write-timeout = "10s"
+
+  # The maximum number of concurrent queries allowed to be executing at one time.  If a query is
+  # executed and exceeds this limit, an error is returned to the caller.  This limit can be disabled
+  # by setting it to 0.
+  # max-concurrent-queries = 0
+
+  # The maximum time a query will is allowed to execute before being killed by the system.  This limit
+  # can help prevent run away queries.  Setting the value to 0 disables the limit.
+  # query-timeout = "0s"
+
+  # The time threshold when a query will be logged as a slow query.  This limit can be set to help
+  # discover slow or resource intensive queries.  Setting the value to 0 disables the slow query logging.
+  # log-queries-after = "0s"
+
+  # The maximum number of points a SELECT can process.  A value of 0 will make
+  # the maximum point count unlimited.  This will only be checked every second so queries will not
+  # be aborted immediately when hitting the limit.
+  # max-select-point = 0
+
+  # The maximum number of series a SELECT can run.  A value of 0 will make the maximum series
+  # count unlimited.
+  # max-select-series = 0
+
+  # The maximum number of group by time bucket a SELECT can create.  A value of zero will max the maximum
+  # number of buckets unlimited.
+  # max-select-buckets = 0
+
+###
+### [retention]
+###
+### Controls the enforcement of retention policies for evicting old data.
+###
+
+[retention]
+  # Determines whether retention policy enforcement enabled.
+  # enabled = true
+
+  # The interval of time when retention policy enforcement checks run.
+  # check-interval = "30m"
+
+###
+### [shard-precreation]
+###
+### Controls the precreation of shards, so they are available before data arrives.
+### Only shards that, after creation, will have both a start- and end-time in the
+### future, will ever be created. Shards are never precreated that would be wholly
+### or partially in the past.
+
+[shard-precreation]
+  # Determines whether shard pre-creation service is enabled.
+  # enabled = true
+
+  # The interval of time when the check to pre-create new shards runs.
+  # check-interval = "10m"
+
+  # The default period ahead of the endtime of a shard group that its successor
+  # group is created.
+  # advance-period = "30m"
+
+###
+### Controls the system self-monitoring, statistics and diagnostics.
+###
+### The internal database for monitoring data is created automatically if
+### if it does not already exist. The target retention within this database
+### is called 'monitor' and is also created with a retention period of 7 days
+### and a replication factor of 1, if it does not exist. In all cases the
+### this retention policy is configured as the default for the database.
+
+[monitor]
+  # Whether to record statistics internally.
+  # store-enabled = true
+
+  # The destination database for recorded statistics
+  # store-database = "_internal"
+
+  # The interval at which to record statistics
+  # store-interval = "10s"
+
+###
+### [http]
+###
+### Controls how the HTTP endpoints are configured. These are the primary
+### mechanism for getting data into and out of InfluxDB.
+###
+
+[http]
+  # Determines whether HTTP endpoint is enabled.
+  # enabled = true
+
+  # Determines whether the Flux query endpoint is enabled.
+  # flux-enabled = false
+
+  # Determines whether the Flux query logging is enabled.
+  # flux-log-enabled = false
+
+  # The bind address used by the HTTP service.
+  # bind-address = ":8086"
+
+  # Determines whether user authentication is enabled over HTTP/HTTPS.
+  # auth-enabled = false
+
+  # The default realm sent back when issuing a basic auth challenge.
+  # realm = "InfluxDB"
+
+  # Determines whether HTTP request logging is enabled.
+  # log-enabled = true
+
+  # Determines whether the HTTP write request logs should be suppressed when the log is enabled.
+  # suppress-write-log = false
+
+  # When HTTP request logging is enabled, this option specifies the path where
+  # log entries should be written. If unspecified, the default is to write to stderr, which
+  # intermingles HTTP logs with internal InfluxDB logging.
+  #
+  # If influxd is unable to access the specified path, it will log an error and fall back to writing
+  # the request log to stderr.
+  # access-log-path = ""
+
+  # Filters which requests should be logged. Each filter is of the pattern NNN, NNX, or NXX where N is
+  # a number and X is a wildcard for any number. To filter all 5xx responses, use the string 5xx.
+  # If multiple filters are used, then only one has to match. The default is to have no filters which
+  # will cause every request to be printed.
+  # access-log-status-filters = []
+
+  # Determines whether detailed write logging is enabled.
+  # write-tracing = false
+
+  # Determines whether the pprof endpoint is enabled.  This endpoint is used for
+  # troubleshooting and monitoring.
+  # pprof-enabled = true
+
+  # Enables authentication on pprof endpoints. Users will need admin permissions
+  # to access the pprof endpoints when this setting is enabled. This setting has
+  # no effect if either auth-enabled or pprof-enabled are set to false.
+  # pprof-auth-enabled = false
+
+  # Enables a pprof endpoint that binds to localhost:6060 immediately on startup.
+  # This is only needed to debug startup issues.
+  # debug-pprof-enabled = false
+
+  # Enables authentication on the /ping, /metrics, and deprecated /status
+  # endpoints. This setting has no effect if auth-enabled is set to false.
+  # ping-auth-enabled = false
+
+  # Determines whether HTTPS is enabled.
+  # https-enabled = false
+
+  # The SSL certificate to use when HTTPS is enabled.
+  # https-certificate = "/config/ssl/influxdb.pem"
+
+  # Use a separate private key location.
+  # https-private-key = ""
+
+  # The JWT auth shared secret to validate requests using JSON web tokens.
+  # shared-secret = ""
+
+  # The default chunk size for result sets that should be chunked.
+  # max-row-limit = 0
+
+  # The maximum number of HTTP connections that may be open at once.  New connections that
+  # would exceed this limit are dropped.  Setting this value to 0 disables the limit.
+  # max-connection-limit = 0
+
+  # Enable http service over unix domain socket
+  # unix-socket-enabled = false
+
+  # The path of the unix domain socket.
+  # bind-socket = "/var/run/influxdb.sock"
+
+  # The maximum size of a client request body, in bytes. Setting this value to 0 disables the limit.
+  # max-body-size = 25000000
+
+  # The maximum number of writes processed concurrently.
+  # Setting this to 0 disables the limit.
+  # max-concurrent-write-limit = 0
+
+  # The maximum number of writes queued for processing.
+  # Setting this to 0 disables the limit.
+  # max-enqueued-write-limit = 0
+
+  # The maximum duration for a write to wait in the queue to be processed.
+  # Setting this to 0 or setting max-concurrent-write-limit to 0 disables the limit.
+  # enqueued-write-timeout = 0
+
+###
+### [logging]
+###
+### Controls how the logger emits logs to the output.
+###
+
+[logging]
+  # Determines which log encoder to use for logs. Available options
+  # are auto, logfmt, and json. auto will use a more a more user-friendly
+  # output format if the output terminal is a TTY, but the format is not as
+  # easily machine-readable. When the output is a non-TTY, auto will use
+  # logfmt.
+  # format = "auto"
+
+  # Determines which level of logs will be emitted. The available levels
+  # are error, warn, info, and debug. Logs that are equal to or above the
+  # specified level will be emitted.
+  # level = "info"
+
+  # Suppresses the logo output that is printed when the program is started.
+  # The logo is always suppressed if STDOUT is not a TTY.
+  # suppress-logo = false
+
+###
+### [subscriber]
+###
+### Controls the subscriptions, which can be used to fork a copy of all data
+### received by the InfluxDB host.
+###
+
+[subscriber]
+  # Determines whether the subscriber service is enabled.
+  # enabled = true
+
+  # The default timeout for HTTP writes to subscribers.
+  # http-timeout = "30s"
+
+  # Allows insecure HTTPS connections to subscribers.  This is useful when testing with self-
+  # signed certificates.
+  # insecure-skip-verify = false
+
+  # The path to the PEM encoded CA certs file. If the empty string, the default system certs will be used
+  # ca-certs = ""
+
+  # The number of writer goroutines processing the write channel.
+  # write-concurrency = 40
+
+  # The number of in-flight writes buffered in the write channel.
+  # write-buffer-size = 1000
+
+
+###
+### [[graphite]]
+###
+### Controls one or many listeners for Graphite data.
+###
+
+[[graphite]]
+  # Determines whether the graphite endpoint is enabled.
+  # enabled = false
+  # database = "graphite"
+  # retention-policy = ""
+  # bind-address = ":2003"
+  # protocol = "tcp"
+  # consistency-level = "one"
+
+  # These next lines control how batching works. You should have this enabled
+  # otherwise you could get dropped metrics or poor performance. Batching
+  # will buffer points in memory if you have many coming in.
+
+  # Flush if this many points get buffered
+  # batch-size = 5000
+
+  # number of batches that may be pending in memory
+  # batch-pending = 10
+
+  # Flush at least this often even if we haven't hit buffer limit
+  # batch-timeout = "1s"
+
+  # UDP Read buffer size, 0 means OS default. UDP listener will fail if set above OS max.
+  # udp-read-buffer = 0
+
+  ### This string joins multiple matching 'measurement' values providing more control over the final measurement name.
+  # separator = "."
+
+  ### Default tags that will be added to all metrics.  These can be overridden at the template level
+  ### or by tags extracted from metric
+  # tags = ["region=us-east", "zone=1c"]
+
+  ### Each template line requires a template pattern.  It can have an optional
+  ### filter before the template and separated by spaces.  It can also have optional extra
+  ### tags following the template.  Multiple tags should be separated by commas and no spaces
+  ### similar to the line protocol format.  There can be only one default template.
+  # templates = [
+  #   "*.app env.service.resource.measurement",
+  #   # Default template
+  #   "server.*",
+  # ]
+
+###
+### [collectd]
+###
+### Controls one or many listeners for collectd data.
+###
+
+[[collectd]]
+  # enabled = false
+  # bind-address = ":25826"
+  # database = "collectd"
+  # retention-policy = ""
+  #
+  # The collectd service supports either scanning a directory for multiple types
+  # db files, or specifying a single db file.
+  # typesdb = "/usr/local/share/collectd"
+  #
+  # security-level = "none"
+  # auth-file = "/etc/collectd/auth_file"
+
+  # These next lines control how batching works. You should have this enabled
+  # otherwise you could get dropped metrics or poor performance. Batching
+  # will buffer points in memory if you have many coming in.
+
+  # Flush if this many points get buffered
+  # batch-size = 5000
+
+  # Number of batches that may be pending in memory
+  # batch-pending = 10
+
+  # Flush at least this often even if we haven't hit buffer limit
+  # batch-timeout = "10s"
+
+  # UDP Read buffer size, 0 means OS default. UDP listener will fail if set above OS max.
+  # read-buffer = 0
+
+  # Multi-value plugins can be handled two ways.
+  # "split" will parse and store the multi-value plugin data into separate measurements
+  # "join" will parse and store the multi-value plugin as a single multi-value measurement.
+  # "split" is the default behavior for backward compatibility with previous versions of influxdb.
+  # parse-multivalue-plugin = "split"
+###
+### [opentsdb]
+###
+### Controls one or many listeners for OpenTSDB data.
+###
+
+[[opentsdb]]
+  # enabled = false
+  # bind-address = ":4242"
+  # database = "opentsdb"
+  # retention-policy = ""
+  # consistency-level = "one"
+  # tls-enabled = false
+  # certificate= "/config/ssl/influxdb.pem"
+
+  # Log an error for every malformed point.
+  # log-point-errors = true
+
+  # These next lines control how batching works. You should have this enabled
+  # otherwise you could get dropped metrics or poor performance. Only points
+  # metrics received over the telnet protocol undergo batching.
+
+  # Flush if this many points get buffered
+  # batch-size = 1000
+
+  # Number of batches that may be pending in memory
+  # batch-pending = 5
+
+  # Flush at least this often even if we haven't hit buffer limit
+  # batch-timeout = "1s"
+
+###
+### [[udp]]
+###
+### Controls the listeners for InfluxDB line protocol data via UDP.
+###
+
+[[udp]]
+  # enabled = false
+  # bind-address = ":8089"
+  # database = "udp"
+  # retention-policy = ""
+
+  # InfluxDB precision for timestamps on received points ("" or "n", "u", "ms", "s", "m", "h")
+  # precision = ""
+
+  # These next lines control how batching works. You should have this enabled
+  # otherwise you could get dropped metrics or poor performance. Batching
+  # will buffer points in memory if you have many coming in.
+
+  # Flush if this many points get buffered
+  # batch-size = 5000
+
+  # Number of batches that may be pending in memory
+  # batch-pending = 10
+
+  # Will flush at least this often even if we haven't hit buffer limit
+  # batch-timeout = "1s"
+
+  # UDP Read buffer size, 0 means OS default. UDP listener will fail if set above OS max.
+  # read-buffer = 0
+
+###
+### [continuous_queries]
+###
+### Controls how continuous queries are run within InfluxDB.
+###
+
+[continuous_queries]
+  # Determines whether the continuous query service is enabled.
+  # enabled = true
+
+  # Controls whether queries are logged when executed by the CQ service.
+  # log-enabled = true
+
+  # Controls whether queries are logged to the self-monitoring data store.
+  # query-stats-enabled = false
+
+  # interval for how often continuous queries will be checked if they need to run
+  # run-interval = "1s"
+
+###
+### [tls]
+###
+### Global configuration settings for TLS in InfluxDB.
+###
+
+[tls]
+  # Determines the available set of cipher suites. See https://golang.org/pkg/crypto/tls/#pkg-constants
+  # for a list of available ciphers, which depends on the version of Go (use the query
+  # SHOW DIAGNOSTICS to see the version of Go used to build InfluxDB). If not specified, uses
+  # the default settings from Go's crypto/tls package.
+  # ciphers = [
+  #   "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305",
+  #   "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
+  # ]
+
+  # Minimum version of the tls protocol that will be negotiated. If not specified, uses the
+  # default settings from Go's crypto/tls package.
+  # min-version = "tls1.2"
+
+  # Maximum version of the tls protocol that will be negotiated. If not specified, uses the
+  # default settings from Go's crypto/tls package.
+  # max-version = "tls1.2"
diff --git a/jails/influxdb/install.sh b/jails/influxdb/install.sh
new file mode 100755
index 00000000..7efdff7b
--- /dev/null
+++ b/jails/influxdb/install.sh
@@ -0,0 +1,46 @@
+#!/usr/local/bin/bash
+# This script installs the current release of InfluxDB
+
+#####
+# 
+# Init and Mounts
+#
+#####
+
+# Initialise defaults
+JAIL_NAME="influxdb"
+JAIL_IP="$(sed 's|\(.*\)/.*|\1|' <<<"${influxdb_ip4_addr}" )"
+INCLUDES_PATH="${SCRIPT_DIR}/jails/influxdb/includes"
+DATABASE=${influxdb_database}
+
+# Enable influxdb
+iocage exec "${JAIL_NAME}" sysrc influxd_enable="YES"
+
+# Copy and edit pre-written config files
+echo "Copying default config file"
+iocage exec ${JAIL_NAME} mkdir -p /usr/local/etc
+cp ${INCLUDES_PATH}/influxdb.conf /mnt/${GLOBAL_DATASET_IOCAGE}/jails/${JAIL_NAME}/root/usr/local/etc/
+
+# Start influxdb and wait for it to startup
+iocage exec "${JAIL_NAME}" service influxd start
+sleep 15
+
+# Create database and restart
+iocage exec "${JAIL_NAME}" "curl -i -XPOST http://localhost:8086/query --data-urlencode 'q=CREATE DATABASE ${DATABASE}'"
+iocage exec "${JAIL_NAME}" service influxd restart
+	
+# Don't need /mnt/includes any more, so unmount it
+iocage fstab -r "${JAIL_NAME}" "${INCLUDES_PATH}" /mnt/includes nullfs rw 0 0
+
+# Done!
+echo "Installation complete!"
+echo "You may connect InfluxDB plugins to the InfluxDB jail at http://${JAIL_IP}:8086."
+echo ""
+echo "Database Information"
+echo "--------------------"
+echo "Database = ${DATABASE} at http://${JAIL_IP}:8086."
+echo ""
+echo "Configuration Information"
+echo "-------------------------"
+echo "The configuration file is located at /usr/local/etc/influxdb.conf"
+echo ""
\ No newline at end of file
diff --git a/jails/influxdb/readme.md b/jails/influxdb/readme.md
new file mode 100644
index 00000000..588bfbfe
--- /dev/null
+++ b/jails/influxdb/readme.md
@@ -0,0 +1,262 @@
+** Note: This jail is configured with a default configuration located in /usr/local/etc/influxdb.conf, along with a sample default configuration.
+
+# Original README from the influxdb github:
+
+https://github.com/influxdata/influxdb
+
+# InfluxDB [![CircleCI](https://circleci.com/gh/influxdata/influxdb.svg?style=svg)](https://circleci.com/gh/influxdata/influxdb)
+[![Slack Status](https://img.shields.io/badge/slack-join_chat-white.svg?logo=slack&style=social)](https://www.influxdata.com/slack)
+
+
+InfluxDB is an open source time series platform. This includes APIs for storing and querying data, processing it in the background for ETL or monitoring and alerting purposes, user dashboards, and visualizing and exploring the data and more. The master branch on this repo now represents the latest InfluxDB, which now includes functionality for Kapacitor (background processing) and Chronograf (the UI) all in a single binary.
+
+The list of InfluxDB Client Libraries that are compatible with the latest version can be found in [our documentation](https://v2.docs.influxdata.com/v2.0/reference/api/client-libraries/).
+
+If you are looking for the 1.x line of releases, there are branches for each minor version as well as a `master-1.x` branch that will contain the code for the next 1.x release. The master-1.x [working branch is here](https://github.com/influxdata/influxdb/tree/master-1.x). The [InfluxDB 1.x Go Client can be found here](https://github.com/influxdata/influxdb1-client).
+
+## State of the Project
+
+The latest InfluxDB 1.x is the stable release and recommended for production use. The InfluxDB that is on the master branch is currently in the beta stage. This means that it is still **NOT** recommended for production usage. There may be breaking API changes, breaking changes in the [Flux language](https://github.com/influxdata/flux), changes in the underlying storage format that will require you to delete all your data, and significant changes to the UI. The beta is intended for feature exploration and gathering feedback on the available feature set. It **SHOULD NOT** be used for performance testing, benchmarks, or other stress tests.
+
+Additional features will arrive during the beta period until we reach general availability (GA). We will be cutting versioned releases at least every two weeks starting in the first release. There will also be nightly builds based off the latest code in master.
+
+Once we close on the final feature set of what will be in the first GA release of InfluxDB in the 2.x line, we will move into the release candidate (RC) phase. At that point, we do not expect there to be breaking changes to the API or Flux language. We may still need to make a breaking change prior to GA due to some unforseen circumstance, but it would need to be extremely important and will be clearly communicated via the changelog and all available channels.
+
+Our current plans are to release RCs suitable for production usage, but we will re-evaluate in consultation with the community as the cycle progresses. During the RC period, we will focus on feedback from users, bug fixes, performance, and additive features (where time permits).
+
+### What you can expect in the Beta and RC Phases
+
+#### Beta
+**Releases every two weeks or as needed**
+
+Planned additions include:
+- Compatibility layer with 1.x including: 1.x HTTP Write API  and HTTP Read API support for InfluxQL
+- Import Bulk Data from 1.x - convert TSM from 1.x to 2.x
+- Performance tuning, stability improvements, and fine tuning based on community feedback.
+- Finalization of supported client libraries starting with JavaScript and Go.
+
+#### RC
+**As needed**
+
+Planned activities include:
+- Performance tuning, stability improvements, and fine-tuning based on community feedback.
+
+### What is **NOT** planned?
+- Migration of users/security permissions from InfluxDB v1.x to 2.x.  ACTION REQUIRED: Re-establish users and permissions within the new unified security model which now spans the underlying database and user interface.
+- Migration of Continuous Queries.  ACTION REQUIRED: These will need to be re-implemented as Flux tasks.
+- Direct support by InfluxDB for CollectD, StatsD, Graphite, or UDP.  ACTION REQUIRED: Leverage Telegraf 1.9+ along with the InfluxDB v2.0 output plugin to translate these protocols/formats.
+
+## Installing from Source
+
+We have nightly and weekly versioned Docker images, Debian packages, RPM packages, and tarballs of InfluxDB available at the [InfluxData downloads page](https://portal.influxdata.com/downloads/).
+
+## Building From Source
+
+This project requires Go 1.13 and Go module support.
+
+Set `GO111MODULE=on` or build the project outside of your `GOPATH` for it to succeed.
+
+The project also requires a recent stable version of Rust. We recommend using [rustup](https://rustup.rs/) to install Rust.
+
+If you are getting an `error loading module requirements` error with `bzr executable file not found in $PATH”` on `make`, then you need to ensure you have `bazaar`, `protobuf`, and `yarn` installed.
+
+- OSX: `brew install bazaar yarn`
+- Linux (Arch): `pacman -S bzr protobuf yarn`
+- Linux (Ubuntu): `apt install bzr protobuf-compiler yarnpkg`
+
+**NB:** For RedHat, there are some extra steps:
+
+1. You must enable the [EPEL](https://fedoraproject.org/wiki/EPEL)
+2. You must add the `yarn` [repository](https://yarnpkg.com/lang/en/docs/install/#centos-stable)
+
+For information about modules, please refer to the [wiki](https://github.com/golang/go/wiki/Modules).
+
+A successful `make` run results in two binaries, with platform-dependent paths:
+
+```
+$ make
+...
+env GO111MODULE=on go build -tags 'assets ' -o bin/$(uname -s | tr '[:upper:]' '[:lower:]')/influx ./cmd/influx
+env GO111MODULE=on go build -tags 'assets ' -o bin/$(uname -s | tr '[:upper:]' '[:lower:]')/influxd ./cmd/influxd
+```
+
+`influxd` is the InfluxDB service.
+`influx` is the CLI management tool.
+
+Start the service.
+Logs to stdout by default:
+
+```
+$ bin/$(uname -s | tr '[:upper:]' '[:lower:]')/influxd
+```
+
+## Getting Started
+
+For a complete getting started guide, please see our full [online documentation site](https://v2.docs.influxdata.com/v2.0/). 
+
+To write and query data or use the API in any way, you'll need to first create a user, credentials, organization and bucket.
+Everything in InfluxDB is organized under a concept of an organization. The API is designed to be multi-tenant.
+Buckets represent where you store time series data.
+They're synonymous with what was previously in InfluxDB 1.x a database and retention policy.
+
+The simplest way to get set up is to point your browser to [http://localhost:9999](http://localhost:9999) and go through the prompts.
+
+**Note**: Port 9999 will be used during the beta phases of development of InfluxDB v2.0.
+This should allow a v2.0-beta instance to be run alongside a v1.x instance without interfering on port 8086.
+InfluxDB will thereafter continue to use 8086.
+
+You can also get set up from the CLI using the subcommands `influx user`, `influx auth`, `influx org` and `influx bucket`,
+or do it all in one breath with `influx setup`:
+
+
+```
+$ bin/$(uname -s | tr '[:upper:]' '[:lower:]')/influx setup
+Welcome to InfluxDB 2.0!
+Please type your primary username: marty
+
+Please type your password: 
+
+Please type your password again: 
+
+Please type your primary organization name.: InfluxData
+
+Please type your primary bucket name.: telegraf
+
+Please type your retention period in hours.
+Or press ENTER for infinite.: 72
+
+
+You have entered:
+  Username:          marty
+  Organization:      InfluxData
+  Bucket:            telegraf
+  Retention Period:  72 hrs
+Confirm? (y/n): y
+
+UserID                  Username        Organization    Bucket
+033a3f2c5ccaa000        marty           InfluxData      Telegraf
+Your token has been stored in /Users/marty/.influxdbv2/credentials
+```
+
+You may get into a development loop where `influx setup` becomes tedious.
+Some added flags can help:
+```
+$ bin/$(uname -s | tr '[:upper:]' '[:lower:]')/influx setup --username marty --password F1uxKapacit0r85 --org InfluxData --bucket telegraf --retention 168 --token where-were-going-we-dont-need-roads --force
+```
+
+`~/.influxdbv2/credentials` contains your auth token.
+Most `influx` commands read the token from this file path by default.
+
+You may need the organization ID and bucket ID later:
+
+```
+$ influx org find
+ID                      Name
+033a3f2c708aa000        InfluxData
+```
+
+```
+$ influx bucket find
+ID                      Name            Retention       Organization    OrganizationID
+033a3f2c710aa000        telegraf        72h0m0s         InfluxData      033a3f2c708aa000
+```
+
+Write to measurement `m`, with tag `v=2`, in bucket `telegraf`, which belongs to organization `InfluxData`:
+
+```
+$ bin/$(uname -s | tr '[:upper:]' '[:lower:]')/influx write --org InfluxData --bucket telegraf --precision s "m v=2 $(date +%s)"
+```
+
+Write the same point using `curl`:
+
+```
+curl --header "Authorization: Token $(cat ~/.influxdbv2/credentials)" --data-raw "m v=2 $(date +%s)" "http://localhost:9999/api/v2/write?org=InfluxData&bucket=telegraf&precision=s"
+```
+
+Read that back with a simple Flux query:
+
+```
+$ bin/$(uname -s | tr '[:upper:]' '[:lower:]')/influx query -o InfluxData 'from(bucket:"telegraf") |> range(start:-1h)'
+Result: _result
+Table: keys: [_start, _stop, _field, _measurement]
+                   _start:time                      _stop:time           _field:string     _measurement:string                      _time:time                  _value:float
+------------------------------  ------------------------------  ----------------------  ----------------------  ------------------------------  ----------------------------
+2019-12-30T22:19:39.043918000Z  2019-12-30T23:19:39.043918000Z                       v                       m  2019-12-30T23:17:02.000000000Z                             2
+```
+
+Use the fancy REPL:
+
+```
+$ bin/$(uname -s | tr '[:upper:]' '[:lower:]')/influx repl -o InfluxData
+> from(bucket:"telegraf") |> range(start:-1h)
+Result: _result
+Table: keys: [_start, _stop, _field, _measurement]
+                   _start:time                      _stop:time           _field:string     _measurement:string                      _time:time                  _value:float
+------------------------------  ------------------------------  ----------------------  ----------------------  ------------------------------  ----------------------------
+2019-12-30T22:22:44.776351000Z  2019-12-30T23:22:44.776351000Z                       v                       m  2019-12-30T23:17:02.000000000Z                             2
+>
+```
+
+
+## Introducing Flux
+
+Flux is an MIT-licensed data scripting language (previously named IFQL) used for querying time series data from InfluxDB. The source for Flux is [available on GitHub](https://github.com/influxdata/flux). Learn more about Flux from [CTO Paul Dix's presentation](https://speakerdeck.com/pauldix/flux-number-fluxlang-a-new-time-series-data-scripting-language).
+
+## Contributing to the Project
+
+InfluxDB is an [MIT licensed](LICENSE) open source project and we love our community. The fastest way to get something fixed is to open a PR. Check out our [contributing](CONTRIBUTING.md) guide if you're interested in helping out. Also, join us on our [Community Slack Workspace](https://influxdata.com/slack) if you have questions or comments for our engineering teams.
+
+## CI and Static Analysis
+
+### CI
+
+All pull requests will run through CI, which is currently hosted by Circle.
+Community contributors should be able to see the outcome of this process by looking at the checks on their PR.
+Please fix any issues to ensure a prompt review from members of the team.
+
+The InfluxDB project is used internally in a number of proprietary InfluxData products, and as such, PRs and changes need to be tested internally.
+This can take some time, and is not really visible to community contributors.
+
+### Static Analysis
+
+This project uses the following static analysis tools.
+Failure during the running of any of these tools results in a failed build.
+Generally, code must be adjusted to satisfy these tools, though there are exceptions.
+
+- [go vet](https://golang.org/cmd/vet/) checks for Go code that should be considered incorrect.
+- [go fmt](https://golang.org/cmd/gofmt/) checks that Go code is correctly formatted.
+- [go mod tidy](https://tip.golang.org/cmd/go/#hdr-Add_missing_and_remove_unused_modules) ensures that the source code and go.mod agree.
+- [staticcheck](http://next.staticcheck.io/docs/) checks for things like: unused code, code that can be simplified, code that is incorrect and code that will have performance issues.
+
+### staticcheck
+
+If your PR fails `staticcheck` it is easy to dig into why it failed, and also to fix the problem.
+First, take a look at the error message in Circle under the `staticcheck` build section, e.g.,
+
+```
+tsdb/tsm1/encoding.gen.go:1445:24: func BooleanValues.assertOrdered is unused (U1000)
+tsdb/tsm1/encoding.go:172:7: receiver name should not be an underscore, omit the name if it is unused (ST1006)
+```
+
+Next, go and take a [look here](http://next.staticcheck.io/docs/checks) for some clarification on the error code that you have received, e.g., `U1000`.
+The docs will tell you what's wrong, and often what you need to do to fix the issue.
+
+#### Generated Code
+
+Sometimes generated code will contain unused code or occasionally that will fail a different check.
+`staticcheck` allows for [entire files](http://next.staticcheck.io/docs/#ignoring-problems) to be ignored, though it's not ideal.
+A linter directive, in the form of a comment, must be placed within the generated file.
+This is problematic because it will be erased if the file is re-generated.
+Until a better solution comes about, below is the list of generated files that need an ignores comment.
+If you re-generate a file and find that `staticcheck` has failed, please see this list below for what you need to put back:
+
+|          File          |                             Comment                              |
+| :--------------------: | :--------------------------------------------------------------: |
+| query/promql/promql.go | //lint:file-ignore SA6001 Ignore all unused code, it's generated |
+
+#### End-to-End Tests
+
+CI also runs end-to-end tests. These test the integration between the influx server the ui. You can run them locally in two steps:
+
+- Start the server in "testing mode" by running `make run-e2e`.
+- Run the tests with `make e2e`.
diff --git a/jails/influxdb/update.sh b/jails/influxdb/update.sh
new file mode 100644
index 00000000..a216ec27
--- /dev/null
+++ b/jails/influxdb/update.sh
@@ -0,0 +1,6 @@
+#!/usr/local/bin/bash
+# This file contains the update script for influxdb
+
+iocage exec influxdb service influxd stop
+# InfluxDB is updated during PKG update, this file is mostly just a placeholder
+iocage exec influxdb service influxd restart
\ No newline at end of file

From 77f1589701c3c9ec8e7e031c9ac41dede1090231 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Tue, 7 Apr 2020 01:24:18 +0200
Subject: [PATCH 081/147] Add right packages to example config for *arr

---
 config.yml.example | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config.yml.example b/config.yml.example
index f3404be2..a9fdb1f7 100644
--- a/config.yml.example
+++ b/config.yml.example
@@ -33,13 +33,13 @@ jackett: jackett
   pkgs: mono
  
 radarr: radarr
-  pkgs: mono
+  pkgs: mono mediainfo sqlite3 libgdiplus
  
 sonarr: sonarr
-  pkgs: mono
+  pkgs: mono mediainfo sqlite3
  
 lidarr: lidarr
-  pkgs: mono
+  pkgs: mono mediainfo sqlite3
  
 transmission: transmission
   pkgs: bash unzip unrar transmission

From 3193319d2c91f6c76d3b00dfd6995f2c8b71b4b0 Mon Sep 17 00:00:00 2001
From: Thorsten Behrens <tbehrens@outlook.com>
Date: Mon, 6 Apr 2020 22:27:24 -0400
Subject: [PATCH 082/147] Fixed destroyjails so it can destroy multiple jails.
 Minor formatting cleanup around usage code.

---
 jailman.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/jailman.sh b/jailman.sh
index 57b232cb..c20c433b 100755
--- a/jailman.sh
+++ b/jailman.sh
@@ -46,24 +46,24 @@ while getopts ":i:r:u:d:g:h" opt
             ;;
         u ) updatejails=("$OPTARG")
             until [[ $(eval "echo \${$OPTIND}") =~ ^-.* ]] || [ -z $(eval "echo \${$OPTIND}") ]; do
-                updateljails+=($(eval "echo \${$OPTIND}"))
+                updatejails+=($(eval "echo \${$OPTIND}"))
                 OPTIND=$((OPTIND + 1))
             done
             ;;
         d ) destroyjails=("$OPTARG")
             until [[ $(eval "echo \${$OPTIND}") =~ ^-.* ]] || [ -z $(eval "echo \${$OPTIND}") ]; do
-                deletejails+=($(eval "echo \${$OPTIND}"))
+                destroyjails+=($(eval "echo \${$OPTIND}"))
                 OPTIND=$((OPTIND + 1))
             done
             ;;
-		g ) upgradejails=("$OPTARG")
+	g ) upgradejails=("$OPTARG")
             until [[ $(eval "echo \${$OPTIND}") =~ ^-.* ]] || [ -z $(eval "echo \${$OPTIND}") ]; do
                 upgradejails+=($(eval "echo \${$OPTIND}"))
                 OPTIND=$((OPTIND + 1))
             done
             ;;
-		h ) 
-			echo "Usage:"
+	h ) 
+	    echo "Usage:"
             echo "$0 -i "
             echo "$0 -r "
             echo "$0 -u "
@@ -72,15 +72,15 @@ while getopts ":i:r:u:d:g:h" opt
             echo ""
             echo "   -i to install jails, listed by name, space seperated like this: jackett plex sonarr"
             echo "   -r to reinstall jails, listed by name, space seperated like this: jackett plex sonarr"
-			echo "   -u to update jails, listed by name, space seperated like this: jackett plex sonarr"
+            echo "   -u to update jails, listed by name, space seperated like this: jackett plex sonarr"
             echo "   -d to destroy jails, listed by name, space seperated like this: jackett plex sonarrt"
             echo "   -g to upgrade jails, listed by name, space seperated like this: jackett plex sonarr"
             echo "   -h help (this output)"
-			exit 0
+            exit 0
+            ;;
+	? ) echo "Error: Invalid option was specified -$OPTARG"
+            exit 0
             ;;
-		? ) echo "Error: Invalid option was specified -$OPTARG"
-			exit 0
-			;;
      esac
 done
 

From 839abbe8ff73baed2e0c1e53b763b1a3d468211a Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Mon, 6 Apr 2020 23:40:09 +0200
Subject: [PATCH 083/147] Add restart warning after update

---
 global.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/global.sh b/global.sh
index f59ca2b6..1c01e980 100755
--- a/global.sh
+++ b/global.sh
@@ -31,7 +31,7 @@ then
     git reset --hard
     git checkout $1
     git pull
-    echo "script updated"
+    echo "script updated, please restart the script manually"
     exit 1
 else
     echo "script up-to-date"

From b24a7c153a1ea0e7c4675889cc5f0373ae2dddff Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Tue, 7 Apr 2020 13:28:51 +0200
Subject: [PATCH 084/147] Add central ports mount for all jails (#58)

* Add central ports mount for all jails, auto fetch, extract and auto update on install.

* Some verbosity cleanup
---
 global.sh                  | 8 ++++++++
 jails/nextcloud/install.sh | 7 -------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/global.sh b/global.sh
index 1c01e980..d8cae689 100755
--- a/global.sh
+++ b/global.sh
@@ -88,6 +88,14 @@ else
 	createmount $1 ${global_dataset_config}
 	createmount $1 ${global_dataset_config}/$1 /config
 	
+	# Create and Mount portsnap
+	echo "Mounting and fetching ports"
+	createmount $1 ${global_dataset_config}/portsnap
+	createmount $1 ${global_dataset_config}/portsnap/db /var/db/portsnap
+	createmount $1 ${global_dataset_config}/portsnap/ports /usr/ports
+	
+	iocage exec "$1" "if [ -z /usr/ports ]; then portsnap fetch extract; else portsnap auto; fi"
+	
 	echo "Jail creation completed for $1"
 fi	
 	
diff --git a/jails/nextcloud/install.sh b/jails/nextcloud/install.sh
index 73738743..ce825510 100755
--- a/jails/nextcloud/install.sh
+++ b/jails/nextcloud/install.sh
@@ -134,11 +134,6 @@ fi
 #
 #####
 
-# Create and Mount portsnap
-createmount ${JAIL_NAME} ${global_dataset_config}/portsnap
-createmount ${JAIL_NAME} ${global_dataset_config}/portsnap/db /var/db/portsnap
-createmount ${JAIL_NAME} ${global_dataset_config}/portsnap/ports /usr/ports
-
 # Create and Mount Nextcloud, Config and Files
 createmount ${JAIL_NAME} ${global_dataset_config}/${JAIL_NAME}/config /usr/local/www/nextcloud/config
 createmount ${JAIL_NAME} ${global_dataset_config}/${JAIL_NAME}/themes /usr/local/www/nextcloud/themes
@@ -159,8 +154,6 @@ iocage exec "${JAIL_NAME}" chmod -R 770 /config/files
 #
 #####
 
-iocage exec "${JAIL_NAME}" "if [ -z /usr/ports ]; then portsnap fetch extract; else portsnap auto; fi"
-
 if [ "${DATABASE}" = "mariadb-external" ] || [ "${DATABASE}" = "mariadb-jail" ]; then
   iocage exec "${JAIL_NAME}" pkg install -qy mariadb103-client php73-pdo_mysql php73-mysqli
 elif [ "${DATABASE}" = "pgsql-external" ]; then

From 520597485a50064f33eabfdf5ad76b9e8d329ede Mon Sep 17 00:00:00 2001
From: Thorsten Behrens <tbehrens@outlook.com>
Date: Fri, 10 Apr 2020 07:20:17 -0400
Subject: [PATCH 085/147] Changed jail creation to always create base jails
 (#57)

---
 global.sh                | 4 ++--
 jails/jackett/install.sh | 1 -
 jails/lidarr/install.sh  | 3 +--
 jails/radarr/install.sh  | 3 +--
 jails/sonarr/install.sh  | 3 +--
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/global.sh b/global.sh
index d8cae689..13458a39 100755
--- a/global.sh
+++ b/global.sh
@@ -68,13 +68,13 @@ else
 	echo '{"pkgs":['${pkgs}']}' > /tmp/pkg.json
 	if [ "${setdhcp}" == "on" ]
 	then
-		if ! iocage create -n "${1}" -p /tmp/pkg.json -r ${global_jails_version} interfaces="${jailinterfaces}" dhcp="on" vnet="on" allow_raw_sockets="1" boot="on"
+		if ! iocage create -n "${1}" -p /tmp/pkg.json -r ${global_jails_version} interfaces="${jailinterfaces}" dhcp="on" vnet="on" allow_raw_sockets="1" boot="on" -b
 		then
 			echo "Failed to create jail"
 			exit 1
 		fi
 	else
-		if ! iocage create -n "${1}" -p /tmp/pkg.json -r ${global_jails_version} interfaces="${jailinterfaces}" ip4_addr="vnet0|${!jailip4}" defaultrouter="${!jailgateway}" vnet="on" allow_raw_sockets="1" boot="on"
+		if ! iocage create -n "${1}" -p /tmp/pkg.json -r ${global_jails_version} interfaces="${jailinterfaces}" ip4_addr="vnet0|${!jailip4}" defaultrouter="${!jailgateway}" vnet="on" allow_raw_sockets="1" boot="on" -b
 		then
 			echo "Failed to create jail"
 			exit 1
diff --git a/jails/jackett/install.sh b/jails/jackett/install.sh
index 3af8a978..60115ab8 100755
--- a/jails/jackett/install.sh
+++ b/jails/jackett/install.sh
@@ -1,7 +1,6 @@
 #!/usr/local/bin/bash
 # This file contains the install script for jackett
 
-iocage exec jackett ln -s /usr/local/bin/mono /usr/bin/mono
 iocage exec jackett "fetch https://github.com/Jackett/Jackett/releases/download/v0.11.502/Jackett.Binaries.Mono.tar.gz -o /usr/local/share"
 iocage exec jackett "tar -xzvf /usr/local/share/Jackett.Binaries.Mono.tar.gz -C /usr/local/share"
 iocage exec jackett rm /usr/local/share/Jackett.Binaries.Mono.tar.gz
diff --git a/jails/lidarr/install.sh b/jails/lidarr/install.sh
index 8fe19d76..f9308024 100755
--- a/jails/lidarr/install.sh
+++ b/jails/lidarr/install.sh
@@ -10,7 +10,6 @@ createmount lidarr ${global_dataset_media}
 createmount lidarr ${global_dataset_media}/music /mnt/music
 
 
-iocage exec lidarr ln -s /usr/local/bin/mono /usr/bin/mono
 iocage exec lidarr "fetch https://github.com/lidarr/Lidarr/releases/download/v0.2.0.371/Lidarr.develop.0.2.0.371.linux.tar.gz -o /usr/local/share"
 iocage exec lidarr "tar -xzvf /usr/local/share/Lidarr.develop.0.2.0.371.linux.tar.gz -C /usr/local/share"
 iocage exec lidarr "rm /usr/local/share/Lidarr.develop.0.2.0.371.linux.tar.gz"
@@ -20,4 +19,4 @@ iocage exec lidarr mkdir /usr/local/etc/rc.d
 cp ${SCRIPT_DIR}/jails/lidarr/includes/lidarr.rc /mnt/${global_dataset_iocage}/jails/lidarr/root/usr/local/etc/rc.d/lidarr
 iocage exec lidarr chmod u+x /usr/local/etc/rc.d/lidarr
 iocage exec lidarr sysrc "lidarr_enable=YES"
-iocage exec lidarr service lidarr start
\ No newline at end of file
+iocage exec lidarr service lidarr start
diff --git a/jails/radarr/install.sh b/jails/radarr/install.sh
index 1d71fb94..06e6e1f0 100755
--- a/jails/radarr/install.sh
+++ b/jails/radarr/install.sh
@@ -9,7 +9,6 @@ createmount radarr ${global_dataset_downloads}/complete /mnt/fetched
 createmount radarr ${global_dataset_media}
 createmount radarr ${global_dataset_media}/movies /mnt/movies
 
-iocage exec radarr ln -s /usr/local/bin/mono /usr/bin/mono
 iocage exec radarr "fetch https://github.com/Radarr/Radarr/releases/download/v0.2.0.1480/Radarr.develop.0.2.0.1480.linux.tar.gz -o /usr/local/share"
 iocage exec radarr "tar -xzvf /usr/local/share/Radarr.develop.0.2.0.1480.linux.tar.gz -C /usr/local/share"
 iocage exec radarr rm /usr/local/share/Radarr.develop.0.2.0.1480.linux.tar.gz
@@ -19,4 +18,4 @@ iocage exec radarr mkdir /usr/local/etc/rc.d
 cp ${SCRIPT_DIR}/jails/radarr/includes/radarr.rc /mnt/${global_dataset_iocage}/jails/radarr/root/usr/local/etc/rc.d/radarr
 iocage exec radarr chmod u+x /usr/local/etc/rc.d/radarr
 iocage exec radarr sysrc "radarr_enable=YES"
-iocage exec radarr service radarr restart
\ No newline at end of file
+iocage exec radarr service radarr restart
diff --git a/jails/sonarr/install.sh b/jails/sonarr/install.sh
index 7e28487a..ccc2048e 100755
--- a/jails/sonarr/install.sh
+++ b/jails/sonarr/install.sh
@@ -9,7 +9,6 @@ createmount sonarr ${global_dataset_downloads}/complete /mnt/fetched
 createmount sonarr ${global_dataset_media}
 createmount sonarr ${global_dataset_media}/shows /mnt/shows
 
-iocage exec sonarr ln -s /usr/local/bin/mono /usr/bin/mono
 iocage exec sonarr "fetch http://download.sonarr.tv/v2/master/mono/NzbDrone.master.tar.gz -o /usr/local/share"
 iocage exec sonarr "tar -xzvf /usr/local/share/NzbDrone.master.tar.gz -C /usr/local/share"
 iocage exec sonarr rm /usr/local/share/NzbDrone.master.tar.gz
@@ -19,4 +18,4 @@ iocage exec sonarr mkdir /usr/local/etc/rc.d
 cp ${SCRIPT_DIR}/jails/sonarr/includes/sonarr.rc /mnt/${global_dataset_iocage}/jails/sonarr/root/usr/local/etc/rc.d/sonarr
 iocage exec sonarr chmod u+x /usr/local/etc/rc.d/sonarr
 iocage exec sonarr sysrc "sonarr_enable=YES"
-iocage exec sonarr service sonarr restart
\ No newline at end of file
+iocage exec sonarr service sonarr restart

From 11b66e9711950e2c455f98ca2cce84b727650eeb Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sat, 14 Mar 2020 00:06:09 +0100
Subject: [PATCH 086/147] fix persistence, update readme

---
 jails/influxdb/includes/influxd.conf | 586 +++++++++++++++++++++++++++
 jails/influxdb/install.sh            |  29 +-
 jails/influxdb/readme.md             |   2 -
 3 files changed, 599 insertions(+), 18 deletions(-)
 create mode 100644 jails/influxdb/includes/influxd.conf

diff --git a/jails/influxdb/includes/influxd.conf b/jails/influxdb/includes/influxd.conf
new file mode 100644
index 00000000..fb0f9fa1
--- /dev/null
+++ b/jails/influxdb/includes/influxd.conf
@@ -0,0 +1,586 @@
+### Welcome to the InfluxDB configuration file.
+
+# The values in this file override the default values used by the system if
+# a config option is not specified. The commented out lines are the configuration
+# field and the default value used. Uncommenting a line and changing the value
+# will change the value used at runtime when the process is restarted.
+
+# Once every 24 hours InfluxDB will report usage data to usage.influxdata.com
+# The data includes a random ID, os, arch, version, the number of series and other
+# usage data. No data from user databases is ever transmitted.
+# Change this option to true to disable reporting.
+# reporting-disabled = false
+
+# Bind address to use for the RPC service for backup and restore.
+# bind-address = "127.0.0.1:8088"
+
+###
+### [meta]
+###
+### Controls the parameters for the Raft consensus group that stores metadata
+### about the InfluxDB cluster.
+###
+
+[meta]
+  # Where the metadata/raft database is stored
+  dir = "/config/db/meta"
+
+  # Automatically create a default retention policy when creating a database.
+  # retention-autocreate = true
+
+  # If log messages are printed for the meta service
+  # logging-enabled = true
+
+###
+### [data]
+###
+### Controls where the actual shard data for InfluxDB lives and how it is
+### flushed from the WAL. "dir" may need to be changed to a suitable place
+### for your system, but the WAL settings are an advanced configuration. The
+### defaults should work for most systems.
+###
+
+[data]
+  # The directory where the TSM storage engine stores TSM files.
+  dir = "/config/db/data"
+
+  # The directory where the TSM storage engine stores WAL files.
+  wal-dir = "/config/db/wal"
+
+  # The amount of time that a write will wait before fsyncing.  A duration
+  # greater than 0 can be used to batch up multiple fsync calls.  This is useful for slower
+  # disks or when WAL write contention is seen.  A value of 0s fsyncs every write to the WAL.
+  # Values in the range of 0-100ms are recommended for non-SSD disks.
+  # wal-fsync-delay = "0s"
+
+
+  # The type of shard index to use for new shards.  The default is an in-memory index that is
+  # recreated at startup.  A value of "tsi1" will use a disk based index that supports higher
+  # cardinality datasets.
+  # index-version = "inmem"
+
+  # Trace logging provides more verbose output around the tsm engine. Turning
+  # this on can provide more useful output for debugging tsm engine issues.
+  # trace-logging-enabled = false
+
+  # Whether queries should be logged before execution. Very useful for troubleshooting, but will
+  # log any sensitive data contained within a query.
+  # query-log-enabled = true
+
+  # Validates incoming writes to ensure keys only have valid unicode characters.
+  # This setting will incur a small overhead because every key must be checked.
+  # validate-keys = false
+
+  # Settings for the TSM engine
+
+  # CacheMaxMemorySize is the maximum size a shard's cache can
+  # reach before it starts rejecting writes.
+  # Valid size suffixes are k, m, or g (case insensitive, 1024 = 1k).
+  # Values without a size suffix are in bytes.
+  # cache-max-memory-size = "1g"
+
+  # CacheSnapshotMemorySize is the size at which the engine will
+  # snapshot the cache and write it to a TSM file, freeing up memory
+  # Valid size suffixes are k, m, or g (case insensitive, 1024 = 1k).
+  # Values without a size suffix are in bytes.
+  # cache-snapshot-memory-size = "25m"
+
+  # CacheSnapshotWriteColdDuration is the length of time at
+  # which the engine will snapshot the cache and write it to
+  # a new TSM file if the shard hasn't received writes or deletes
+  # cache-snapshot-write-cold-duration = "10m"
+
+  # CompactFullWriteColdDuration is the duration at which the engine
+  # will compact all TSM files in a shard if it hasn't received a
+  # write or delete
+  # compact-full-write-cold-duration = "4h"
+
+  # The maximum number of concurrent full and level compactions that can run at one time.  A
+  # value of 0 results in 50% of runtime.GOMAXPROCS(0) used at runtime.  Any number greater
+  # than 0 limits compactions to that value.  This setting does not apply
+  # to cache snapshotting.
+  # max-concurrent-compactions = 0
+
+  # CompactThroughput is the rate limit in bytes per second that we
+  # will allow TSM compactions to write to disk. Note that short bursts are allowed
+  # to happen at a possibly larger value, set by CompactThroughputBurst
+  # compact-throughput = "48m"
+
+  # CompactThroughputBurst is the rate limit in bytes per second that we
+  # will allow TSM compactions to write to disk.
+  # compact-throughput-burst = "48m"
+
+  # If true, then the mmap advise value MADV_WILLNEED will be provided to the kernel with respect to
+  # TSM files. This setting has been found to be problematic on some kernels, and defaults to off.
+  # It might help users who have slow disks in some cases.
+  # tsm-use-madv-willneed = false
+
+  # Settings for the inmem index
+
+  # The maximum series allowed per database before writes are dropped.  This limit can prevent
+  # high cardinality issues at the database level.  This limit can be disabled by setting it to
+  # 0.
+  # max-series-per-database = 1000000
+
+  # The maximum number of tag values per tag that are allowed before writes are dropped.  This limit
+  # can prevent high cardinality tag values from being written to a measurement.  This limit can be
+  # disabled by setting it to 0.
+  # max-values-per-tag = 100000
+
+  # Settings for the tsi1 index
+
+  # The threshold, in bytes, when an index write-ahead log file will compact
+  # into an index file. Lower sizes will cause log files to be compacted more
+  # quickly and result in lower heap usage at the expense of write throughput.
+  # Higher sizes will be compacted less frequently, store more series in-memory,
+  # and provide higher write throughput.
+  # Valid size suffixes are k, m, or g (case insensitive, 1024 = 1k).
+  # Values without a size suffix are in bytes.
+  # max-index-log-file-size = "1m"
+
+  # The size of the internal cache used in the TSI index to store previously 
+  # calculated series results. Cached results will be returned quickly from the cache rather
+  # than needing to be recalculated when a subsequent query with a matching tag key/value 
+  # predicate is executed. Setting this value to 0 will disable the cache, which may
+  # lead to query performance issues.
+  # This value should only be increased if it is known that the set of regularly used 
+  # tag key/value predicates across all measurements for a database is larger than 100. An
+  # increase in cache size may lead to an increase in heap usage.
+  series-id-set-cache-size = 100
+
+###
+### [coordinator]
+###
+### Controls the clustering service configuration.
+###
+
+[coordinator]
+  # The default time a write request will wait until a "timeout" error is returned to the caller.
+  # write-timeout = "10s"
+
+  # The maximum number of concurrent queries allowed to be executing at one time.  If a query is
+  # executed and exceeds this limit, an error is returned to the caller.  This limit can be disabled
+  # by setting it to 0.
+  # max-concurrent-queries = 0
+
+  # The maximum time a query will is allowed to execute before being killed by the system.  This limit
+  # can help prevent run away queries.  Setting the value to 0 disables the limit.
+  # query-timeout = "0s"
+
+  # The time threshold when a query will be logged as a slow query.  This limit can be set to help
+  # discover slow or resource intensive queries.  Setting the value to 0 disables the slow query logging.
+  # log-queries-after = "0s"
+
+  # The maximum number of points a SELECT can process.  A value of 0 will make
+  # the maximum point count unlimited.  This will only be checked every second so queries will not
+  # be aborted immediately when hitting the limit.
+  # max-select-point = 0
+
+  # The maximum number of series a SELECT can run.  A value of 0 will make the maximum series
+  # count unlimited.
+  # max-select-series = 0
+
+  # The maximum number of group by time bucket a SELECT can create.  A value of zero will max the maximum
+  # number of buckets unlimited.
+  # max-select-buckets = 0
+
+###
+### [retention]
+###
+### Controls the enforcement of retention policies for evicting old data.
+###
+
+[retention]
+  # Determines whether retention policy enforcement enabled.
+  # enabled = true
+
+  # The interval of time when retention policy enforcement checks run.
+  # check-interval = "30m"
+
+###
+### [shard-precreation]
+###
+### Controls the precreation of shards, so they are available before data arrives.
+### Only shards that, after creation, will have both a start- and end-time in the
+### future, will ever be created. Shards are never precreated that would be wholly
+### or partially in the past.
+
+[shard-precreation]
+  # Determines whether shard pre-creation service is enabled.
+  # enabled = true
+
+  # The interval of time when the check to pre-create new shards runs.
+  # check-interval = "10m"
+
+  # The default period ahead of the endtime of a shard group that its successor
+  # group is created.
+  # advance-period = "30m"
+
+###
+### Controls the system self-monitoring, statistics and diagnostics.
+###
+### The internal database for monitoring data is created automatically if
+### if it does not already exist. The target retention within this database
+### is called 'monitor' and is also created with a retention period of 7 days
+### and a replication factor of 1, if it does not exist. In all cases the
+### this retention policy is configured as the default for the database.
+
+[monitor]
+  # Whether to record statistics internally.
+  # store-enabled = true
+
+  # The destination database for recorded statistics
+  # store-database = "_internal"
+
+  # The interval at which to record statistics
+  # store-interval = "10s"
+
+###
+### [http]
+###
+### Controls how the HTTP endpoints are configured. These are the primary
+### mechanism for getting data into and out of InfluxDB.
+###
+
+[http]
+  # Determines whether HTTP endpoint is enabled.
+  # enabled = true
+
+  # Determines whether the Flux query endpoint is enabled.
+  # flux-enabled = false
+
+  # Determines whether the Flux query logging is enabled.
+  # flux-log-enabled = false
+
+  # The bind address used by the HTTP service.
+  # bind-address = ":8086"
+
+  # Determines whether user authentication is enabled over HTTP/HTTPS.
+  # auth-enabled = false
+
+  # The default realm sent back when issuing a basic auth challenge.
+  # realm = "InfluxDB"
+
+  # Determines whether HTTP request logging is enabled.
+  # log-enabled = true
+
+  # Determines whether the HTTP write request logs should be suppressed when the log is enabled.
+  # suppress-write-log = false
+
+  # When HTTP request logging is enabled, this option specifies the path where
+  # log entries should be written. If unspecified, the default is to write to stderr, which
+  # intermingles HTTP logs with internal InfluxDB logging.
+  #
+  # If influxd is unable to access the specified path, it will log an error and fall back to writing
+  # the request log to stderr.
+  # access-log-path = ""
+
+  # Filters which requests should be logged. Each filter is of the pattern NNN, NNX, or NXX where N is
+  # a number and X is a wildcard for any number. To filter all 5xx responses, use the string 5xx.
+  # If multiple filters are used, then only one has to match. The default is to have no filters which
+  # will cause every request to be printed.
+  # access-log-status-filters = []
+
+  # Determines whether detailed write logging is enabled.
+  # write-tracing = false
+
+  # Determines whether the pprof endpoint is enabled.  This endpoint is used for
+  # troubleshooting and monitoring.
+  # pprof-enabled = true
+
+  # Enables authentication on pprof endpoints. Users will need admin permissions
+  # to access the pprof endpoints when this setting is enabled. This setting has
+  # no effect if either auth-enabled or pprof-enabled are set to false.
+  # pprof-auth-enabled = false
+
+  # Enables a pprof endpoint that binds to localhost:6060 immediately on startup.
+  # This is only needed to debug startup issues.
+  # debug-pprof-enabled = false
+
+  # Enables authentication on the /ping, /metrics, and deprecated /status
+  # endpoints. This setting has no effect if auth-enabled is set to false.
+  # ping-auth-enabled = false
+
+  # Determines whether HTTPS is enabled.
+  # https-enabled = false
+
+  # The SSL certificate to use when HTTPS is enabled.
+  # https-certificate = "/config/ssl/influxdb.pem"
+
+  # Use a separate private key location.
+  # https-private-key = ""
+
+  # The JWT auth shared secret to validate requests using JSON web tokens.
+  # shared-secret = ""
+
+  # The default chunk size for result sets that should be chunked.
+  # max-row-limit = 0
+
+  # The maximum number of HTTP connections that may be open at once.  New connections that
+  # would exceed this limit are dropped.  Setting this value to 0 disables the limit.
+  # max-connection-limit = 0
+
+  # Enable http service over unix domain socket
+  # unix-socket-enabled = false
+
+  # The path of the unix domain socket.
+  # bind-socket = "/var/run/influxdb.sock"
+
+  # The maximum size of a client request body, in bytes. Setting this value to 0 disables the limit.
+  # max-body-size = 25000000
+
+  # The maximum number of writes processed concurrently.
+  # Setting this to 0 disables the limit.
+  # max-concurrent-write-limit = 0
+
+  # The maximum number of writes queued for processing.
+  # Setting this to 0 disables the limit.
+  # max-enqueued-write-limit = 0
+
+  # The maximum duration for a write to wait in the queue to be processed.
+  # Setting this to 0 or setting max-concurrent-write-limit to 0 disables the limit.
+  # enqueued-write-timeout = 0
+
+###
+### [logging]
+###
+### Controls how the logger emits logs to the output.
+###
+
+[logging]
+  # Determines which log encoder to use for logs. Available options
+  # are auto, logfmt, and json. auto will use a more a more user-friendly
+  # output format if the output terminal is a TTY, but the format is not as
+  # easily machine-readable. When the output is a non-TTY, auto will use
+  # logfmt.
+  # format = "auto"
+
+  # Determines which level of logs will be emitted. The available levels
+  # are error, warn, info, and debug. Logs that are equal to or above the
+  # specified level will be emitted.
+  # level = "info"
+
+  # Suppresses the logo output that is printed when the program is started.
+  # The logo is always suppressed if STDOUT is not a TTY.
+  # suppress-logo = false
+
+###
+### [subscriber]
+###
+### Controls the subscriptions, which can be used to fork a copy of all data
+### received by the InfluxDB host.
+###
+
+[subscriber]
+  # Determines whether the subscriber service is enabled.
+  # enabled = true
+
+  # The default timeout for HTTP writes to subscribers.
+  # http-timeout = "30s"
+
+  # Allows insecure HTTPS connections to subscribers.  This is useful when testing with self-
+  # signed certificates.
+  # insecure-skip-verify = false
+
+  # The path to the PEM encoded CA certs file. If the empty string, the default system certs will be used
+  # ca-certs = ""
+
+  # The number of writer goroutines processing the write channel.
+  # write-concurrency = 40
+
+  # The number of in-flight writes buffered in the write channel.
+  # write-buffer-size = 1000
+
+
+###
+### [[graphite]]
+###
+### Controls one or many listeners for Graphite data.
+###
+
+[[graphite]]
+  # Determines whether the graphite endpoint is enabled.
+  # enabled = false
+  # database = "graphite"
+  # retention-policy = ""
+  # bind-address = ":2003"
+  # protocol = "tcp"
+  # consistency-level = "one"
+
+  # These next lines control how batching works. You should have this enabled
+  # otherwise you could get dropped metrics or poor performance. Batching
+  # will buffer points in memory if you have many coming in.
+
+  # Flush if this many points get buffered
+  # batch-size = 5000
+
+  # number of batches that may be pending in memory
+  # batch-pending = 10
+
+  # Flush at least this often even if we haven't hit buffer limit
+  # batch-timeout = "1s"
+
+  # UDP Read buffer size, 0 means OS default. UDP listener will fail if set above OS max.
+  # udp-read-buffer = 0
+
+  ### This string joins multiple matching 'measurement' values providing more control over the final measurement name.
+  # separator = "."
+
+  ### Default tags that will be added to all metrics.  These can be overridden at the template level
+  ### or by tags extracted from metric
+  # tags = ["region=us-east", "zone=1c"]
+
+  ### Each template line requires a template pattern.  It can have an optional
+  ### filter before the template and separated by spaces.  It can also have optional extra
+  ### tags following the template.  Multiple tags should be separated by commas and no spaces
+  ### similar to the line protocol format.  There can be only one default template.
+  # templates = [
+  #   "*.app env.service.resource.measurement",
+  #   # Default template
+  #   "server.*",
+  # ]
+
+###
+### [collectd]
+###
+### Controls one or many listeners for collectd data.
+###
+
+[[collectd]]
+  # enabled = false
+  # bind-address = ":25826"
+  # database = "collectd"
+  # retention-policy = ""
+  #
+  # The collectd service supports either scanning a directory for multiple types
+  # db files, or specifying a single db file.
+  # typesdb = "/usr/local/share/collectd"
+  #
+  # security-level = "none"
+  # auth-file = "/etc/collectd/auth_file"
+
+  # These next lines control how batching works. You should have this enabled
+  # otherwise you could get dropped metrics or poor performance. Batching
+  # will buffer points in memory if you have many coming in.
+
+  # Flush if this many points get buffered
+  # batch-size = 5000
+
+  # Number of batches that may be pending in memory
+  # batch-pending = 10
+
+  # Flush at least this often even if we haven't hit buffer limit
+  # batch-timeout = "10s"
+
+  # UDP Read buffer size, 0 means OS default. UDP listener will fail if set above OS max.
+  # read-buffer = 0
+
+  # Multi-value plugins can be handled two ways.
+  # "split" will parse and store the multi-value plugin data into separate measurements
+  # "join" will parse and store the multi-value plugin as a single multi-value measurement.
+  # "split" is the default behavior for backward compatibility with previous versions of influxdb.
+  # parse-multivalue-plugin = "split"
+###
+### [opentsdb]
+###
+### Controls one or many listeners for OpenTSDB data.
+###
+
+[[opentsdb]]
+  # enabled = false
+  # bind-address = ":4242"
+  # database = "opentsdb"
+  # retention-policy = ""
+  # consistency-level = "one"
+  # tls-enabled = false
+  # certificate= "/config/ssl/influxdb.pem"
+
+  # Log an error for every malformed point.
+  # log-point-errors = true
+
+  # These next lines control how batching works. You should have this enabled
+  # otherwise you could get dropped metrics or poor performance. Only points
+  # metrics received over the telnet protocol undergo batching.
+
+  # Flush if this many points get buffered
+  # batch-size = 1000
+
+  # Number of batches that may be pending in memory
+  # batch-pending = 5
+
+  # Flush at least this often even if we haven't hit buffer limit
+  # batch-timeout = "1s"
+
+###
+### [[udp]]
+###
+### Controls the listeners for InfluxDB line protocol data via UDP.
+###
+
+[[udp]]
+  # enabled = false
+  # bind-address = ":8089"
+  # database = "udp"
+  # retention-policy = ""
+
+  # InfluxDB precision for timestamps on received points ("" or "n", "u", "ms", "s", "m", "h")
+  # precision = ""
+
+  # These next lines control how batching works. You should have this enabled
+  # otherwise you could get dropped metrics or poor performance. Batching
+  # will buffer points in memory if you have many coming in.
+
+  # Flush if this many points get buffered
+  # batch-size = 5000
+
+  # Number of batches that may be pending in memory
+  # batch-pending = 10
+
+  # Will flush at least this often even if we haven't hit buffer limit
+  # batch-timeout = "1s"
+
+  # UDP Read buffer size, 0 means OS default. UDP listener will fail if set above OS max.
+  # read-buffer = 0
+
+###
+### [continuous_queries]
+###
+### Controls how continuous queries are run within InfluxDB.
+###
+
+[continuous_queries]
+  # Determines whether the continuous query service is enabled.
+  # enabled = true
+
+  # Controls whether queries are logged when executed by the CQ service.
+  # log-enabled = true
+
+  # Controls whether queries are logged to the self-monitoring data store.
+  # query-stats-enabled = false
+
+  # interval for how often continuous queries will be checked if they need to run
+  # run-interval = "1s"
+
+###
+### [tls]
+###
+### Global configuration settings for TLS in InfluxDB.
+###
+
+[tls]
+  # Determines the available set of cipher suites. See https://golang.org/pkg/crypto/tls/#pkg-constants
+  # for a list of available ciphers, which depends on the version of Go (use the query
+  # SHOW DIAGNOSTICS to see the version of Go used to build InfluxDB). If not specified, uses
+  # the default settings from Go's crypto/tls package.
+  # ciphers = [
+  #   "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305",
+  #   "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
+  # ]
+
+  # Minimum version of the tls protocol that will be negotiated. If not specified, uses the
+  # default settings from Go's crypto/tls package.
+  # min-version = "tls1.2"
+
+  # Maximum version of the tls protocol that will be negotiated. If not specified, uses the
+  # default settings from Go's crypto/tls package.
+  # max-version = "tls1.2"
diff --git a/jails/influxdb/install.sh b/jails/influxdb/install.sh
index 7efdff7b..a1104a97 100755
--- a/jails/influxdb/install.sh
+++ b/jails/influxdb/install.sh
@@ -7,40 +7,37 @@
 #
 #####
 
-# Initialise defaults
+# Initialise variables
 JAIL_NAME="influxdb"
 JAIL_IP="$(sed 's|\(.*\)/.*|\1|' <<<"${influxdb_ip4_addr}" )"
 INCLUDES_PATH="${SCRIPT_DIR}/jails/influxdb/includes"
 DATABASE=${influxdb_database}
 
-# Enable influxdb
+# Mount and configure proper configuration location
+cp -rf "${INCLUDES_PATH}/influxd.conf" "/mnt/${global_dataset_config}/${JAIL_NAME}/influxd.conf"
+iocage exec "${JAIL_NAME}" mkdir -p /config/db/data /config/db/meta /config/db/wal
+iocage exec "${JAIL_NAME}" chown -R influxd:influxd /config/db
+iocage exec "${JAIL_NAME}" sysrc influxd_conf="/config/influxd.conf"
 iocage exec "${JAIL_NAME}" sysrc influxd_enable="YES"
 
-# Copy and edit pre-written config files
-echo "Copying default config file"
-iocage exec ${JAIL_NAME} mkdir -p /usr/local/etc
-cp ${INCLUDES_PATH}/influxdb.conf /mnt/${GLOBAL_DATASET_IOCAGE}/jails/${JAIL_NAME}/root/usr/local/etc/
-
 # Start influxdb and wait for it to startup
 iocage exec "${JAIL_NAME}" service influxd start
 sleep 15
 
 # Create database and restart
-iocage exec "${JAIL_NAME}" "curl -i -XPOST http://localhost:8086/query --data-urlencode 'q=CREATE DATABASE ${DATABASE}'"
-iocage exec "${JAIL_NAME}" service influxd restart
-	
-# Don't need /mnt/includes any more, so unmount it
-iocage fstab -r "${JAIL_NAME}" "${INCLUDES_PATH}" /mnt/includes nullfs rw 0 0
+if iocage exec "${JAIL_NAME}" curl -XPOST http://localhost:8086/query --data-urlencode "q=CREATE DATABASE ${DATABASE}"; then
+  echo "Database created."
+else 
+  echo "Database creation failed. Please attempt to create the database manually."
+  exit 1
+fi
 
 # Done!
 echo "Installation complete!"
+echo "Your may connect InfluxDB plugins to the InfluxDB jail at http://${JAIL_IP}:8086."
 echo "You may connect InfluxDB plugins to the InfluxDB jail at http://${JAIL_IP}:8086."
 echo ""
 echo "Database Information"
 echo "--------------------"
 echo "Database = ${DATABASE} at http://${JAIL_IP}:8086."
-echo ""
-echo "Configuration Information"
-echo "-------------------------"
-echo "The configuration file is located at /usr/local/etc/influxdb.conf"
 echo ""
\ No newline at end of file
diff --git a/jails/influxdb/readme.md b/jails/influxdb/readme.md
index 588bfbfe..446c9c9f 100644
--- a/jails/influxdb/readme.md
+++ b/jails/influxdb/readme.md
@@ -1,5 +1,3 @@
-** Note: This jail is configured with a default configuration located in /usr/local/etc/influxdb.conf, along with a sample default configuration.
-
 # Original README from the influxdb github:
 
 https://github.com/influxdata/influxdb

From 52509f9912eda15b1ed0a256bd019ffdd4276645 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sat, 25 Apr 2020 15:41:39 +0200
Subject: [PATCH 087/147] Jail-Specific config.yml (#61)

* - Move pkgs to per-jail config file
- Remove pkgs from main example-config file
- edit gitignore to include jail config files

* prototype for loop to grab jail configs

* update *arr pkgs
---
 .gitignore                    |  2 +-
 config.yml.example            | 30 ------------------------------
 jailman.sh                    |  1 +
 jails/bitwarden/config.yml    |  2 ++
 jails/influxdb/config.yml     |  2 ++
 jails/jackett/config.yml      |  2 ++
 jails/kms/config.yml          |  2 ++
 jails/lidarr/config.yml       |  2 ++
 jails/mariadb/config.yml      |  2 ++
 jails/nextcloud/config.yml    |  2 ++
 jails/organizr/config.yml     |  2 ++
 jails/plex/config.yml         |  2 ++
 jails/radarr/config.yml       |  2 ++
 jails/sonarr/config.yml       |  2 ++
 jails/tautulli/config.yml     |  2 ++
 jails/transmission/config.yml |  2 ++
 16 files changed, 28 insertions(+), 31 deletions(-)
 create mode 100644 jails/bitwarden/config.yml
 create mode 100644 jails/influxdb/config.yml
 create mode 100644 jails/jackett/config.yml
 create mode 100644 jails/kms/config.yml
 create mode 100644 jails/lidarr/config.yml
 create mode 100644 jails/mariadb/config.yml
 create mode 100644 jails/nextcloud/config.yml
 create mode 100644 jails/organizr/config.yml
 create mode 100644 jails/plex/config.yml
 create mode 100644 jails/radarr/config.yml
 create mode 100644 jails/sonarr/config.yml
 create mode 100644 jails/tautulli/config.yml
 create mode 100644 jails/transmission/config.yml

diff --git a/.gitignore b/.gitignore
index e9abc7f6..9fc8384e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-config.yml
\ No newline at end of file
+/config.yml
\ No newline at end of file
diff --git a/config.yml.example b/config.yml.example
index a9fdb1f7..d648f631 100644
--- a/config.yml.example
+++ b/config.yml.example
@@ -28,42 +28,15 @@ example: example
   # Jail specific pkgs. 
   # Please use standard space delimited pkg install syntax.
   pkgs: mono
- 
-jackett: jackett
-  pkgs: mono
- 
-radarr: radarr
-  pkgs: mono mediainfo sqlite3 libgdiplus
- 
-sonarr: sonarr
-  pkgs: mono mediainfo sqlite3
- 
-lidarr: lidarr
-  pkgs: mono mediainfo sqlite3
- 
-transmission: transmission
-  pkgs: bash unzip unrar transmission
   
 plex: plex
   plexpass: false
-  pkgs: plexmediaserver
-  
-tautulli: tautulli
-  pkgs: python2 py27-sqlite3 py27-openssl git
-  
-organizr: organizr
-  pkgs: nginx php72 php72-filter php72-curl php72-hash php72-json php72-openssl php72-pdo php72-pdo_sqlite php72-session php72-simplexml php72-sqlite3 php72-zip git
-  
-kms: kms
-  pkgs: bash py37-tkinter py37-pip py37-sqlite3 git
-
 
 nextcloud: nextcloud
   ip4_addr: 192.168.1.99/24
   gateway: 192.168.1.1
   time_zone: Europe/Amsterdam
   host_name: cloud.example.com
-  pkgs:   nano sudo redis php73-ctype gnupg php73-dom php73-gd php73-iconv php73-json php73-mbstring php73-posix php73-simplexml php73-xmlreader php73-xmlwriter php73-zip php73-zlib php73-hash php73-xml php73 php73-pecl-redis php73-session php73-wddx php73-xsl php73-filter php73-pecl-APCu php73-curl php73-fileinfo php73-bz2 php73-intl php73-openssl php73-ldap php73-ftp php73-imap php73-exif php73-gmp php73-pecl-memcache php73-pecl-imagick perl5 p5-Locale-gettext help2man texinfo m4 autoconf
   database: mariadb
   standalone_cert: 0
   selfsigned_cert: 0
@@ -81,14 +54,12 @@ nextcloud: nextcloud
 mariadb: mariadb
   ip4_addr: 192.168.1.98/24
   gateway: 192.168.1.1
-  pkgs: mariadb104-server git  php74-session php74-xml php74-ctype php74-openssl php74-filter php74-gd php74-json php74-mysqli php74-mbstring php74-zlib php74-zip php74-bz2 phpMyAdmin5-php74 php74-pdo_mysql php74-mysqli phpMyAdmin5-php74-5.0.1
   db_root_password: ReplaceThisWithYourOwnRootPAssword
   host_name: mariadb.local.example
 
 bitwarden: bitwarden
   ip4_addr: 192.168.1.97/24
   gateway: 192.168.1.1
-  pkgs: sqlite3 nginx git sudo vim-tiny bash node npm python27-2.7.17_1 mariadb104-client
   db_password: "YourDBPasswordHerePLEASE"
   type: mariadb
   admin_token: "PUTYOURADMINTOKENHEREANDREMOVETHIS"
@@ -96,5 +67,4 @@ bitwarden: bitwarden
 influxdb: influxdb
   ip4_addr: 192.168.1.250/24
   gateway: 192.168.1.1
-  pkgs: influxdb
   database: influxdb
diff --git a/jailman.sh b/jailman.sh
index c20c433b..d7ee700b 100755
--- a/jailman.sh
+++ b/jailman.sh
@@ -85,6 +85,7 @@ while getopts ":i:r:u:d:g:h" opt
 done
 
 # Parse the Config YAML
+for configpath in ${SCRIPT_DIR}/jails/*/config.yml; do ! eval $(parse_yaml ${configpath}); done
 eval $(parse_yaml config.yml)
 
 # Check and Execute requested jail destructions
diff --git a/jails/bitwarden/config.yml b/jails/bitwarden/config.yml
new file mode 100644
index 00000000..6214896e
--- /dev/null
+++ b/jails/bitwarden/config.yml
@@ -0,0 +1,2 @@
+bitwarden: bitwarden
+  pkgs: sqlite3 nginx git sudo vim-tiny bash node npm python27-2.7.17_1 mariadb104-client
\ No newline at end of file
diff --git a/jails/influxdb/config.yml b/jails/influxdb/config.yml
new file mode 100644
index 00000000..2ced3a1c
--- /dev/null
+++ b/jails/influxdb/config.yml
@@ -0,0 +1,2 @@
+influxdb: influxdb
+  pkgs: influxdb
\ No newline at end of file
diff --git a/jails/jackett/config.yml b/jails/jackett/config.yml
new file mode 100644
index 00000000..01cd737f
--- /dev/null
+++ b/jails/jackett/config.yml
@@ -0,0 +1,2 @@
+jackett: jackett
+  pkgs: mono
\ No newline at end of file
diff --git a/jails/kms/config.yml b/jails/kms/config.yml
new file mode 100644
index 00000000..ca31811d
--- /dev/null
+++ b/jails/kms/config.yml
@@ -0,0 +1,2 @@
+kms: kms
+  pkgs: bash py37-tkinter py37-pip py37-sqlite3 git
\ No newline at end of file
diff --git a/jails/lidarr/config.yml b/jails/lidarr/config.yml
new file mode 100644
index 00000000..c9bc00a2
--- /dev/null
+++ b/jails/lidarr/config.yml
@@ -0,0 +1,2 @@
+lidarr: lidarr
+  pkgs: mono mediainfo sqlite3
\ No newline at end of file
diff --git a/jails/mariadb/config.yml b/jails/mariadb/config.yml
new file mode 100644
index 00000000..bbe68e55
--- /dev/null
+++ b/jails/mariadb/config.yml
@@ -0,0 +1,2 @@
+mariadb: mariadb
+  pkgs: mariadb104-server git  php74-session php74-xml php74-ctype php74-openssl php74-filter php74-gd php74-json php74-mysqli php74-mbstring php74-zlib php74-zip php74-bz2 phpMyAdmin5-php74 php74-pdo_mysql php74-mysqli phpMyAdmin5-php74-5.0.1
diff --git a/jails/nextcloud/config.yml b/jails/nextcloud/config.yml
new file mode 100644
index 00000000..77618d02
--- /dev/null
+++ b/jails/nextcloud/config.yml
@@ -0,0 +1,2 @@
+nextcloud: nextcloud
+  pkgs:   nano sudo redis php73-ctype gnupg php73-dom php73-gd php73-iconv php73-json php73-mbstring php73-posix php73-simplexml php73-xmlreader php73-xmlwriter php73-zip php73-zlib php73-hash php73-xml php73 php73-pecl-redis php73-session php73-wddx php73-xsl php73-filter php73-pecl-APCu php73-curl php73-fileinfo php73-bz2 php73-intl php73-openssl php73-ldap php73-ftp php73-imap php73-exif php73-gmp php73-pecl-memcache php73-pecl-imagick perl5 p5-Locale-gettext help2man texinfo m4 autoconf
\ No newline at end of file
diff --git a/jails/organizr/config.yml b/jails/organizr/config.yml
new file mode 100644
index 00000000..887c1645
--- /dev/null
+++ b/jails/organizr/config.yml
@@ -0,0 +1,2 @@
+organizr: organizr
+  pkgs: nginx php72 php72-filter php72-curl php72-hash php72-json php72-openssl php72-pdo php72-pdo_sqlite php72-session php72-simplexml php72-sqlite3 php72-zip git
\ No newline at end of file
diff --git a/jails/plex/config.yml b/jails/plex/config.yml
new file mode 100644
index 00000000..8206391a
--- /dev/null
+++ b/jails/plex/config.yml
@@ -0,0 +1,2 @@
+plex: plex
+  pkgs: plexmediaserver
\ No newline at end of file
diff --git a/jails/radarr/config.yml b/jails/radarr/config.yml
new file mode 100644
index 00000000..789ec723
--- /dev/null
+++ b/jails/radarr/config.yml
@@ -0,0 +1,2 @@
+radarr: radarr
+  pkgs: mono mediainfo sqlite3 libgdiplus
\ No newline at end of file
diff --git a/jails/sonarr/config.yml b/jails/sonarr/config.yml
new file mode 100644
index 00000000..1197e640
--- /dev/null
+++ b/jails/sonarr/config.yml
@@ -0,0 +1,2 @@
+sonarr: sonarr
+  pkgs: mono mediainfo sqlite3
\ No newline at end of file
diff --git a/jails/tautulli/config.yml b/jails/tautulli/config.yml
new file mode 100644
index 00000000..34256990
--- /dev/null
+++ b/jails/tautulli/config.yml
@@ -0,0 +1,2 @@
+tautulli: tautulli
+  pkgs: python2 py27-sqlite3 py27-openssl git
\ No newline at end of file
diff --git a/jails/transmission/config.yml b/jails/transmission/config.yml
new file mode 100644
index 00000000..efec5ece
--- /dev/null
+++ b/jails/transmission/config.yml
@@ -0,0 +1,2 @@
+transmission: transmission
+  pkgs: bash unzip unrar transmission
\ No newline at end of file

From 5119ba51205c0aee160f5ac360f495a3d8cbc05b Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sat, 25 Apr 2020 15:45:34 +0200
Subject: [PATCH 088/147] - Adds documentation for config.yml options (fixes:
 #70) (#76)

- Describes the dataset structure, included auto-generated datasets (fixes: #68)
---
 docs/config options.md | 44 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 docs/config options.md

diff --git a/docs/config options.md b/docs/config options.md
new file mode 100644
index 00000000..8c0c4b93
--- /dev/null
+++ b/docs/config options.md	
@@ -0,0 +1,44 @@
+## Config Options
+
+There are a lot of possibly configuration options in config.yml.
+For jail specific config options, please see the wiki documentation for your specific jail. This page only list general and global config options, that are the same for every jail.
+
+## Global config options
+
+Global options apply to every jail. Use and change with caution.
+
+### dataset
+
+All config options under "dataset" change dataset creation and linking. The indentation and "dataset" flag are not optional.
+All Datasets are auto-created if they do not exist already, no need to worry about creating them!
+
+- config: The dataset that is going to contain the persistant data for every jail. For example: Nextcloud user files for nextcloud or the actual database for mariadb.
+- iocage: The dataset containing the iocage config. In FreeNAS often `poolname/iocage`
+- media: The dataset that is going to contain all media files for plex, Sonarr, Radarr etc. Such as movies and music. Music, Movie etc. sub-datasets are auto-created.
+- downloads: The dataset containging temporary download files. These are moved to media when finished. complete, incomplete etc. sub-datasets are auto-created.
+
+## jails
+All config options under "jails" change default jail settings that are the same for every created jail. The indentation and "jails" flag are not optional.
+- version: the current to-be-installed version for jails
+- pkgs: packages that are installed to all created jails
+   
+## (hidden) Auto created datasets
+
+Some datasets are auto created and can not be changed from the config file. This is done to ease troubleshooting.
+
+- `media/music` created as a sub-dataset of media, contains music
+- `media/movies` created as a sub-dataset of media, contains movies
+- `media/shows` created as a sub-dataset of media, contains tv-shows
+- `downloads/complete` created as a sub-dataset of downloads, contains completed downloads
+- `downloads/incomplete` created as a sub-dataset of downloads, contains not-yet-completed downloads
+
+## General config options
+
+### Networking
+- ip4_addr: To set a static IP (recommended), enter the desired ip address here. Leave blank (or remove the line) for DHCP.
+- gateway: Set the gateway IP for static IP setup. Leave blank (or remove the line) for DHCP.
+
+### Advanced
+- interfaces: Set the "interfaces" flag for iocage. Example: `vnet0:bridge0` (optional)
+- dhcp: Set to force DHCP (not required for DHCP, see above)
+- pkgs: Override the to-be-install packages for this jail (might break now or break updates)

From a60518e02e67f8f7afc9b3ef29d868c8d3255b83 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sat, 25 Apr 2020 15:51:18 +0200
Subject: [PATCH 089/147] Update nextcloud (#81)

* Implement freenas-iocage-nextcloud#105

* Implement freenas-iocage-nextcloud#106
---
 jails/nextcloud/config.yml | 2 +-
 jails/nextcloud/install.sh | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/jails/nextcloud/config.yml b/jails/nextcloud/config.yml
index 77618d02..dfe6c31d 100644
--- a/jails/nextcloud/config.yml
+++ b/jails/nextcloud/config.yml
@@ -1,2 +1,2 @@
 nextcloud: nextcloud
-  pkgs:   nano sudo redis php73-ctype gnupg php73-dom php73-gd php73-iconv php73-json php73-mbstring php73-posix php73-simplexml php73-xmlreader php73-xmlwriter php73-zip php73-zlib php73-hash php73-xml php73 php73-pecl-redis php73-session php73-wddx php73-xsl php73-filter php73-pecl-APCu php73-curl php73-fileinfo php73-bz2 php73-intl php73-openssl php73-ldap php73-ftp php73-imap php73-exif php73-gmp php73-pecl-memcache php73-pecl-imagick perl5 p5-Locale-gettext help2man texinfo m4 autoconf
\ No newline at end of file
+  pkgs:   nano sudo redis php73-ctype gnupg php73-dom php73-gd php73-iconv php73-json php73-mbstring php73-posix php73-simplexml php73-xmlreader php73-xmlwriter php73-zip php73-zlib php73-hash php73-xml php73 php73-pecl-redis php73-session php73-wddx php73-xsl php73-filter php73-pecl-APCu php73-curl php73-fileinfo php73-bz2 php73-intl php73-openssl php73-ldap php73-ftp php73-imap php73-exif php73-gmp php73-pecl-memcache php73-pecl-imagick php73-pecl-smbclient perl5 p5-Locale-gettext help2man texinfo m4 autoconf
\ No newline at end of file
diff --git a/jails/nextcloud/install.sh b/jails/nextcloud/install.sh
index ce825510..2b3168a6 100755
--- a/jails/nextcloud/install.sh
+++ b/jails/nextcloud/install.sh
@@ -275,6 +275,8 @@ else
 	iocage exec "${JAIL_NAME}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set redis host --value="/tmp/redis.sock"'
 	iocage exec "${JAIL_NAME}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set redis port --value=0 --type=integer'
 	iocage exec "${JAIL_NAME}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set memcache.locking --value="\OC\Memcache\Redis"'
+	iocage exec "${JAIL_NAME}" su -m www -c "php /usr/local/www/nextcloud/occ config:system:set overwritehost --value=\"${HOST_NAME}\""
+	iocage exec "${JAIL_NAME}" su -m www -c "php /usr/local/www/nextcloud/occ config:system:set overwriteprotocol --value=\"https\""
 	if [ $NO_CERT -eq 1 ]; then
 		iocage exec "${JAIL_NAME}" su -m www -c "php /usr/local/www/nextcloud/occ config:system:set overwrite.cli.url --value=\"http://${HOST_NAME}/\""
 	else

From d877424c8ccee4ebbb428b8cc8d7044ef5c02e29 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sat, 25 Apr 2020 15:55:59 +0200
Subject: [PATCH 090/147] Rename plexpass to beta and document the beta flag
 (#77)

* Rename plexpass to beta and document the beta flag (Fixes: #54)

* Comment cleanup
---
 config.yml.example    | 2 +-
 jails/plex/install.sh | 8 ++++----
 jails/plex/readme.md  | 3 +++
 jails/plex/update.sh  | 6 +++---
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/config.yml.example b/config.yml.example
index d648f631..f9cc0adf 100644
--- a/config.yml.example
+++ b/config.yml.example
@@ -30,7 +30,7 @@ example: example
   pkgs: mono
   
 plex: plex
-  plexpass: false
+  beta: false
 
 nextcloud: nextcloud
   ip4_addr: 192.168.1.99/24
diff --git a/jails/plex/install.sh b/jails/plex/install.sh
index e5bc94ba..77cad59b 100755
--- a/jails/plex/install.sh
+++ b/jails/plex/install.sh
@@ -21,15 +21,15 @@ iocage exec plex chown -R plex:plex /config
 iocage exec plex pkg update
 iocage exec plex pkg upgrade -y
 
-# Run different install procedures depending on Plex vs Plexpass
-if [ "$plex_plexpass" == "true" ]; then
-	echo "plexpass enabled in config.yml... using plexpass for install"
+# Run different install procedures depending on Plex vs Plex Beta
+if [ "$plex_beta" == "true" ]; then
+	echo "beta enabled in config.yml... using plex beta for install"
 	iocage exec plex sysrc "plexmediaserver_plexpass_enable=YES"
 	iocage exec plex sysrc plexmediaserver_plexpass_support_path="/config"
 	iocage exec plex chown -R plex:plex /usr/local/share/plexmediaserver-plexpass/
 	iocage exec plex service plexmediaserver_plexpass restart
 else
-	echo "plexpass disabled in config.yml... NOT using plexpass for install"
+	echo "beta disabled in config.yml... NOT using plex beta for install"
 	iocage exec plex sysrc "plexmediaserver_enable=YES"
 	iocage exec plex sysrc plexmediaserver_support_path="/config"
 	iocage exec plex chown -R plex:plex /usr/local/share/plexmediaserver/
diff --git a/jails/plex/readme.md b/jails/plex/readme.md
index 2cac133d..4d5b5046 100755
--- a/jails/plex/readme.md
+++ b/jails/plex/readme.md
@@ -1,5 +1,8 @@
 # Plex
 
+### Config Parameters:
+- beta: set to `true` if you want to run the plex beta (previously known as "plexpass"). Please note: This is not required for plexpass features
+
 For more information about plex, please see the Plex website:
 
 # Original plex install script guide
diff --git a/jails/plex/update.sh b/jails/plex/update.sh
index 4f1d62c5..a9f7b7d4 100755
--- a/jails/plex/update.sh
+++ b/jails/plex/update.sh
@@ -1,15 +1,15 @@
 #!/usr/local/bin/bash
 # This file contains the update script for Plex
 
-# Run different update procedures depending on Plex vs Plexpass
+# Run different update procedures depending on Plex vs Plex Beta
 if [ "$plex_plexpass" == "true" ]; then
-	echo "plexpass enabled in config.yml... using plexpass for update..."
+	echo "beta enabled in config.yml... using plex beta for update..."
 	iocage exec plex service plexmediaserver_plexpass stop
 	# Plex is updated using PKG already, this is mostly a placeholder
 	iocage exec plex chown -R plex:plex /usr/local/share/plexmediaserver-plexpass/
 	iocage exec plex service plexmediaserver_plexpass restart
 else
-	echo "plexpass disabled in config.yml... NOT using plexpass for update..."
+	echo "beta disabled in config.yml... NOT using plex beta for update..."
 	iocage exec plex service plexmediaserver stop
 	# Plex is updated using PKG already, this is mostly a placeholder
 	iocage exec plex chown -R plex:plex /usr/local/share/plexmediaserver/

From f0437b87c8a8699354269af60afc52eb972977ca Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sat, 25 Apr 2020 15:59:04 +0200
Subject: [PATCH 091/147] add plex user to video group to enable future
 hardware encoding jail side. (#78)

---
 jails/plex/install.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/jails/plex/install.sh b/jails/plex/install.sh
index 77cad59b..2e3af92a 100755
--- a/jails/plex/install.sh
+++ b/jails/plex/install.sh
@@ -21,6 +21,9 @@ iocage exec plex chown -R plex:plex /config
 iocage exec plex pkg update
 iocage exec plex pkg upgrade -y
 
+# Add plex user to video group for future hw-encoding support
+iocage exec plex pw groupmod -n video -m plex
+
 # Run different install procedures depending on Plex vs Plex Beta
 if [ "$plex_beta" == "true" ]; then
 	echo "beta enabled in config.yml... using plex beta for install"

From dc6eb4a4b737050956763cb0925f5c9ee8b62e70 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sat, 25 Apr 2020 16:34:41 +0200
Subject: [PATCH 092/147] Update shellcheck.yml

---
 .github/workflows/shellcheck.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml
index 0da492dd..533096fd 100644
--- a/.github/workflows/shellcheck.yml
+++ b/.github/workflows/shellcheck.yml
@@ -11,6 +11,7 @@ on:
 
 jobs:
   shellcheck:
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
       - name: Shell Linter

From 759da942d2b297b7c2973441cde8f1a83682e702 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sat, 25 Apr 2020 19:47:11 +0200
Subject: [PATCH 093/147] Automatically detect mountpoint for iocage (#80)

* automate grabbing iocage dataset instead of hardcoding

* move iocage dataset define to jailman.sh instead of config.yml
It can still be overriden by config.yml
---
 config.yml.example | 2 --
 jailman.sh         | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/config.yml.example b/config.yml.example
index f9cc0adf..50b4b9a8 100644
--- a/config.yml.example
+++ b/config.yml.example
@@ -3,8 +3,6 @@ global:
   dataset:
    # dataset for internal jail config files
    config: tank/apps
-   # Iocage root dataset
-   iocage: tank/iocage
    # Media library dataset
    media: tank/media
    # Parent downloads dataset 
diff --git a/jailman.sh b/jailman.sh
index d7ee700b..67f79d6d 100755
--- a/jailman.sh
+++ b/jailman.sh
@@ -84,6 +84,9 @@ while getopts ":i:r:u:d:g:h" opt
      esac
 done
 
+global_dataset_iocage=$(zfs get -H -o value mountpoint $(iocage get -p)/iocage)
+global_dataset_iocage=${global_dataset_iocage#/mnt/}
+
 # Parse the Config YAML
 for configpath in ${SCRIPT_DIR}/jails/*/config.yml; do ! eval $(parse_yaml ${configpath}); done
 eval $(parse_yaml config.yml)

From 46d148719109bf15d65b2816d143eb6fdd75b6a8 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sat, 25 Apr 2020 19:47:21 +0200
Subject: [PATCH 094/147] Add plex transcoding ramdisk creation (#79)

---
 jails/plex/install.sh | 6 ++++++
 jails/plex/readme.md  | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/jails/plex/install.sh b/jails/plex/install.sh
index 2e3af92a..460784bf 100755
--- a/jails/plex/install.sh
+++ b/jails/plex/install.sh
@@ -14,6 +14,12 @@ createmount plex ${global_dataset_media}/movies /mnt/media/movies
 createmount plex ${global_dataset_media}/music /mnt/media/music
 createmount plex ${global_dataset_media}/shows /mnt/media/shows
 
+# Create plex ramdisk if specified
+if [ -z "${plex_ramdisk}" ]; then
+	echo "no ramdisk specified for plex, continuing without randisk"
+else
+	iocage fstab -a plex tmpfs /tmp_transcode tmpfs rw,size=${plex_ramdisk},mode=1777 0 0
+fi
 
 iocage exec plex chown -R plex:plex /config
 
diff --git a/jails/plex/readme.md b/jails/plex/readme.md
index 4d5b5046..171874af 100755
--- a/jails/plex/readme.md
+++ b/jails/plex/readme.md
@@ -5,6 +5,10 @@
 
 For more information about plex, please see the Plex website:
 
+### Config Parameters:
+
+- ramdisk: Specify the `size` parameter to create a transcoding ramdisk under /tmp_transcode. Requires manual setting it un plex to be used for transcoding. (optional)
+
 # Original plex install script guide
 
 https://www.ixsystems.com/community/resources/fn11-3-iocage-jails-plex-tautulli-sonarr-radarr-lidarr-jackett-transmission-organizr.58/
\ No newline at end of file

From c32ea280da2a28a6e8991b6f4f0ab84d32b3a299 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sun, 26 Apr 2020 14:55:22 +0200
Subject: [PATCH 095/147] Linter cleanup (#84)

* Fix all Scriptcheck errors on current dev code

* clean recent plex changes
---
 global.sh                      | 52 ++++++++++++++++++---------------
 jailman.sh                     | 48 +++++++++++++++++++++---------
 jails/bitwarden/install.sh     | 22 +++++++++-----
 jails/bitwarden/update.sh      | 19 +++++++-----
 jails/influxdb/install.sh      |  7 +++--
 jails/jackett/install.sh       |  3 +-
 jails/jackett/update.sh        |  3 +-
 jails/kms/install.sh           |  3 +-
 jails/kms/update.sh            |  3 +-
 jails/lidarr/install.sh        | 13 +++++----
 jails/lidarr/update.sh         |  3 +-
 jails/mariadb/includes/caddy   |  1 +
 jails/mariadb/install.sh       | 14 +++++----
 jails/mariadb/update.sh        |  4 ++-
 jails/nextcloud/includes/caddy |  1 +
 jails/nextcloud/install.sh     | 53 ++++++++++++++++++++++------------
 jails/organizr/install.sh      | 11 +++----
 jails/organizr/update.sh       |  4 +--
 jails/plex/install.sh          | 16 ++++++----
 jails/plex/update.sh           |  1 +
 jails/radarr/install.sh        | 13 +++++----
 jails/radarr/update.sh         |  3 +-
 jails/sonarr/install.sh        | 13 +++++----
 jails/sonarr/update.sh         |  3 +-
 jails/transmission/install.sh  |  7 +++--
 placeholder                    |  0
 26 files changed, 205 insertions(+), 115 deletions(-)
 delete mode 100644 placeholder

diff --git a/global.sh b/global.sh
index 13458a39..d9d7a9eb 100755
--- a/global.sh
+++ b/global.sh
@@ -3,12 +3,15 @@
 
 # yml Parser function
 # Based on https://gist.github.com/pkuczynski/8665367
+# shellcheck disable=SC2086
 parse_yaml() {
-   local prefix=$2
-   local s='[[:space:]]*' w='[a-zA-Z0-9_]*' fs=$(echo @|tr @ '\034')
+   prefix=${2}
+   s='[[:space:]]*' w='[a-zA-Z0-9_]*' fs=$(echo @|tr @ '\034')
+   local prefix
+   local s w fs
    sed -ne "s|^\($s\)\($w\)$s:$s\"\(.*\)\"$s\$|\1$fs\2$fs\3|p" \
-        -e "s|^\($s\)\($w\)$s:$s\(.*\)$s\$|\1$fs\2$fs\3|p"  $1 |
-   awk -F$fs '{
+        -e "s|^\($s\)\($w\)$s:$s\(.*\)$s\$|\1$fs\2$fs\3|p"  "${1}" |
+   awk -F"${fs}" '{
       indent = length($1)/2;
       vname[indent] = $2;
       for (i in vname) {if (i > indent) {delete vname[i]}}
@@ -24,12 +27,12 @@ gitupdate() {
 echo "checking for updates using Branch: $1"
 git fetch
 git update-index -q --refresh
-CHANGED=$(git diff --name-only origin/$1)
-if [ ! -z "$CHANGED" ];
+CHANGED=$(git diff --name-only origin/"$1")
+if [ -n "$CHANGED" ];
 then
     echo "script requires update"
     git reset --hard
-    git checkout $1
+    git checkout "${1}"
     git pull
     echo "script updated, please restart the script manually"
     exit 1
@@ -64,17 +67,20 @@ if [ -z "${!jailname}" ]; then
 	exit 1
 else
 	echo "Creating jail for $1"
+	# shellcheck disable=SC2154
 	pkgs="$(sed 's/[^[:space:]]\{1,\}/"&"/g;s/ /,/g' <<<"${global_jails_pkgs} ${!jailpkgs}")"
-	echo '{"pkgs":['${pkgs}']}' > /tmp/pkg.json
+	echo '{"pkgs":['"${pkgs}"']}' > /tmp/pkg.json
 	if [ "${setdhcp}" == "on" ]
 	then
-		if ! iocage create -n "${1}" -p /tmp/pkg.json -r ${global_jails_version} interfaces="${jailinterfaces}" dhcp="on" vnet="on" allow_raw_sockets="1" boot="on" -b
+		# shellcheck disable=SC2154
+		if ! iocage create -n "${1}" -p /tmp/pkg.json -r "${global_jails_version}" interfaces="${jailinterfaces}" dhcp="on" vnet="on" allow_raw_sockets="1" boot="on" -b
 		then
 			echo "Failed to create jail"
 			exit 1
 		fi
 	else
-		if ! iocage create -n "${1}" -p /tmp/pkg.json -r ${global_jails_version} interfaces="${jailinterfaces}" ip4_addr="vnet0|${!jailip4}" defaultrouter="${!jailgateway}" vnet="on" allow_raw_sockets="1" boot="on" -b
+		# shellcheck disable=SC2154
+		if ! iocage create -n "${1}" -p /tmp/pkg.json -r "${global_jails_version}" interfaces="${jailinterfaces}" ip4_addr="vnet0|${!jailip4}" defaultrouter="${!jailgateway}" vnet="on" allow_raw_sockets="1" boot="on" -b
 		then
 			echo "Failed to create jail"
 			exit 1
@@ -84,19 +90,19 @@ else
 
 	rm /tmp/pkg.json
 	echo "creating jail config directory"
-	
-	createmount $1 ${global_dataset_config}
-	createmount $1 ${global_dataset_config}/$1 /config
+	# shellcheck disable=SC2154
+	createmount "${1}" "${global_dataset_config}"
+	createmount "${1}" "${global_dataset_config}"/"${1}" /config
 	
 	# Create and Mount portsnap
 	echo "Mounting and fetching ports"
-	createmount $1 ${global_dataset_config}/portsnap
-	createmount $1 ${global_dataset_config}/portsnap/db /var/db/portsnap
-	createmount $1 ${global_dataset_config}/portsnap/ports /usr/ports
+	createmount "${1}" "${global_dataset_config}"/portsnap
+	createmount "${1}" "${global_dataset_config}"/portsnap/db /var/db/portsnap
+	createmount "${1}" "${global_dataset_config}"/portsnap/ports /usr/ports
 	
-	iocage exec "$1" "if [ -z /usr/ports ]; then portsnap fetch extract; else portsnap auto; fi"
+	iocage exec "${1}" "if [ -z /usr/ports ]; then portsnap fetch extract; else portsnap auto; fi"
 	
-	echo "Jail creation completed for $1"
+	echo "Jail creation completed for ${1}"
 fi	
 	
 }
@@ -112,17 +118,17 @@ createmount() {
 	else
 		if [ ! -d "/mnt/$2" ]; then
 			echo "Dataset does not exist... Creating... $2"
-			zfs create $2
+			zfs create "${2}"
 		else
 			echo "Dataset already exists, skipping creation of $2"
 		fi
 
 		if [ -n "$1" ] && [ -n "$3" ]; then
-			iocage exec $1 mkdir -p $3
-			if [ -n "$4" ]; then
-				iocage fstab -a $1 /mnt/$2 $3 $4
+			iocage exec "${1}" mkdir -p "${3}"
+			if [ -n "${4}" ]; then
+				iocage fstab -a "${1}" /mnt/"${2}" "${3}" "${4}"
 			else
-				iocage fstab -a $1 /mnt/$2 $3 nullfs rw 0 0
+				iocage fstab -a "${1}" /mnt/"${2}" "${3}" nullfs rw 0 0
 			fi
 		else
 			echo "No Jail Name or Mount target specified, not mounting dataset"
diff --git a/jailman.sh b/jailman.sh
index 67f79d6d..49465707 100755
--- a/jailman.sh
+++ b/jailman.sh
@@ -1,15 +1,20 @@
 #!/usr/local/bin/bash
 
 # Important defines:
-export SCRIPT_NAME=$(basename $(test -L "${BASH_SOURCE[0]}" && readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}"));
-export SCRIPT_DIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd);
+# shellcheck disable=SC2046
+SCRIPT_NAME=$(basename $(test -L "${BASH_SOURCE[0]}" && readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}"));
+SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd);
+export SCRIPT_NAME
+export SCRIPT_DIR
+
 echo "Working directory for jailman.sh is: ${SCRIPT_DIR}"
 
 #Includes
-source ${SCRIPT_DIR}/global.sh
+# shellcheck source=global.sh
+source "${SCRIPT_DIR}/global.sh"
 
 # Check for root privileges
-if ! [ $(id -u) = 0 ]; then
+if ! [ "$(id -u)" = 0 ]; then
    echo "This script must be run with root privileges"
    exit 1
 fi
@@ -31,33 +36,44 @@ fi
 unset -v sub
 while getopts ":i:r:u:d:g:h" opt
    do
+   #Shellcheck on wordsplitting will be disabled. Wordsplitting can't happen, because it's already split using OPTIND.
      case $opt in
         i ) installjails=("$OPTARG")
+			# shellcheck disable=SC2046
             until [[ $(eval "echo \${$OPTIND}") =~ ^-.* ]] || [ -z $(eval "echo \${$OPTIND}") ]; do
+				# shellcheck disable=SC2207
                 installjails+=($(eval "echo \${$OPTIND}"))
                 OPTIND=$((OPTIND + 1))
             done
             ;;
         r ) redojails=("$OPTARG")
+			# shellcheck disable=SC2046
             until [[ $(eval "echo \${$OPTIND}") =~ ^-.* ]] || [ -z $(eval "echo \${$OPTIND}") ]; do
+				# shellcheck disable=SC2207
                 redojails+=($(eval "echo \${$OPTIND}"))
                 OPTIND=$((OPTIND + 1))
             done
             ;;
         u ) updatejails=("$OPTARG")
+			# shellcheck disable=SC2046
             until [[ $(eval "echo \${$OPTIND}") =~ ^-.* ]] || [ -z $(eval "echo \${$OPTIND}") ]; do
+				# shellcheck disable=SC2207
                 updatejails+=($(eval "echo \${$OPTIND}"))
                 OPTIND=$((OPTIND + 1))
             done
             ;;
         d ) destroyjails=("$OPTARG")
+			# shellcheck disable=SC2046
             until [[ $(eval "echo \${$OPTIND}") =~ ^-.* ]] || [ -z $(eval "echo \${$OPTIND}") ]; do
+				# shellcheck disable=SC2207
                 destroyjails+=($(eval "echo \${$OPTIND}"))
                 OPTIND=$((OPTIND + 1))
             done
             ;;
 	g ) upgradejails=("$OPTARG")
+			# shellcheck disable=SC2046
             until [[ $(eval "echo \${$OPTIND}") =~ ^-.* ]] || [ -z $(eval "echo \${$OPTIND}") ]; do
+				# shellcheck disable=SC2207
                 upgradejails+=($(eval "echo \${$OPTIND}"))
                 OPTIND=$((OPTIND + 1))
             done
@@ -88,18 +104,20 @@ global_dataset_iocage=$(zfs get -H -o value mountpoint $(iocage get -p)/iocage)
 global_dataset_iocage=${global_dataset_iocage#/mnt/}
 
 # Parse the Config YAML
-for configpath in ${SCRIPT_DIR}/jails/*/config.yml; do ! eval $(parse_yaml ${configpath}); done
-eval $(parse_yaml config.yml)
+# shellcheck disable=SC2046
+for configpath in "${SCRIPT_DIR}"/jails/*/config.yml; do ! eval $(parse_yaml "${configpath}"); done
+eval "$(parse_yaml config.yml)"
 
 # Check and Execute requested jail destructions
 if [ ${#destroyjails[@]} -eq 0 ]; then 
 	echo "No jails to destroy"
 else
+	# shellcheck disable=SC2124,SC2145
 	echo "jails to destroy ${destroyjails[@]}"
 	for jail in "${destroyjails[@]}"
 	do
 		echo "destroying $jail"
-		iocage destroy -f $jail
+		iocage destroy -f "${jail}"
 	done
 
 fi
@@ -108,13 +126,14 @@ fi
 if [ ${#installjails[@]} -eq 0 ]; then 
 	echo "No jails to install"
 else
+	# shellcheck disable=SC2124,SC2145
 	echo "jails to install ${installjails[@]}"
 	for jail in "${installjails[@]}"
 	do
 		if [ -f "${SCRIPT_DIR}/jails/$jail/install.sh" ]
 		then
 			echo "Installing $jail"
-			jailcreate $jail && ${SCRIPT_DIR}/jails/$jail/install.sh
+			jailcreate "${jail}" && "${SCRIPT_DIR}"/jails/"${jail}"/install.sh
 		else
 			echo "Missing install script for $jail in ${SCRIPT_DIR}/jails/$jail/install.sh"
 		fi
@@ -125,13 +144,14 @@ fi
 if [ ${#redojails[@]} -eq 0 ]; then 
 	echo "No jails to ReInstall"
 else
+	# shellcheck disable=SC2124,SC2145
 	echo "jails to reinstall ${redojails[@]}"
 	for jail in "${redojails[@]}"
 	do
 		if [ -f "${SCRIPT_DIR}/jails/$jail/install.sh" ]
 		then
 			echo "Reinstalling $jail"
-			iocage destroy -f $jail && jailcreate $jail && ${SCRIPT_DIR}/jails/$jail/install.sh
+			iocage destroy -f "${jail}" && jailcreate "${jail}" && "${SCRIPT_DIR}"/jails/"${jail}"/install.sh
 		else
 			echo "Missing install script for $jail in ${SCRIPT_DIR}/jails/$jail/update.sh"
 		fi
@@ -143,16 +163,17 @@ fi
 if [ ${#updatejails[@]} -eq 0 ]; then 
 	echo "No jails to Update"
 else
+	# shellcheck disable=SC2124,SC2145
 	echo "jails to update ${updatejails[@]}"
 	for jail in "${updatejails[@]}"
 	do
 		if [ -f "${SCRIPT_DIR}/jails/$jail/update.sh" ]
 		then
 			echo "Updating $jail"
-			iocage update $jail
-			iocage exec $jail "pkg update && pkg upgrade -y" && ${SCRIPT_DIR}/jails/$jail/update.sh
-			iocage restart $jail
-			iocage start $jail
+			iocage update "${jail}"
+			iocage exec "${jail}" "pkg update && pkg upgrade -y" && "${SCRIPT_DIR}"/jails/"${jail}"/update.sh
+			iocage restart "${jail}"
+			iocage start "${jail}"
 		else
 			echo "Missing update script for $jail in ${SCRIPT_DIR}/jails/$jail/update.sh"
 		fi
@@ -163,6 +184,7 @@ fi
 if [ ${#upgradejails[@]} -eq 0 ]; then 
 	echo "No jails to Upgrade"
 else
+	# shellcheck disable=SC2124,SC2145
 	echo "jails to update ${upgradejails[@]}"
 	for jail in "${upgradejails[@]}"
 	do
diff --git a/jails/bitwarden/install.sh b/jails/bitwarden/install.sh
index 5a8dffa8..11d445f0 100755
--- a/jails/bitwarden/install.sh
+++ b/jails/bitwarden/install.sh
@@ -5,10 +5,14 @@
 JAIL_NAME="bitwarden"
 DB_DATABASE=${JAIL_NAME}
 DB_USER=${JAIL_NAME}
+# shellcheck disable=SC2154
 INSTALL_TYPE=${bitwarden_type}
-DB_HOST="$(sed 's|\(.*\)/.*|\1|' <<<"${mariadb_ip4_addr}"):3306"
+# shellcheck disable=SC2154
+DB_HOST="${mariadb_ip4_addr%/*}:3306"
+# shellcheck disable=SC2154
 DB_PASSWORD="${bitwarden_db_password}"
 DB_STRING="mysql://${DB_USER}:${DB_PASSWORD}@${DB_HOST}/${DB_DATABASE}"
+# shellcheck disable=SC2154
 ADMIN_TOKEN=${bitwarden_admin_token}
 
 if [ -z "${ADMIN_TOKEN}" ]; then
@@ -36,12 +40,13 @@ fi
 iocage exec ${JAIL_NAME} cp -r /usr/local/share/bitwarden/src/target/release /usr/local/share/bitwarden/bin
 
 # Download and install webvault
-WEB_RELEASE_URL=$(curl -Ls -o /dev/null -w %{url_effective} https://github.com/dani-garcia/bw_web_builds/releases/latest)
+WEB_RELEASE_URL=$(curl -Ls -o /dev/null -w "%{url_effective}" https://github.com/dani-garcia/bw_web_builds/releases/latest)
 WEB_TAG="${WEB_RELEASE_URL##*/}"
 iocage exec ${JAIL_NAME} "fetch http://github.com/dani-garcia/bw_web_builds/releases/download/$WEB_TAG/bw_web_$WEB_TAG.tar.gz -o /usr/local/share/bitwarden"
 iocage exec ${JAIL_NAME} "tar -xzvf /usr/local/share/bitwarden/bw_web_$WEB_TAG.tar.gz -C /usr/local/share/bitwarden/"
-iocage exec ${JAIL_NAME} rm /usr/local/share/bitwarden/bw_web_$WEB_TAG.tar.gz
+iocage exec ${JAIL_NAME} rm /usr/local/share/bitwarden/bw_web_"$WEB_TAG".tar.gz
 
+# shellcheck disable=SC2154
 if [ -f "/mnt/${global_dataset_config}/${JAIL_NAME}/ssl/bitwarden-ssl.crt" ]; then
     echo "certificate exist... Skipping cert generation"
 else
@@ -50,7 +55,7 @@ else
 		echo "cert folder not existing... creating..."
 		iocage exec ${JAIL_NAME} mkdir /config/ssl
 	fi
-	openssl req -new -newkey rsa:2048 -days 365 -nodes -x509 -subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=localhost" -keyout /mnt/${global_dataset_config}/${JAIL_NAME}/ssl/bitwarden-ssl.key -out /mnt/${global_dataset_config}/${JAIL_NAME}/ssl/bitwarden-ssl.crt
+	openssl req -new -newkey rsa:2048 -days 365 -nodes -x509 -subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=localhost" -keyout /mnt/"${global_dataset_config}"/${JAIL_NAME}/ssl/bitwarden-ssl.key -out /mnt/"${global_dataset_config}"/${JAIL_NAME}/ssl/bitwarden-ssl.crt
 fi
 
 if [ -f "/mnt/${global_dataset_config}/${JAIL_NAME}/bitwarden.log" ]; then
@@ -67,10 +72,11 @@ fi
 iocage exec ${JAIL_NAME} "pw user add bitwarden -c bitwarden -u 725 -d /nonexistent -s /usr/bin/nologin"
 iocage exec ${JAIL_NAME} chown -R bitwarden:bitwarden /usr/local/share/bitwarden /config
 iocage exec ${JAIL_NAME} mkdir /usr/local/etc/rc.d /usr/local/etc/rc.conf.d
-cp ${SCRIPT_DIR}/jails/${JAIL_NAME}/includes/bitwarden.rc /mnt/${global_dataset_iocage}/jails/${JAIL_NAME}/root/usr/local/etc/rc.d/bitwarden
-cp ${SCRIPT_DIR}/jails/${JAIL_NAME}/includes/bitwarden.rc.conf /mnt/${global_dataset_iocage}/jails/${JAIL_NAME}/root/usr/local/etc/rc.conf.d/bitwarden
-echo 'export DATABASE_URL="'${DB_STRING}'"' >> /mnt/${global_dataset_iocage}/jails/${JAIL_NAME}/root/usr/local/etc/rc.conf.d/bitwarden
-echo 'export ADMIN_TOKEN="'${ADMIN_TOKEN}'"' >> /mnt/${global_dataset_iocage}/jails/${JAIL_NAME}/root/usr/local/etc/rc.conf.d/bitwarden
+# shellcheck disable=SC2154
+cp "${SCRIPT_DIR}"/jails/${JAIL_NAME}/includes/bitwarden.rc /mnt/"${global_dataset_iocage}"/jails/${JAIL_NAME}/root/usr/local/etc/rc.d/bitwarden
+cp "${SCRIPT_DIR}"/jails/${JAIL_NAME}/includes/bitwarden.rc.conf /mnt/"${global_dataset_iocage}"/jails/${JAIL_NAME}/root/usr/local/etc/rc.conf.d/bitwarden
+echo 'export DATABASE_URL="'"${DB_STRING}"'"' >> /mnt/"${global_dataset_iocage}"/jails/${JAIL_NAME}/root/usr/local/etc/rc.conf.d/bitwarden
+echo 'export ADMIN_TOKEN="'"${ADMIN_TOKEN}"'"' >> /mnt/"${global_dataset_iocage}"/jails/${JAIL_NAME}/root/usr/local/etc/rc.conf.d/bitwarden
 
 if [ "${ADMIN_TOKEN}" == "NONE" ]; then
 	echo "Admin_token set to NONE, disabling admin portal"
diff --git a/jails/bitwarden/update.sh b/jails/bitwarden/update.sh
index 746df014..15e51002 100755
--- a/jails/bitwarden/update.sh
+++ b/jails/bitwarden/update.sh
@@ -7,10 +7,14 @@
 JAIL_NAME="bitwarden"
 DB_DATABASE=${JAIL_NAME}
 DB_USER=${JAIL_NAME}
+# shellcheck disable=SC2154
 INSTALL_TYPE=${bitwarden_type}
-DB_HOST="$(sed 's|\(.*\)/.*|\1|' <<<"${mariadb_ip4_addr}"):3306"
+# shellcheck disable=SC2154
+DB_HOST="${mariadb_ip4_addr%/*}:3306"
+# shellcheck disable=SC2154
 DB_PASSWORD="${bitwarden_db_password}"
 DB_STRING="mysql://${DB_USER}:${DB_PASSWORD}@${DB_HOST}/${DB_DATABASE}"
+# shellcheck disable=SC2154
 ADMIN_TOKEN=${bitwarden_admin_token}
 
 if [ -z "${ADMIN_TOKEN}" ]; then
@@ -39,17 +43,18 @@ fi
 iocage exec ${JAIL_NAME} cp -r /usr/local/share/bitwarden/src/target/release /usr/local/share/bitwarden/bin
 
 # Download and install webvault
-WEB_RELEASE_URL=$(curl -Ls -o /dev/null -w %{url_effective} https://github.com/dani-garcia/bw_web_builds/releases/latest)
+WEB_RELEASE_URL=$(curl -Ls -o /dev/null -w "%{url_effective}" https://github.com/dani-garcia/bw_web_builds/releases/latest)
 WEB_TAG="${WEB_RELEASE_URL##*/}"
 iocage exec ${JAIL_NAME} "fetch http://github.com/dani-garcia/bw_web_builds/releases/download/$WEB_TAG/bw_web_$WEB_TAG.tar.gz -o /usr/local/share/bitwarden"
 iocage exec ${JAIL_NAME} "tar -xzvf /usr/local/share/bitwarden/bw_web_$WEB_TAG.tar.gz -C /usr/local/share/bitwarden/"
-iocage exec ${JAIL_NAME} rm /usr/local/share/bitwarden/bw_web_$WEB_TAG.tar.gz
+iocage exec ${JAIL_NAME} rm /usr/local/share/bitwarden/bw_web_"$WEB_TAG".tar.gz
 
 iocage exec ${JAIL_NAME} chown -R bitwarden:bitwarden /usr/local/share/bitwarden /config
-cp ${SCRIPT_DIR}/jails/${JAIL_NAME}/includes/bitwarden.rc /mnt/${global_dataset_iocage}/jails/${JAIL_NAME}/root/usr/local/etc/rc.d/bitwarden
-cp ${SCRIPT_DIR}/jails/${JAIL_NAME}/includes/bitwarden.rc.conf /mnt/${global_dataset_iocage}/jails/${JAIL_NAME}/root/usr/local/etc/rc.conf.d/bitwarden
-echo 'export DATABASE_URL="'${DB_STRING}'"' >> /mnt/${global_dataset_iocage}/jails/${JAIL_NAME}/root/usr/local/etc/rc.conf.d/bitwarden
-echo 'export ADMIN_TOKEN="'${ADMIN_TOKEN}'"' >> /mnt/${global_dataset_iocage}/jails/${JAIL_NAME}/root/usr/local/etc/rc.conf.d/bitwarden
+# shellcheck disable=SC2154
+cp "${SCRIPT_DIR}"/jails/${JAIL_NAME}/includes/bitwarden.rc /mnt/"${global_dataset_iocage}"/jails/${JAIL_NAME}/root/usr/local/etc/rc.d/bitwarden
+cp "${SCRIPT_DIR}"/jails/${JAIL_NAME}/includes/bitwarden.rc.conf /mnt/"${global_dataset_iocage}"/jails/${JAIL_NAME}/root/usr/local/etc/rc.conf.d/bitwarden
+echo 'export DATABASE_URL="'"${DB_STRING}"'"' >> /mnt/"${global_dataset_iocage}"/jails/${JAIL_NAME}/root/usr/local/etc/rc.conf.d/bitwarden
+echo 'export ADMIN_TOKEN="'"${ADMIN_TOKEN}"'"' >> /mnt/"${global_dataset_iocage}"/jails/${JAIL_NAME}/root/usr/local/etc/rc.conf.d/bitwarden
 
 if [ "${ADMIN_TOKEN}" == "NONE" ]; then
 	echo "Admin_token set to NONE, disabling admin portal"
diff --git a/jails/influxdb/install.sh b/jails/influxdb/install.sh
index a1104a97..9fe6886a 100755
--- a/jails/influxdb/install.sh
+++ b/jails/influxdb/install.sh
@@ -9,11 +9,14 @@
 
 # Initialise variables
 JAIL_NAME="influxdb"
-JAIL_IP="$(sed 's|\(.*\)/.*|\1|' <<<"${influxdb_ip4_addr}" )"
+# shellcheck disable=SC2154
+JAIL_IP="${influxdb_ip4_addr%/*}"
 INCLUDES_PATH="${SCRIPT_DIR}/jails/influxdb/includes"
-DATABASE=${influxdb_database}
+# shellcheck disable=SC2154
+DATABASE="${influxdb_database}"
 
 # Mount and configure proper configuration location
+# shellcheck disable=SC2154
 cp -rf "${INCLUDES_PATH}/influxd.conf" "/mnt/${global_dataset_config}/${JAIL_NAME}/influxd.conf"
 iocage exec "${JAIL_NAME}" mkdir -p /config/db/data /config/db/meta /config/db/wal
 iocage exec "${JAIL_NAME}" chown -R influxd:influxd /config/db
diff --git a/jails/jackett/install.sh b/jails/jackett/install.sh
index 60115ab8..954d59c5 100755
--- a/jails/jackett/install.sh
+++ b/jails/jackett/install.sh
@@ -7,7 +7,8 @@ iocage exec jackett rm /usr/local/share/Jackett.Binaries.Mono.tar.gz
 iocage exec jackett "pw user add jackett -c jackett -u 818 -d /nonexistent -s /usr/bin/nologin"
 iocage exec jackett chown -R jackett:jackett /usr/local/share/Jackett /config
 iocage exec jackett mkdir /usr/local/etc/rc.d
-cp ${SCRIPT_DIR}/jails/jackett/includes/jackett.rc /mnt/${global_dataset_iocage}/jails/jackett/root/usr/local/etc/rc.d/jackett
+# shellcheck disable=SC2154
+cp "${SCRIPT_DIR}"/jails/jackett/includes/jackett.rc /mnt/"${global_dataset_iocage}"/jails/jackett/root/usr/local/etc/rc.d/jackett
 iocage exec jackett chmod u+x /usr/local/etc/rc.d/jackett
 iocage exec jackett sysrc "jackett_enable=YES"
 iocage exec jackett service jackett restart
diff --git a/jails/jackett/update.sh b/jails/jackett/update.sh
index df7d983e..b5ad1679 100755
--- a/jails/jackett/update.sh
+++ b/jails/jackett/update.sh
@@ -4,6 +4,7 @@
 iocage exec jackett service jackett stop
 #TODO insert code to update jacket itself here
 iocage exec jackett chown -R jackett:jackett /usr/local/share/Jackett /config
-cp ${SCRIPT_DIR}/jails/test10/includes/jackett.rc /mnt/${global_dataset_iocage}/jails/test10/root/usr/local/etc/rc.d/jackett
+# shellcheck disable=SC2154
+cp "${SCRIPT_DIR}"/jails/test10/includes/jackett.rc /mnt/"${global_dataset_iocage}"/jails/test10/root/usr/local/etc/rc.d/jackett
 iocage exec jackett chmod u+x /usr/local/etc/rc.d/jackett
 iocage exec jackett service jackett restart
diff --git a/jails/kms/install.sh b/jails/kms/install.sh
index 6e8148c0..c7dffa88 100755
--- a/jails/kms/install.sh
+++ b/jails/kms/install.sh
@@ -6,7 +6,8 @@ iocage exec kms svn checkout https://github.com/SystemRage/py-kms/trunk/py-kms /
 iocage exec kms "pw user add kms -c kms -u 666 -d /nonexistent -s /usr/bin/nologin"
 iocage exec kms chown -R kms:kms /usr/local/share/py-kms /config
 iocage exec kms mkdir /usr/local/etc/rc.d
-cp ${SCRIPT_DIR}/jails/kms/includes/py_kms.rc /mnt/${global_dataset_iocage}/jails/kms/root/usr/local/etc/rc.d/py_kms
+# shellcheck disable=SC2154
+cp "${SCRIPT_DIR}"/jails/kms/includes/py_kms.rc /mnt/"${global_dataset_iocage}"/jails/kms/root/usr/local/etc/rc.d/py_kms
 iocage exec kms chmod u+x /usr/local/etc/rc.d/py_kms
 iocage exec kms sysrc "py_kms_enable=YES"
 iocage exec kms service py_kms start
\ No newline at end of file
diff --git a/jails/kms/update.sh b/jails/kms/update.sh
index 0f556a5e..e953f084 100755
--- a/jails/kms/update.sh
+++ b/jails/kms/update.sh
@@ -4,6 +4,7 @@
 iocage exec kms service py_kms stop
 iocage exec kms svn checkout https://github.com/SystemRage/py-kms/trunk/py-kms /usr/local/share/py-kms
 iocage exec kms chown -R kms:kms /usr/local/share/py-kms /config
-cp ${SCRIPT_DIR}/jails/kms/includes/py_kms.rc /mnt/${global_dataset_iocage}/jails/kms/root/usr/local/etc/rc.d/py_kms
+# shellcheck disable=SC2154
+cp "${SCRIPT_DIR}"/jails/kms/includes/py_kms.rc /mnt/"${global_dataset_iocage}"/jails/kms/root/usr/local/etc/rc.d/py_kms
 iocage exec kms chmod u+x /usr/local/etc/rc.d/py_kms
 iocage exec kms service py_kms start
\ No newline at end of file
diff --git a/jails/lidarr/install.sh b/jails/lidarr/install.sh
index f9308024..702d3603 100755
--- a/jails/lidarr/install.sh
+++ b/jails/lidarr/install.sh
@@ -2,12 +2,14 @@
 # This file contains the install script for lidarr
 
 # Check if dataset for completed download and it parent dataset exist, create if they do not.
-createmount lidarr ${global_dataset_downloads}
-createmount lidarr ${global_dataset_downloads}/complete /mnt/fetched
+# shellcheck disable=SC2154
+createmount lidarr "${global_dataset_downloads}"
+createmount lidarr "${global_dataset_downloads}"/complete /mnt/fetched
 
 # Check if dataset for media library and the dataset for movies exist, create if they do not.
-createmount lidarr ${global_dataset_media}
-createmount lidarr ${global_dataset_media}/music /mnt/music
+# shellcheck disable=SC2154
+createmount lidarr "${global_dataset_media}"
+createmount lidarr "${global_dataset_media}"/music /mnt/music
 
 
 iocage exec lidarr "fetch https://github.com/lidarr/Lidarr/releases/download/v0.2.0.371/Lidarr.develop.0.2.0.371.linux.tar.gz -o /usr/local/share"
@@ -16,7 +18,8 @@ iocage exec lidarr "rm /usr/local/share/Lidarr.develop.0.2.0.371.linux.tar.gz"
 iocage exec lidarr "pw user add lidarr -c lidarr -u 353 -d /nonexistent -s /usr/bin/nologin"
 iocage exec lidarr chown -R lidarr:lidarr /usr/local/share/Lidarr /config
 iocage exec lidarr mkdir /usr/local/etc/rc.d
-cp ${SCRIPT_DIR}/jails/lidarr/includes/lidarr.rc /mnt/${global_dataset_iocage}/jails/lidarr/root/usr/local/etc/rc.d/lidarr
+# shellcheck disable=SC2154
+cp "${SCRIPT_DIR}"/jails/lidarr/includes/lidarr.rc /mnt/"${global_dataset_iocage}"/jails/lidarr/root/usr/local/etc/rc.d/lidarr
 iocage exec lidarr chmod u+x /usr/local/etc/rc.d/lidarr
 iocage exec lidarr sysrc "lidarr_enable=YES"
 iocage exec lidarr service lidarr start
diff --git a/jails/lidarr/update.sh b/jails/lidarr/update.sh
index f85fefbe..a1990a7a 100755
--- a/jails/lidarr/update.sh
+++ b/jails/lidarr/update.sh
@@ -4,6 +4,7 @@
 iocage exec lidarr service lidarr stop
 #TODO insert code to update lidarr itself here
 iocage exec lidarr chown -R lidarr:lidarr /usr/local/share/lidarr /config
-cp ${SCRIPT_DIR}/jails/lidarr/includes/lidarr.rc /mnt/${global_dataset_iocage}/jails/lidarr/root/usr/local/etc/rc.d/lidarr
+# shellcheck disable=SC2154
+cp "${SCRIPT_DIR}"/jails/lidarr/includes/lidarr.rc /mnt/"${global_dataset_iocage}"/jails/lidarr/root/usr/local/etc/rc.d/lidarr
 iocage exec lidarr chmod u+x /usr/local/etc/rc.d/lidarr
 iocage exec lidarr service lidarr restart
\ No newline at end of file
diff --git a/jails/mariadb/includes/caddy b/jails/mariadb/includes/caddy
index 9c087c47..5f8df19d 100755
--- a/jails/mariadb/includes/caddy
+++ b/jails/mariadb/includes/caddy
@@ -1,4 +1,5 @@
 #!/bin/sh
+# shellcheck disable=1091,2223,2154,2034
 #
 # PROVIDE: caddy
 # REQUIRE: networking
diff --git a/jails/mariadb/install.sh b/jails/mariadb/install.sh
index 6c9d9e7d..9bf39b4e 100755
--- a/jails/mariadb/install.sh
+++ b/jails/mariadb/install.sh
@@ -8,9 +8,12 @@
 
 # Initialise defaults
 JAIL_NAME="mariadb"
-JAIL_IP="$(sed 's|\(.*\)/.*|\1|' <<<"${mariadb_ip4_addr}" )"
+# shellcheck disable=SC2154
+JAIL_IP="${mariadb_ip4_addr%/*}"
 INCLUDES_PATH="${SCRIPT_DIR}/jails/mariadb/includes"
+# shellcheck disable=SC2154
 CERT_EMAIL=${mariadb_cert_email}
+# shellcheck disable=SC2154
 DB_ROOT_PASSWORD=${mariadb_db_root_password}
 DB_NAME="MariaDB"
 DL_FLAGS=""
@@ -23,16 +26,16 @@ if [ -z "${mariadb_ip4_addr}" ]; then
 fi
 
 # Make sure DB_PATH is empty -- if not, MariaDB/PostgreSQL will choke
-
+# shellcheck disable=SC2154
 if [ "$(ls -A "/mnt/${global_dataset_config}/${JAIL_NAME}/db")" ]; then
 	echo "Reinstall of mariadb detected... Continuing"
 	REINSTALL="true"
 fi
 
 # Mount database dataset and set zfs preferences
-createmount ${JAIL_NAME} ${global_dataset_config}/${JAIL_NAME}/db /var/db/mysql
-zfs set recordsize=16K ${global_dataset_config}/${JAIL_NAME}/db
-zfs set primarycache=metadata ${global_dataset_config}/${JAIL_NAME}/db
+createmount ${JAIL_NAME} "${global_dataset_config}"/${JAIL_NAME}/db /var/db/mysql
+zfs set recordsize=16K "${global_dataset_config}"/${JAIL_NAME}/db
+zfs set primarycache=metadata "${global_dataset_config}"/${JAIL_NAME}/db
 
 iocage exec "${JAIL_NAME}" chown -R 88:88 /var/db/mysql
 
@@ -62,6 +65,7 @@ iocage exec "${JAIL_NAME}" sysrc mysql_enable="YES"
 echo "Copying Caddyfile for no SSL"
 iocage exec "${JAIL_NAME}" cp -f /mnt/includes/caddy /usr/local/etc/rc.d/
 iocage exec "${JAIL_NAME}" cp -f /mnt/includes/Caddyfile /usr/local/www/Caddyfile
+# shellcheck disable=SC2154
 iocage exec "${JAIL_NAME}" sed -i '' "s/yourhostnamehere/${mariadb_host_name}/" /usr/local/www/Caddyfile
 iocage exec "${JAIL_NAME}" sed -i '' "s/JAIL-IP/${JAIL_IP}/" /usr/local/www/Caddyfile
 
diff --git a/jails/mariadb/update.sh b/jails/mariadb/update.sh
index 2cb9fe25..c3d8ad2f 100755
--- a/jails/mariadb/update.sh
+++ b/jails/mariadb/update.sh
@@ -2,7 +2,8 @@
 # This file contains the update script for mariadb
 
 JAIL_NAME="mariadb"
-JAIL_IP="$(sed 's|\(.*\)/.*|\1|' <<<"${mariadb_ip4_addr}" )"
+# shellcheck disable=SC2154
+JAIL_IP="${mariadb_ip4_addr%/*}"
 INCLUDES_PATH="${SCRIPT_DIR}/jails/mariadb/includes"
 
 # Install includes fstab
@@ -24,6 +25,7 @@ fi
 echo "Copying Caddyfile for no SSL"
 iocage exec "${JAIL_NAME}" cp -f /mnt/includes/caddy /usr/local/etc/rc.d/
 iocage exec "${JAIL_NAME}" cp -f /mnt/includes/Caddyfile /usr/local/www/Caddyfile
+# shellcheck disable=SC2154
 iocage exec "${JAIL_NAME}" sed -i '' "s/yourhostnamehere/${mariadb_host_name}/" /usr/local/www/Caddyfile
 iocage exec "${JAIL_NAME}" sed -i '' "s/JAIL-IP/${JAIL_IP}/" /usr/local/www/Caddyfile
 
diff --git a/jails/nextcloud/includes/caddy b/jails/nextcloud/includes/caddy
index f7a9b1e4..d6e9ad35 100755
--- a/jails/nextcloud/includes/caddy
+++ b/jails/nextcloud/includes/caddy
@@ -1,4 +1,5 @@
 #!/bin/sh
+# shellcheck disable=1091,2223,2154,2034
 #
 # PROVIDE: caddy
 # REQUIRE: networking
diff --git a/jails/nextcloud/install.sh b/jails/nextcloud/install.sh
index 2b3168a6..a519faea 100755
--- a/jails/nextcloud/install.sh
+++ b/jails/nextcloud/install.sh
@@ -5,16 +5,26 @@
 
 # Initialise defaults
 JAIL_NAME="nextcloud"
-JAIL_IP="$(sed 's|\(.*\)/.*|\1|' <<<"${nextcloud_ip4_addr}" )"
+# shellcheck disable=SC2154
+JAIL_IP="${nextcloud_ip4_addr%/*}"
+# shellcheck disable=SC2154
 DATABASE="$nextcloud_database"
 INCLUDES_PATH="${SCRIPT_DIR}/jails/nextcloud/includes"
+# shellcheck disable=SC2154
 STANDALONE_CERT=${nextcloud_standalone_cert}
+# shellcheck disable=SC2154
 SELFSIGNED_CERT=${nextcloud_selfsigned_cert}
+# shellcheck disable=SC2154
 DNS_CERT=${nextcloud_dns_cert}
+# shellcheck disable=SC2154
 NO_CERT=${nextcloud_no_cert}
+# shellcheck disable=SC2154
 DL_FLAGS=${nextcloud_dl_flags}
+# shellcheck disable=SC2154
 DNS_SETTING=${nextcloud_dns_settings}
+# shellcheck disable=SC2154
 CERT_EMAIL=${nextcloud_cert_email}
+# shellcheck disable=SC2154
 HOST_NAME=${nextcloud_host_name}
 
 # Only generate new DB passwords when using buildin database
@@ -22,9 +32,13 @@ HOST_NAME=${nextcloud_host_name}
 
 if [ "${DATABASE}" = "pgsql-external" ]; then
   DB_NAME="PostgreSQL"
+  # shellcheck disable=SC2154
   DB_HOST="${nextcloud_db_host}"
+  # shellcheck disable=SC2154
   DB_DATABASE="${nextcloud_db_database}"
+  # shellcheck disable=SC2154
   DB_USER="${nextcloud_db_user}"
+  # shellcheck disable=SC2154
   DB_PASSWORD="${nextcloud_db_password}"
 elif [ "${DATABASE}" = "mariadb-external" ]; then
   DB_NAME="MariaDB"
@@ -35,7 +49,8 @@ elif [ "${DATABASE}" = "mariadb-external" ]; then
 elif [ "${DATABASE}" = "mariadb-jail" ]; then
   DB_DATABASE="nextcloud"
   DB_USER="nextcloud"
-  DB_HOST="$(sed 's|\(.*\)/.*|\1|' <<<"${mariadb_ip4_addr}"):3306"
+  # shellcheck disable=SC2154
+  DB_HOST="${mariadb_ip4_addr%/*}:3306"
   DB_PASSWORD="${nextcloud_db_password}"
 else
   echo "Invalid ${JAIL_NAME}_database selected please select one from the following options:"
@@ -84,6 +99,7 @@ if [ -z "${DB_DATABASE}" ]; then
   exit 1
 fi
 
+# shellcheck disable=SC2154
 if [ -z "${nextcloud_time_zone}" ]; then
   echo 'Configuration error: TIME_ZONE must be set'
   exit 1
@@ -92,35 +108,36 @@ if [ -z "${HOST_NAME}" ]; then
   echo 'Configuration error: HOST_NAME must be set'
   exit 1
 fi
-if [ $STANDALONE_CERT -eq 0 ] && [ $DNS_CERT -eq 0 ] && [ $NO_CERT -eq 0 ] && [ $SELFSIGNED_CERT -eq 0 ]; then
+if [ "$STANDALONE_CERT" -eq 0 ] && [ "$DNS_CERT" -eq 0 ] && [ "$NO_CERT" -eq 0 ] && [ "$SELFSIGNED_CERT" -eq 0 ]; then
   echo 'Configuration error: Either STANDALONE_CERT, DNS_CERT, NO_CERT,'
   echo 'or SELFSIGNED_CERT must be set to 1.'
   exit 1
 fi
-if [ $STANDALONE_CERT -eq 1 ] && [ $DNS_CERT -eq 1 ] ; then
+if [ "$STANDALONE_CERT" -eq 1 ] && [ "$DNS_CERT" -eq 1 ] ; then
   echo 'Configuration error: Only one of STANDALONE_CERT and DNS_CERT'
   echo 'may be set to 1.'
   exit 1
 fi
 
-if [ $DNS_CERT -eq 1 ] && [ -z "${DNS_PLUGIN}" ] ; then
+if [ "$DNS_CERT" -eq 1 ] && [ -z "${DNS_PLUGIN}" ] ; then
   echo "DNS_PLUGIN must be set to a supported DNS provider."
   echo "See https://caddyserver.com/docs under the heading of \"DNS Providers\" for list."
   echo "Be sure to omit the prefix of \"tls.dns.\"."
   exit 1
 fi  
-if [ $DNS_CERT -eq 1 ] && [ -z "${DNS_ENV}" ] ; then
+if [ "$DNS_CERT" -eq 1 ] && [ -z "${DNS_ENV}" ] ; then
   echo "DNS_ENV must be set to a your DNS provider\'s authentication credentials."
   echo "See https://caddyserver.com/docs under the heading of \"DNS Providers\" for more."
   exit 1
 fi  
 
-if [ $DNS_CERT -eq 1 ] ; then
+if [ "$DNS_CERT" -eq 1 ] ; then
   DL_FLAGS="tls.dns.${DNS_PLUGIN}"
   DNS_SETTING="dns ${DNS_PLUGIN}"
 fi
 
 # Make sure DB_PATH is empty -- if not, MariaDB/PostgreSQL will choke
+# shellcheck disable=SC2154
 if [ "$(ls -A "/mnt/${global_dataset_config}/${JAIL_NAME}/config")" ]; then
 	echo "Reinstall of Nextcloud detected... "
 	echo "External database selected, unable to verify compatibility. REINSTALL MIGHT NOT WORK... Continuing"
@@ -135,9 +152,9 @@ fi
 #####
 
 # Create and Mount Nextcloud, Config and Files
-createmount ${JAIL_NAME} ${global_dataset_config}/${JAIL_NAME}/config /usr/local/www/nextcloud/config
-createmount ${JAIL_NAME} ${global_dataset_config}/${JAIL_NAME}/themes /usr/local/www/nextcloud/themes
-createmount ${JAIL_NAME} ${global_dataset_config}/${JAIL_NAME}/files /config/files
+createmount ${JAIL_NAME} "${global_dataset_config}"/${JAIL_NAME}/config /usr/local/www/nextcloud/config
+createmount ${JAIL_NAME} "${global_dataset_config}"/${JAIL_NAME}/themes /usr/local/www/nextcloud/themes
+createmount ${JAIL_NAME} "${global_dataset_config}"/${JAIL_NAME}/files /config/files
 
 # Install includes fstab
 iocage exec "${JAIL_NAME}" mkdir -p /mnt/includes
@@ -197,7 +214,7 @@ iocage exec "${JAIL_NAME}" chown -R www:www /usr/local/www/nextcloud/
 
 
 # Generate and install self-signed cert, if necessary
-if [ $SELFSIGNED_CERT -eq 1 ] && [ ! -f "/mnt/${global_dataset_config}/${JAIL_NAME}/ssl/privkey.pem" ]; then
+if [ "$SELFSIGNED_CERT" -eq 1 ] && [ ! -f "/mnt/${global_dataset_config}/${JAIL_NAME}/ssl/privkey.pem" ]; then
 	echo "No ssl certificate present, generating self signed certificate"
 	if [ ! -d "/mnt/${global_dataset_config}/${JAIL_NAME}/ssl" ]; then
 		echo "cert folder not existing... creating..."
@@ -212,13 +229,13 @@ fi
 iocage exec "${JAIL_NAME}" cp -f /mnt/includes/php.ini /usr/local/etc/php.ini
 iocage exec "${JAIL_NAME}" cp -f /mnt/includes/redis.conf /usr/local/etc/redis.conf
 iocage exec "${JAIL_NAME}" cp -f /mnt/includes/www.conf /usr/local/etc/php-fpm.d/
-if [ $STANDALONE_CERT -eq 1 ] || [ $DNS_CERT -eq 1 ]; then
+if [ "$STANDALONE_CERT" -eq 1 ] || [ "$DNS_CERT" -eq 1 ]; then
   iocage exec "${JAIL_NAME}" cp -f /mnt/includes/remove-staging.sh /root/
 fi
-if [ $NO_CERT -eq 1 ]; then
+if [ "$NO_CERT" -eq 1 ]; then
   echo "Copying Caddyfile for no SSL"
   iocage exec "${JAIL_NAME}" cp -f /mnt/includes/Caddyfile-nossl /usr/local/www/Caddyfile
-elif [ $SELFSIGNED_CERT -eq 1 ]; then
+elif [ "$SELFSIGNED_CERT" -eq 1 ]; then
   echo "Copying Caddyfile for self-signed cert"
   iocage exec "${JAIL_NAME}" cp -f /mnt/includes/Caddyfile-selfsigned /usr/local/www/Caddyfile
 else
@@ -277,7 +294,7 @@ else
 	iocage exec "${JAIL_NAME}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set memcache.locking --value="\OC\Memcache\Redis"'
 	iocage exec "${JAIL_NAME}" su -m www -c "php /usr/local/www/nextcloud/occ config:system:set overwritehost --value=\"${HOST_NAME}\""
 	iocage exec "${JAIL_NAME}" su -m www -c "php /usr/local/www/nextcloud/occ config:system:set overwriteprotocol --value=\"https\""
-	if [ $NO_CERT -eq 1 ]; then
+	if [ "$NO_CERT" -eq 1 ]; then
 		iocage exec "${JAIL_NAME}" su -m www -c "php /usr/local/www/nextcloud/occ config:system:set overwrite.cli.url --value=\"http://${HOST_NAME}/\""
 	else
 		iocage exec "${JAIL_NAME}" su -m www -c "php /usr/local/www/nextcloud/occ config:system:set overwrite.cli.url --value=\"https://${HOST_NAME}/\""
@@ -303,7 +320,7 @@ iocage fstab -r "${JAIL_NAME}" "${INCLUDES_PATH}" /mnt/includes nullfs rw 0 0
 
 # Done!
 echo "Installation complete!"
-if [ $NO_CERT -eq 1 ]; then
+if [ "$NO_CERT" -eq 1 ]; then
   echo "Using your web browser, go to http://${HOST_NAME} to log in"
 else
   echo "Using your web browser, go to https://${HOST_NAME} to log in"
@@ -325,14 +342,14 @@ else
 fi
 
 echo ""
-if [ $STANDALONE_CERT -eq 1 ] || [ $DNS_CERT -eq 1 ]; then
+if [ "$STANDALONE_CERT" -eq 1 ] || [ "$DNS_CERT" -eq 1 ]; then
   echo "You have obtained your Let's Encrypt certificate using the staging server."
   echo "This certificate will not be trusted by your browser and will cause SSL errors"
   echo "when you connect.  Once you've verified that everything else is working"
   echo "correctly, you should issue a trusted certificate.  To do this, run:"
   echo "  iocage exec ${JAIL_NAME} /root/remove-staging.sh"
   echo ""
-elif [ $SELFSIGNED_CERT -eq 1 ]; then
+elif [ "$SELFSIGNED_CERT" -eq 1 ]; then
   echo "You have chosen to create a self-signed TLS certificate for your Nextcloud"
   echo "installation.  This certificate will not be trusted by your browser and"
   echo "will cause SSL errors when you connect.  If you wish to replace this certificate"
diff --git a/jails/organizr/install.sh b/jails/organizr/install.sh
index 4f5e55ed..951ff0d8 100755
--- a/jails/organizr/install.sh
+++ b/jails/organizr/install.sh
@@ -8,10 +8,11 @@ iocage exec organizr sed -i '' -e 's/;listen.mode = 0660/listen.mode = 0600/g' /
 iocage exec organizr cp /usr/local/etc/php.ini-production /usr/local/etc/php.ini
 iocage exec organizr sed -i '' -e 's?;date.timezone =?date.timezone = "Universal"?g' /usr/local/etc/php.ini
 iocage exec organizr sed -i '' -e 's?;cgi.fix_pathinfo=1?cgi.fix_pathinfo=0?g' /usr/local/etc/php.ini
-mv /mnt/${global_dataset_iocage}/jails/organizr/root/usr/local/etc/nginx/nginx.conf /mnt/${global_dataset_iocage}/jails/organizr/root/usr/local/etc/nginx/nginx.conf.bak
-cp ${SCRIPT_DIR}/jails/organizr/includes/nginx.conf /mnt/${global_dataset_iocage}/jails/organizr/root/usr/local/etc/nginx/nginx.conf
-cp -Rf ${SCRIPT_DIR}/jails/organizr/includes/custom /mnt/${global_dataset_iocage}/jails/organizr/root/usr/local/etc/nginx/custom
-
+# shellcheck disable=SC2154
+mv /mnt/"${global_dataset_iocage}"/jails/organizr/root/usr/local/etc/nginx/nginx.conf /mnt/"${global_dataset_iocage}"/jails/organizr/root/usr/local/etc/nginx/nginx.conf.bak
+cp "${SCRIPT_DIR}"/jails/organizr/includes/nginx.conf /mnt/"${global_dataset_iocage}"/jails/organizr/root/usr/local/etc/nginx/nginx.conf
+cp -Rf "${SCRIPT_DIR}"/jails/organizr/includes/custom /mnt/"${global_dataset_iocage}"/jails/organizr/root/usr/local/etc/nginx/custom
+# shellcheck disable=SC2154
 if [ ! -d "/mnt/${global_dataset_config}/organizr/ssl" ]; then
 	echo "cert folder doesn't exist... creating..."
 	iocage exec organizr mkdir /config/ssl
@@ -21,7 +22,7 @@ if [ -f "/mnt/${global_dataset_config}/organizr/ssl/Organizr-Cert.crt" ]; then
     echo "certificate exists... Skipping cert generation"
 else
 	echo "No ssl certificate present, generating self signed certificate"
-	openssl req -new -newkey rsa:2048 -days 365 -nodes -x509 -subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=localhost" -keyout /mnt/${global_dataset_config}/organizr/ssl/Organizr-Cert.key -out /mnt/${global_dataset_config}/organizr/ssl/Organizr-Cert.crt
+	openssl req -new -newkey rsa:2048 -days 365 -nodes -x509 -subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=localhost" -keyout /mnt/"${global_dataset_config}"/organizr/ssl/Organizr-Cert.key -out /mnt/"${global_dataset_config}"/organizr/ssl/Organizr-Cert.crt
 fi
 
 iocage exec organizr git clone https://github.com/causefx/Organizr.git /usr/local/www/Organizr
diff --git a/jails/organizr/update.sh b/jails/organizr/update.sh
index 173c47e9..b24f1154 100755
--- a/jails/organizr/update.sh
+++ b/jails/organizr/update.sh
@@ -1,11 +1,11 @@
 #!/usr/local/bin/bash
 # This file contains the update script for Organizr
 
-
 iocage exec organizr service nginx stop
 iocage exec organizr service php-fpm stop
 # TODO setup cli update for Organizr here.
-cp ${SCRIPT_DIR}/jails/organizr/includes/nginx.conf /mnt/${global_dataset_iocage}/jails/organizr/root/usr/local/etc/nginx/nginx.conf
+# shellcheck disable=SC2154
+cp "${SCRIPT_DIR}"/jails/organizr/includes/nginx.conf /mnt/"${global_dataset_iocage}"/jails/organizr/root/usr/local/etc/nginx/nginx.conf
 iocage exec organizr "cd /usr/local/www/Organizr && git pull"
 iocage exec organizr chown -R www:www /usr/local/www /config /usr/local/etc/nginx/nginx.conf /usr/local/etc/nginx/custom
 iocage exec organizr service nginx start
diff --git a/jails/plex/install.sh b/jails/plex/install.sh
index 460784bf..cdeb3803 100755
--- a/jails/plex/install.sh
+++ b/jails/plex/install.sh
@@ -5,20 +5,23 @@ iocage exec plex mkdir -p /usr/local/etc/pkg/repos
 
 
 # Change to to more frequent FreeBSD repo to stay up-to-date with plex more.
-cp ${SCRIPT_DIR}/jails/plex/includes/FreeBSD.conf /mnt/${global_dataset_iocage}/jails/plex/root/usr/local/etc/pkg/repos/FreeBSD.conf
+# shellcheck disable=SC2154
+cp "${SCRIPT_DIR}"/jails/plex/includes/FreeBSD.conf /mnt/"${global_dataset_iocage}"/jails/plex/root/usr/local/etc/pkg/repos/FreeBSD.conf
 
 
 # Check if datasets for media librarys exist, create them if they do not.
-createmount plex ${global_dataset_media} /mnt/media
-createmount plex ${global_dataset_media}/movies /mnt/media/movies
-createmount plex ${global_dataset_media}/music /mnt/media/music
-createmount plex ${global_dataset_media}/shows /mnt/media/shows
+# shellcheck disable=SC2154
+createmount plex "${global_dataset_media}" /mnt/media
+createmount plex "${global_dataset_media}"/movies /mnt/media/movies
+createmount plex "${global_dataset_media}"/music /mnt/media/music
+createmount plex "${global_dataset_media}"/shows /mnt/media/shows
 
 # Create plex ramdisk if specified
+# shellcheck disable=SC2154
 if [ -z "${plex_ramdisk}" ]; then
 	echo "no ramdisk specified for plex, continuing without randisk"
 else
-	iocage fstab -a plex tmpfs /tmp_transcode tmpfs rw,size=${plex_ramdisk},mode=1777 0 0
+	iocage fstab -a plex tmpfs /tmp_transcode tmpfs rw,size="${plex_ramdisk}",mode=1777 0 0
 fi
 
 iocage exec plex chown -R plex:plex /config
@@ -31,6 +34,7 @@ iocage exec plex pkg upgrade -y
 iocage exec plex pw groupmod -n video -m plex
 
 # Run different install procedures depending on Plex vs Plex Beta
+# shellcheck disable=SC2154
 if [ "$plex_beta" == "true" ]; then
 	echo "beta enabled in config.yml... using plex beta for install"
 	iocage exec plex sysrc "plexmediaserver_plexpass_enable=YES"
diff --git a/jails/plex/update.sh b/jails/plex/update.sh
index a9f7b7d4..ca01432a 100755
--- a/jails/plex/update.sh
+++ b/jails/plex/update.sh
@@ -2,6 +2,7 @@
 # This file contains the update script for Plex
 
 # Run different update procedures depending on Plex vs Plex Beta
+# shellcheck disable=SC2154
 if [ "$plex_plexpass" == "true" ]; then
 	echo "beta enabled in config.yml... using plex beta for update..."
 	iocage exec plex service plexmediaserver_plexpass stop
diff --git a/jails/radarr/install.sh b/jails/radarr/install.sh
index 06e6e1f0..d8305480 100755
--- a/jails/radarr/install.sh
+++ b/jails/radarr/install.sh
@@ -2,12 +2,14 @@
 # This file contains the install script for radarr
 
 # Check if dataset for completed download and it parent dataset exist, create if they do not.
-createmount radarr ${global_dataset_downloads}
-createmount radarr ${global_dataset_downloads}/complete /mnt/fetched
+# shellcheck disable=SC2154
+createmount radarr "${global_dataset_downloads}"
+createmount radarr "${global_dataset_downloads}"/complete /mnt/fetched
 
 # Check if dataset for media library and the dataset for movies exist, create if they do not.
-createmount radarr ${global_dataset_media}
-createmount radarr ${global_dataset_media}/movies /mnt/movies
+# shellcheck disable=SC2154
+createmount radarr "${global_dataset_media}"
+createmount radarr "${global_dataset_media}"/movies /mnt/movies
 
 iocage exec radarr "fetch https://github.com/Radarr/Radarr/releases/download/v0.2.0.1480/Radarr.develop.0.2.0.1480.linux.tar.gz -o /usr/local/share"
 iocage exec radarr "tar -xzvf /usr/local/share/Radarr.develop.0.2.0.1480.linux.tar.gz -C /usr/local/share"
@@ -15,7 +17,8 @@ iocage exec radarr rm /usr/local/share/Radarr.develop.0.2.0.1480.linux.tar.gz
 iocage exec radarr "pw user add radarr -c radarr -u 352 -d /nonexistent -s /usr/bin/nologin"
 iocage exec radarr chown -R radarr:radarr /usr/local/share/Radarr /config
 iocage exec radarr mkdir /usr/local/etc/rc.d
-cp ${SCRIPT_DIR}/jails/radarr/includes/radarr.rc /mnt/${global_dataset_iocage}/jails/radarr/root/usr/local/etc/rc.d/radarr
+# shellcheck disable=SC2154
+cp "${SCRIPT_DIR}"/jails/radarr/includes/radarr.rc /mnt/"${global_dataset_iocage}"/jails/radarr/root/usr/local/etc/rc.d/radarr
 iocage exec radarr chmod u+x /usr/local/etc/rc.d/radarr
 iocage exec radarr sysrc "radarr_enable=YES"
 iocage exec radarr service radarr restart
diff --git a/jails/radarr/update.sh b/jails/radarr/update.sh
index 9b3afca0..b527d0ce 100755
--- a/jails/radarr/update.sh
+++ b/jails/radarr/update.sh
@@ -4,6 +4,7 @@
 iocage exec radarr service radarr stop
 #TODO insert code to update radarr itself here
 iocage exec radarr chown -R radarr:radarr /usr/local/share/Radarr /config
-cp ${SCRIPT_DIR}/jails/radarr/includes/radarr.rc /mnt/${global_dataset_iocage}/jails/radarr/root/usr/local/etc/rc.d/radarr
+# shellcheck disable=SC2154
+cp "${SCRIPT_DIR}"/jails/radarr/includes/radarr.rc /mnt/"${global_dataset_iocage}"/jails/radarr/root/usr/local/etc/rc.d/radarr
 iocage exec radarr chmod u+x /usr/local/etc/rc.d/radarr
 iocage exec radarr service radarr restart
\ No newline at end of file
diff --git a/jails/sonarr/install.sh b/jails/sonarr/install.sh
index ccc2048e..b63614b9 100755
--- a/jails/sonarr/install.sh
+++ b/jails/sonarr/install.sh
@@ -2,12 +2,14 @@
 # This file contains the install script for sonarr
 
 # Check if dataset for completed download and it parent dataset exist, create if they do not.
-createmount sonarr ${global_dataset_downloads}
-createmount sonarr ${global_dataset_downloads}/complete /mnt/fetched
+# shellcheck disable=SC2154
+createmount sonarr "${global_dataset_downloads}"
+createmount sonarr "${global_dataset_downloads}"/complete /mnt/fetched
 
 # Check if dataset for media library and the dataset for tv shows exist, create if they do not.
-createmount sonarr ${global_dataset_media}
-createmount sonarr ${global_dataset_media}/shows /mnt/shows
+# shellcheck disable=SC2154
+createmount sonarr "${global_dataset_media}"
+createmount sonarr "${global_dataset_media}"/shows /mnt/shows
 
 iocage exec sonarr "fetch http://download.sonarr.tv/v2/master/mono/NzbDrone.master.tar.gz -o /usr/local/share"
 iocage exec sonarr "tar -xzvf /usr/local/share/NzbDrone.master.tar.gz -C /usr/local/share"
@@ -15,7 +17,8 @@ iocage exec sonarr rm /usr/local/share/NzbDrone.master.tar.gz
 iocage exec sonarr "pw user add sonarr -c sonarr -u 351 -d /nonexistent -s /usr/bin/nologin"
 iocage exec sonarr chown -R sonarr:sonarr /usr/local/share/NzbDrone /config
 iocage exec sonarr mkdir /usr/local/etc/rc.d
-cp ${SCRIPT_DIR}/jails/sonarr/includes/sonarr.rc /mnt/${global_dataset_iocage}/jails/sonarr/root/usr/local/etc/rc.d/sonarr
+# shellcheck disable=SC2154
+cp "${SCRIPT_DIR}"/jails/sonarr/includes/sonarr.rc /mnt/"${global_dataset_iocage}"/jails/sonarr/root/usr/local/etc/rc.d/sonarr
 iocage exec sonarr chmod u+x /usr/local/etc/rc.d/sonarr
 iocage exec sonarr sysrc "sonarr_enable=YES"
 iocage exec sonarr service sonarr restart
diff --git a/jails/sonarr/update.sh b/jails/sonarr/update.sh
index 7774c866..47f94384 100755
--- a/jails/sonarr/update.sh
+++ b/jails/sonarr/update.sh
@@ -4,6 +4,7 @@
 iocage exec sonarr service sonarr stop
 #TODO insert code to update sonarr itself here
 iocage exec sonarr chown -R sonarr:sonarr /usr/local/share/NzbDrone /config
-cp ${SCRIPT_DIR}/jails/sonarr/includes/sonarr.rc /mnt/${global_dataset_iocage}/jails/sonarr/root/usr/local/etc/rc.d/sonarr
+# shellcheck disable=SC2154
+cp "${SCRIPT_DIR}"/jails/sonarr/includes/sonarr.rc /mnt/"${global_dataset_iocage}"/jails/sonarr/root/usr/local/etc/rc.d/sonarr
 iocage exec sonarr chmod u+x /usr/local/etc/rc.d/sonarr
 iocage exec sonarr service sonarr restart
\ No newline at end of file
diff --git a/jails/transmission/install.sh b/jails/transmission/install.sh
index f2af7b55..43c298c5 100755
--- a/jails/transmission/install.sh
+++ b/jails/transmission/install.sh
@@ -2,13 +2,14 @@
 # This file contains the install script for transmission
 
 # Check if dataset Downloads dataset exist, create if they do not.
-createmount transmission ${global_dataset_downloads} /mnt/downloads
+# shellcheck disable=SC2154
+createmount transmission "${global_dataset_downloads}" /mnt/downloads
 
 # Check if dataset Complete Downloads dataset exist, create if they do not.
-createmount transmission ${global_dataset_downloads}/complete /mnt/downloads/complete
+createmount transmission "${global_dataset_downloads}"/complete /mnt/downloads/complete
 
 # Check if dataset InComplete Downloads dataset exist, create if they do not.
-createmount transmission ${global_dataset_downloads}/incomplete /mnt/downloads/incomplete
+createmount transmission "${global_dataset_downloads}"/incomplete /mnt/downloads/incomplete
 
 
 iocage exec transmission chown -R transmission:transmission /config
diff --git a/placeholder b/placeholder
deleted file mode 100644
index e69de29b..00000000

From 2c75cfe0ea0556aab1329259da985e84542fe6dc Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sun, 26 Apr 2020 16:00:47 +0200
Subject: [PATCH 096/147] Wiki replacement and CI update (#86)

* dhcp uses on, not true (because iocage syntax)

* Documentation updates

* Add gh-pages wiki generator using mkdocs

* Update shellcheck.yml

* Update wiki.yml

* Add filecheck

* readme case correction1

* readme case correction2

* Update filecheck.yml
---
 .github/workflows/filecheck.yml          | 21 ++++++
 .github/workflows/shellcheck.yml         |  4 +-
 .github/workflows/wiki.yml               | 26 +++++++
 docs/LICENSE => LICENSE                  |  0
 docs/CONTRIBUTING.md                     | 90 ++++++++++++++++++++++++
 docs/ISSUE_TEMPLATE.md                   | 13 ++++
 docs/PULL_REQUEST_TEMPLATE.md            | 16 +++++
 docs/Readme.md                           |  2 +-
 docs/config options.md                   | 10 ++-
 docs/index.md                            |  5 ++
 docs/jails/jails.md                      |  1 +
 docs/test.md                             |  1 +
 jails/bitwarden/readme.md                |  5 +-
 jails/influxdb/readme.md                 |  4 +-
 jails/kms/readme.md                      |  3 +-
 jails/lidarr/readme.md                   |  4 +-
 jails/mariadb/readme.md                  |  4 +-
 jails/nextcloud/{README.md => readme.md} |  4 +-
 jails/organizr/readme.md                 |  4 +-
 jails/radarr/readme.md                   |  4 +-
 jails/sonarr/readme.md                   |  4 +-
 jails/tautulli/readme.md                 |  4 +-
 jails/transmission/readme.md             |  4 +-
 mkdocs.yml                               | 23 ++++++
 wiki/Home.md                             |  3 -
 wiki/test.md                             |  1 -
 26 files changed, 239 insertions(+), 21 deletions(-)
 create mode 100644 .github/workflows/filecheck.yml
 create mode 100644 .github/workflows/wiki.yml
 rename docs/LICENSE => LICENSE (100%)
 create mode 100644 docs/CONTRIBUTING.md
 create mode 100644 docs/ISSUE_TEMPLATE.md
 create mode 100644 docs/PULL_REQUEST_TEMPLATE.md
 create mode 100644 docs/index.md
 create mode 100644 docs/jails/jails.md
 create mode 100644 docs/test.md
 rename jails/nextcloud/{README.md => readme.md} (99%)
 mode change 100755 => 100644
 create mode 100644 mkdocs.yml
 delete mode 100644 wiki/Home.md
 delete mode 100644 wiki/test.md

diff --git a/.github/workflows/filecheck.yml b/.github/workflows/filecheck.yml
new file mode 100644
index 00000000..1ba68643
--- /dev/null
+++ b/.github/workflows/filecheck.yml
@@ -0,0 +1,21 @@
+name: File Presence QC
+on:
+  pull_request:
+    branches:
+      - master
+      - dev
+
+jobs:
+  build:
+    name: Check Files
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: check existance
+        run: |
+         for pathname in jails/*; do test -e $pathname/readme.md || { echo "File missing: $pathname/readme.md"; error="true"; }; done
+         for pathname in jails/*; do test -e $pathname/install.sh || { echo "File missing: $pathname/install.sh"; error="true"; }; done
+         for pathname in jails/*; do test -e $pathname/update.sh || { echo "File missing: $pathname/update.sh"; error="true"; }; done
+         for pathname in jails/*; do test -e $pathname/config.yml || { echo "File missing: $pathname/config.yml"; error="true"; }; done
+         if [ "${error}" == "true" ]; then echo "Missing files detected" && exit 1; fi
+        shell: bash
diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml
index 533096fd..e5d12b6f 100644
--- a/.github/workflows/shellcheck.yml
+++ b/.github/workflows/shellcheck.yml
@@ -1,5 +1,5 @@
 # This is a workflow to run shellcheck on all scripts
-name: Shellcheck Workflow
+name: Shell Linter QC
 
 # Controls when the action will run. Triggers the workflow on push or pull request 
 # events but only for the master branch
@@ -10,7 +10,7 @@ on:
       - dev
 
 jobs:
-  shellcheck:
+  Shellcheck:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
diff --git a/.github/workflows/wiki.yml b/.github/workflows/wiki.yml
new file mode 100644
index 00000000..d87b3899
--- /dev/null
+++ b/.github/workflows/wiki.yml
@@ -0,0 +1,26 @@
+name: Publish docs via GitHub Pages
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    name: Deploy docs
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout master
+        uses: actions/checkout@v1
+        with:
+          ref: 'master'
+      - name: rename-readme
+        run: |
+          for pathname in jails/*/README.MD; do ! cp "$pathname" "docs/jails/$( basename "$( dirname "$pathname" )" ).md"; done
+          for pathname in jails/*/README.md; do ! cp "$pathname" "docs/jails/$( basename "$( dirname "$pathname" )" ).md"; done 
+          for pathname in jails/*/readme.md; do ! cp "$pathname" "docs/jails/$( basename "$( dirname "$pathname" )" ).md"; done
+          for pathname in jails/*/Readme.md; do ! cp "$pathname" "docs/jails/$( basename "$( dirname "$pathname" )" ).md"; done
+        shell: bash
+      - name: Deploy docs
+        uses: mhausenblas/mkdocs-deploy-gh-pages@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.WIKI_GH_PAT }}
diff --git a/docs/LICENSE b/LICENSE
similarity index 100%
rename from docs/LICENSE
rename to LICENSE
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
new file mode 100644
index 00000000..b42eac40
--- /dev/null
+++ b/docs/CONTRIBUTING.md
@@ -0,0 +1,90 @@
+# Contribution and Review Guidelines
+
+This project welcomes any and all input, but we need to have a few quality guidelines. These guidelines will be examplained here, in this document.
+
+### GIT Guidelines
+***
+#### New to GIT
+
+If you have never used git before, you can look up our general reference on our wiki. 
+
+#### Git and You
+
+GIT is a fantastic system, but while using it we have a few guidelines to keep it fantastic for everyone. 
+
+* Submit complete PR's.
+* Add [DNM] if you do not want your PR merged yet.
+* Always try and fill in the whole form, even for small PR's.
+* Don't close when a reviewer requests changes (just push the changes or ask for help).
+* Explain what you did in your PR.
+* Be thorough.
+* If you can add screenshots to clarify.
+* Always try to add "Fixes #000" (where 000 is the Issue your PR fixes)
+* found something you want to fix yourself? Please do make an issue too.
+
+### Structure Guidelines
+***
+#### Naming scheme
+
+File and folder names are important and making mistakes in them may give conflicts an/or annoyance in the future. Remember, your garbage needs to be cleaned by someone sometime in the future! For that reason, we have a few guidelines in regards to naming files and folder.
+
+* Always start files and folders WITHOUT a Capital.
+
+#### Inclusion of files and folders
+
+Although GIT is quite friendly in what it accepts in terms of files and folder changes in a commit, a reviewer's or bugfixer's time is not unlimited. For that reason, we have a few specific guidelines in regards to the inclusion of files and folders in your PR.
+
+* Only include files you actually changed.
+* Try not to include multiple changes in one PR
+* Want to change the formatting of multiple files too? Make a separate PR.
+
+*Always include the following files when creating a new jail*
+
+- install.sh
+- update.sh
+- readme.md
+- config.yml
+
+
+### Code Guidelines
+***
+#### Your code, your style, my review
+
+Here at jailman, we value people having their own style. But your code needs to be reviewable and editable by others too. For that reason, we have a few basic coding guidelines
+
+* **Always** explain regex in a comment within your code.
+* Write simple code and don't try to impress.
+* We will run (Basic) automated reformating of code once in a while.
+* Document your changes in your code and if need be, on the wiki.
+* All PR's should be able to pass our automated shellcheck.
+* It's okey to add shellcheck ignores, but only AFTER you checked the warning!
+
+#### jail requirements
+
+- Jails should always save user-specific data in a persistant location. Which is the location specified in the config.yml file under "config:", which is automatically mounted to every jail under /config. There should be no user specific data in the jail itself
+- Jails should not require the user to edit any config file themselves. All config changes should be automated
+- Jails should not use default passwords, the user should always be forced(!) to put credentials in config.yml manually
+
+
+### Review Guidelines
+***
+Even us review gods need some guidelines once in a while.
+
+* Let people learn from their mistakes
+* Review instead of merging without comments
+* Abide by these guidelines in your review
+* Tests exist for a reason. Don't merge with test-failures
+
+
+
+### Todo vs Feature vs bug:
+***
+Please take note of the difference between a TODO and Feature
+
+* Bug: An unexpected behavior of the script or a crash. Including, but not limited to, errors and warnings.
+* Todo: When you come across something that needs tweaking/adding during development, is not an unexpected behavior
+* Feature: When you, out of personal preference, want something added or changed.
+
+### That's it!
+***
+Someone will come along and review the changes. If everything looks good then they will merge it with the main repo. If you need any help don't be afraid to ask in the discord channel: [https://discord.gg/tFcTpBp](https://discord.gg/tFcTpBp)
diff --git a/docs/ISSUE_TEMPLATE.md b/docs/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000..89fb703e
--- /dev/null
+++ b/docs/ISSUE_TEMPLATE.md
@@ -0,0 +1,13 @@
+# Issue Template
+
+## Description
+
+### Detailed Bug Report
+It helps if you include any relevant code / config (for describing how new features should work), images, gifs, or youtube videos!
+
+### Steps to Reproduce
+Please enter the steps to reproduce the bug or behaviour:  
+
+1.  
+2.  
+3.  
\ No newline at end of file
diff --git a/docs/PULL_REQUEST_TEMPLATE.md b/docs/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..ed2f76f0
--- /dev/null
+++ b/docs/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,16 @@
+# Pull Request Template
+
+### Purpose
+_Describe the problem the PR fixes or the feature it introduces_<br>
+_Don't forget to use "Fixes #issuenumber" to select issues and auto close them on merge_
+
+### Notes:
+_Please enter any other relevant information here_
+
+### Please make sure you have followed the self checks below before submitting a PR:
+
+- [ ] Code is sufficiently commented
+- [ ] Code is indented with tabs and not spaces
+- [ ] The PR does not bring up any new errors
+- [ ] The PR has been tested
+- [ ] Any new files are named using lowercase (to avoid issues on case sensitive file systems)
diff --git a/docs/Readme.md b/docs/Readme.md
index 6b48c6a6..b7df9438 100644
--- a/docs/Readme.md
+++ b/docs/Readme.md
@@ -5,7 +5,7 @@
 
 ---
 
-[![GitHub last commit](https://img.shields.io/github/last-commit/ornias1993/jailman/dev.svg)](https://github.com/ornias1993/jailman/commits/dev) [![Krihelimeter](http://www.krihelinator.xyz/badge/ornias1993/jailman)](http://www.krihelinator.xyz/repositories/ornias1993/jailman) [![GitHub Release](https://img.shields.io/github/release/ornias1993/jailman.svg)](https://github.com/ornias1993/jailman/releases/latest) [![License: GPL v2](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](https://github.com/ornias1993/jailman/blob/master/docs/LICENSE.GPLV2) [![License](https://img.shields.io/badge/License-BSD%202--Clause-orange.svg)](https://github.com/ornias1993/jailman/blob/master/docs/LICENSE.BSD2)
+[![GitHub last commit](https://img.shields.io/github/last-commit/ornias1993/jailman/dev.svg)](https://github.com/ornias1993/jailman/commits/dev) [![GitHub Release](https://img.shields.io/github/release/ornias1993/jailman.svg)](https://github.com/ornias1993/jailman/releases/latest) [![License: GPL v2](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](https://github.com/ornias1993/jailman/blob/master/docs/LICENSE.GPLV2) [![License](https://img.shields.io/badge/License-BSD%202--Clause-orange.svg)](https://github.com/ornias1993/jailman/blob/master/docs/LICENSE.BSD2)
 
 ## Intro
 
diff --git a/docs/config options.md b/docs/config options.md
index 8c0c4b93..111ba452 100644
--- a/docs/config options.md	
+++ b/docs/config options.md	
@@ -35,10 +35,14 @@ Some datasets are auto created and can not be changed from the config file. This
 ## General config options
 
 ### Networking
+
+Please be aware that dhcp is not actively supported, many of the jails depend on having a fixed IP-adress in the config file.
+Some also depend on other jails having a fixed IP in the config file. Use of DHCP is on your own risk and might not work.
+
 - ip4_addr: To set a static IP (recommended), enter the desired ip address here. Leave blank (or remove the line) for DHCP.
-- gateway: Set the gateway IP for static IP setup. Leave blank (or remove the line) for DHCP.
+- gateway: Set the gateway IP for static IP setup. Leave blank (or remove the line) for DHCP. 
 
 ### Advanced
 - interfaces: Set the "interfaces" flag for iocage. Example: `vnet0:bridge0` (optional)
-- dhcp: Set to force DHCP (not required for DHCP, see above)
-- pkgs: Override the to-be-install packages for this jail (might break now or break updates)
+- dhcp: Set to "on" to force DHCP (not required for DHCP, see above)
+- pkgs: Override the to-be-install packages for this jail (might break now or break updates)
\ No newline at end of file
diff --git a/docs/index.md b/docs/index.md
new file mode 100644
index 00000000..f2dbf1aa
--- /dev/null
+++ b/docs/index.md
@@ -0,0 +1,5 @@
+# Introduction 
+Welcome to Jailam. An open source effort to create an easy management tool for Freenas Jails.
+
+As this project is in its early stages, this wiki will serve the purpose of providing a foundation and a almost (not) up-to-date scripting reference to the underlying structure of jailman.
+
diff --git a/docs/jails/jails.md b/docs/jails/jails.md
new file mode 100644
index 00000000..9daeafb9
--- /dev/null
+++ b/docs/jails/jails.md
@@ -0,0 +1 @@
+test
diff --git a/docs/test.md b/docs/test.md
new file mode 100644
index 00000000..e440e5c8
--- /dev/null
+++ b/docs/test.md
@@ -0,0 +1 @@
+3
\ No newline at end of file
diff --git a/jails/bitwarden/readme.md b/jails/bitwarden/readme.md
index b698d7fc..4438ddc8 100755
--- a/jails/bitwarden/readme.md
+++ b/jails/bitwarden/readme.md
@@ -1,4 +1,7 @@
-# Original README from the Bitwarden_rs github:
+# Bitwarden_RS
+
+
+## Original README from the Bitwarden_rs github:
 
 https://github.com/dani-garcia/bitwarden_rs
 
diff --git a/jails/influxdb/readme.md b/jails/influxdb/readme.md
index 446c9c9f..dd4c5003 100644
--- a/jails/influxdb/readme.md
+++ b/jails/influxdb/readme.md
@@ -1,4 +1,6 @@
-# Original README from the influxdb github:
+# InfluxDB
+
+## Original README from the influxdb github:
 
 https://github.com/influxdata/influxdb
 
diff --git a/jails/kms/readme.md b/jails/kms/readme.md
index 7c55dd7f..298e6987 100755
--- a/jails/kms/readme.md
+++ b/jails/kms/readme.md
@@ -1,5 +1,6 @@
+# Py-KMS
 
-# Original README from the py-kms github:
+## Original README from the py-kms github:
 
 https://github.com/SystemRage/py-kms
 
diff --git a/jails/lidarr/readme.md b/jails/lidarr/readme.md
index d73b6bff..6347fad9 100755
--- a/jails/lidarr/readme.md
+++ b/jails/lidarr/readme.md
@@ -1,4 +1,6 @@
-# Original README from the lidarr github:
+# Lidarr
+
+## Original README from the lidarr github:
 
 https://github.com/lidarr/Lidarr
 
diff --git a/jails/mariadb/readme.md b/jails/mariadb/readme.md
index 532bf0b6..d486c586 100755
--- a/jails/mariadb/readme.md
+++ b/jails/mariadb/readme.md
@@ -1,4 +1,6 @@
-# Original README from the mariadb github:
+# MariaDB
+
+## Original README from the mariadb github:
 
 https://github.com/MariaDB/server/
 
diff --git a/jails/nextcloud/README.md b/jails/nextcloud/readme.md
old mode 100755
new mode 100644
similarity index 99%
rename from jails/nextcloud/README.md
rename to jails/nextcloud/readme.md
index aa4ee344..c8dc67db
--- a/jails/nextcloud/README.md
+++ b/jails/nextcloud/readme.md
@@ -1,4 +1,6 @@
-# Original README from the Upstream Nextcloud-iocage install script:
+# Nextcloud
+
+## Original README from the Upstream Nextcloud-iocage install script:
 
 https://github.com/danb35/freenas-iocage-nextcloud
 
diff --git a/jails/organizr/readme.md b/jails/organizr/readme.md
index 19525226..675769af 100755
--- a/jails/organizr/readme.md
+++ b/jails/organizr/readme.md
@@ -1,4 +1,6 @@
-# Original README from the Organizr github repo:
+# Organizr
+
+## Original README from the Organizr github repo:
 
 https://github.com/causefx/Organizr
 
diff --git a/jails/radarr/readme.md b/jails/radarr/readme.md
index 14337343..9dc41df9 100755
--- a/jails/radarr/readme.md
+++ b/jails/radarr/readme.md
@@ -1,4 +1,6 @@
-# Original README from the radarr github:
+# Radarr
+
+## Original README from the radarr github:
 
 https://github.com/Radarr/Radarr
 
diff --git a/jails/sonarr/readme.md b/jails/sonarr/readme.md
index b6f379b6..0edcb9cb 100755
--- a/jails/sonarr/readme.md
+++ b/jails/sonarr/readme.md
@@ -1,4 +1,6 @@
-# Original README from the sonarr github:
+# Sonarr
+
+## Original README from the sonarr github:
 
 https://github.com/Sonarr/Sonarr
 
diff --git a/jails/tautulli/readme.md b/jails/tautulli/readme.md
index db612709..6d4c4855 100755
--- a/jails/tautulli/readme.md
+++ b/jails/tautulli/readme.md
@@ -1,4 +1,6 @@
-# Original README from the tautulli github:
+# Tautulli
+
+## Original README from the tautulli github:
 
 https://github.com/Tautulli/Tautulli
 
diff --git a/jails/transmission/readme.md b/jails/transmission/readme.md
index a2573b3d..55f50f47 100755
--- a/jails/transmission/readme.md
+++ b/jails/transmission/readme.md
@@ -1,4 +1,6 @@
-# Original README from the transmission github:
+# Transmission
+
+## Original README from the transmission github:
 
 https://github.com/transmission/transmission
 
diff --git a/mkdocs.yml b/mkdocs.yml
new file mode 100644
index 00000000..8bccf8b0
--- /dev/null
+++ b/mkdocs.yml
@@ -0,0 +1,23 @@
+# Project Information
+site_name: JailMan
+site_description: 'Project Design and Documentation for development'
+site_author: 'Ornias1993'
+site_url: 'https://ornias1993.github.io/jailman/'
+
+# Repository
+repo_name: 'ornias1993/jailman'
+repo_url: 'https://github.com/Ornias1993/jailman/'
+edit_uri: 'edit/dev/docs/'
+
+theme:
+  name: 'material'
+  features:
+    - tabs
+  language: 'en'
+    
+markdown_extensions:
+  - admonition
+  - codehilite:
+      guess_lang: false
+  - toc:
+      permalink: true
\ No newline at end of file
diff --git a/wiki/Home.md b/wiki/Home.md
deleted file mode 100644
index ae97c2b6..00000000
--- a/wiki/Home.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Welcome to the jailman wiki!
-
-This wiki is automatically generated from the .md files located in either the /wiki or the /jails// directories.
diff --git a/wiki/test.md b/wiki/test.md
deleted file mode 100644
index 45c0a5a8..00000000
--- a/wiki/test.md
+++ /dev/null
@@ -1 +0,0 @@
-wiki test placeholder

From 8659f2c25294380f95d3040b92e212a75a735af1 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sun, 26 Apr 2020 17:56:13 +0200
Subject: [PATCH 097/147] Fixes for recent changes (#87)

* some fixes

* set fixes

* some rest

* add shellcheck ignore and explaination

* fix iocage install dir not being exported

* reset branch to dev
---
 config.yml.example | 35 +++++++++++++++++++++++++++++++++++
 global.sh          | 12 ++++++------
 jailman.sh         |  2 ++
 3 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/config.yml.example b/config.yml.example
index 50b4b9a8..81372f11 100644
--- a/config.yml.example
+++ b/config.yml.example
@@ -28,8 +28,43 @@ example: example
   pkgs: mono
   
 plex: plex
+  ip4_addr: 192.168.1.99/24
+  gateway: 192.168.1.1
   beta: false
 
+lidarr: lidarr
+  ip4_addr: 192.168.1.99/24
+  gateway: 192.168.1.1
+  
+sonarr: sonarr
+  ip4_addr: 192.168.1.99/24
+  gateway: 192.168.1.1
+  
+radarr: radarr
+  ip4_addr: 192.168.1.99/24
+  gateway: 192.168.1.1
+  
+kms: kms
+  ip4_addr: 192.168.1.99/24
+  gateway: 192.168.1.1
+
+jackett: jackett
+  ip4_addr: 192.168.1.99/24
+  gateway: 192.168.1.1
+  
+organizr: organizr
+  ip4_addr: 192.168.1.99/24
+  gateway: 192.168.1.1
+  
+tautulli: tautulli
+  ip4_addr: 192.168.1.99/24
+  gateway: 192.168.1.1
+
+transmission: transmission
+  ip4_addr: 192.168.1.99/24
+  gateway: 192.168.1.1
+
+
 nextcloud: nextcloud
   ip4_addr: 192.168.1.99/24
   gateway: 192.168.1.1
diff --git a/global.sh b/global.sh
index d9d7a9eb..4a9f1359 100755
--- a/global.sh
+++ b/global.sh
@@ -3,15 +3,15 @@
 
 # yml Parser function
 # Based on https://gist.github.com/pkuczynski/8665367
-# shellcheck disable=SC2086
+#
+# This function is very picky and complex. Ignore with shellcheck for now.
+# shellcheck disable=SC2086,SC2155
 parse_yaml() {
-   prefix=${2}
-   s='[[:space:]]*' w='[a-zA-Z0-9_]*' fs=$(echo @|tr @ '\034')
-   local prefix
-   local s w fs
+   local prefix=${2}
+   local s='[[:space:]]*' w='[a-zA-Z0-9_]*' fs=$(echo @|tr @ '\034')
    sed -ne "s|^\($s\)\($w\)$s:$s\"\(.*\)\"$s\$|\1$fs\2$fs\3|p" \
         -e "s|^\($s\)\($w\)$s:$s\(.*\)$s\$|\1$fs\2$fs\3|p"  "${1}" |
-   awk -F"${fs}" '{
+   awk -F$fs '{
       indent = length($1)/2;
       vname[indent] = $2;
       for (i in vname) {if (i > indent) {delete vname[i]}}
diff --git a/jailman.sh b/jailman.sh
index 49465707..2111951f 100755
--- a/jailman.sh
+++ b/jailman.sh
@@ -100,8 +100,10 @@ while getopts ":i:r:u:d:g:h" opt
      esac
 done
 
+# auto detect iocage install location
 global_dataset_iocage=$(zfs get -H -o value mountpoint $(iocage get -p)/iocage)
 global_dataset_iocage=${global_dataset_iocage#/mnt/}
+export global_dataset_iocage
 
 # Parse the Config YAML
 # shellcheck disable=SC2046

From 616eb2a43243314e150e4590567f6a23d1a0feb6 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Wed, 29 Apr 2020 16:57:15 +0200
Subject: [PATCH 098/147] Create .shellcheckrc

Ignore SC2034 for ever. It's a known issue with how the scripts are designed to work, isn't really an issue and leads to MANY bloated disable=SC2034 flags everywhere.
---
 .shellcheckrc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .shellcheckrc

diff --git a/.shellcheckrc b/.shellcheckrc
new file mode 100644
index 00000000..d5a471e7
--- /dev/null
+++ b/.shellcheckrc
@@ -0,0 +1 @@
+disable=SC2034

From 66e997069a22217c7ffe3d6550b87e21f73e70ba Mon Sep 17 00:00:00 2001
From: Matt Coleman <mdcoleman001@gmail.com>
Date: Wed, 29 Apr 2020 12:40:14 -0400
Subject: [PATCH 099/147] Add Unifi Controller with integrated Unifi-Poller
 (#75)

* Add Unifi Controller with integrated Unifi-Poller
Install & Update uses 'latest' release. Persistent data using influxdb.

Unifi Poller now optional

* fix global dataset refs

* move unifi_poller bootscript into rc folder

* Apply suggestions from code review

* Update jails/unifi/includes/rc/mongod

Forgot to add one suggestion from review.

* Added shellcheck ignores for all RC scripts

Shellcheck doesn't play nice with RC scripts, those advices are often either wrong, or very hard (not worth it) to change enough to get it to pass and work.

* Last rc ignores for shellcheck

* Update jails/unifi/install.sh

* Shellcheck to shellcheck

Making shellcheck lowercase for parsing

Co-authored-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
---
 config.yml.example                   |  11 ++
 docs/Readme.md                       |   1 +
 jails/unifi/config.yml               |   2 +
 jails/unifi/includes/mongodb.conf    |  45 ++++++++
 jails/unifi/includes/rc/mongod       |  64 +++++++++++
 jails/unifi/includes/rc/unifi        |  87 +++++++++++++++
 jails/unifi/includes/rc/unifi_poller |  36 +++++++
 jails/unifi/includes/up.conf         | 106 +++++++++++++++++++
 jails/unifi/install.sh               |  91 ++++++++++++++++
 jails/unifi/readme.md                | 153 +++++++++++++++++++++++++++
 jails/unifi/update.sh                |  22 ++++
 11 files changed, 618 insertions(+)
 create mode 100644 jails/unifi/config.yml
 create mode 100644 jails/unifi/includes/mongodb.conf
 create mode 100644 jails/unifi/includes/rc/mongod
 create mode 100644 jails/unifi/includes/rc/unifi
 create mode 100644 jails/unifi/includes/rc/unifi_poller
 create mode 100644 jails/unifi/includes/up.conf
 create mode 100644 jails/unifi/install.sh
 create mode 100644 jails/unifi/readme.md
 create mode 100644 jails/unifi/update.sh

diff --git a/config.yml.example b/config.yml.example
index 81372f11..1f78d862 100644
--- a/config.yml.example
+++ b/config.yml.example
@@ -101,3 +101,14 @@ influxdb: influxdb
   ip4_addr: 192.168.1.250/24
   gateway: 192.168.1.1
   database: influxdb
+
+unifi: unifi
+  ip4_addr: 192.168.1.251/24
+  gateway: 192.168.1.1
+  unifi_poller: true
+  db_jail: influxdb
+  up_db_name: unifi
+  up_db_user: unifi-poller
+  up_db_password: unifi-poller
+  up_user: upoller
+  up_password: upoller
diff --git a/docs/Readme.md b/docs/Readme.md
index b7df9438..5ebff60c 100644
--- a/docs/Readme.md
+++ b/docs/Readme.md
@@ -72,6 +72,7 @@ Basic means: The same setup as a FreeNAS plugin would've, DHCP on bridge0.
 - py-kms
 - nextcloud
 - bitwarden
+- unifi controller
 
 #### Backend
 - mariadb
diff --git a/jails/unifi/config.yml b/jails/unifi/config.yml
new file mode 100644
index 00000000..3d74c1ae
--- /dev/null
+++ b/jails/unifi/config.yml
@@ -0,0 +1,2 @@
+unifi: unifi
+    pkgs: jq unifi5
\ No newline at end of file
diff --git a/jails/unifi/includes/mongodb.conf b/jails/unifi/includes/mongodb.conf
new file mode 100644
index 00000000..a245b8c1
--- /dev/null
+++ b/jails/unifi/includes/mongodb.conf
@@ -0,0 +1,45 @@
+# mongod.conf
+
+# for documentation of all options, see:
+#   http://docs.mongodb.org/manual/reference/configuration-options/
+
+# where to write logging data.
+systemLog:
+  destination: file
+  logAppend: true
+  path: /var/db/mongodb/mongod.log 
+
+# Where and how to store data.
+storage:
+  dbPath: /config/mongodb 
+  journal:
+    enabled: true
+#  engine:
+#  mmapv1:
+#  wiredTiger:
+
+# how the process runs
+processManagement:
+  fork: true  # fork and run in background
+  pidFilePath: /var/db/mongodb/mongod.lock  # location of pidfile
+  timeZoneInfo: /usr/share/zoneinfo
+
+# network interfaces
+net:
+  port: 27017
+  bindIp: 127.0.0.1  # Listen to local interface only, comment to listen on all interfaces.
+
+
+#security:
+
+#operationProfiling:
+
+#replication:
+
+#sharding:
+
+## Enterprise-Only Options
+
+#auditLog:
+
+#snmp:
diff --git a/jails/unifi/includes/rc/mongod b/jails/unifi/includes/rc/mongod
new file mode 100644
index 00000000..8e06aeb1
--- /dev/null
+++ b/jails/unifi/includes/rc/mongod
@@ -0,0 +1,64 @@
+#!/bin/sh
+# shellcheck disable=SC1091,SC2034,SC2223,SC2154,SC1090,SC2046,SC2086,SC2155,SC2181,SC2006
+
+# PROVIDE: mongod
+# REQUIRE: NETWORK ldconfig
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# mongod_enable (bool):  Set to "NO" by default.
+#                        Set it to "YES" to enable mongod.
+# mongod_limits (bool):  Set to "NO" by default.
+#                        Set it to yes to run `limits -e -U mongodb`
+#                        just before mongod starts.
+# mongod_dbpath (str):   Default to "/var/db/mongodb"
+#                        Base database directory.
+# mongod_flags (str):    Custom additional arguments to be passed to mongod.
+#                        Default to "--logpath ${mongod_dbpath}/mongod.log --logappend".
+# mongod_config (str):	 Default to "/usr/local/etc/mongodb.conf"
+#                        Path to config file
+#
+
+. /etc/rc.subr
+
+name="mongod"
+rcvar=mongod_enable
+
+load_rc_config $name
+
+: ${mongod_enable="NO"}
+: ${mongod_limits="NO"}
+: ${mongod_dbpath="/config/mongodb"}
+: ${mongod_flags="--logpath ${mongod_dbpath}/mongod.log --logappend --setParameter=disabledSecureAllocatorDomains=\*"}
+: ${mongod_user="mongodb"}
+: ${mongod_group="mongodb"}
+: ${mongod_config="/usr/local/etc/mongodb.conf"}
+
+pidfile="${mongod_dbpath}/mongod.lock"
+command=/usr/local/bin/${name}
+command_args="--config $mongod_config --dbpath $mongod_dbpath --fork >/dev/null 2>/dev/null"
+start_precmd="${name}_prestart"
+
+mongod_create_dbpath()
+{
+        mkdir "${mongod_dbpath}" >/dev/null 2>/dev/null
+        [ $? -eq 0 ] && chown -R "${mongod_user}":"${mongod_group}" "${mongod_dbpath}"
+}
+
+mongod_prestart()
+{
+        if [ ! -d "${mongod_dbpath}" ]; then
+                mongod_create_dbpath || return 1
+        fi
+        if checkyesno mongod_limits; then
+                # TODO check this and clean this up
+                # Shellcheck disable=SC2046,SC2006
+                eval `/usr/bin/limits -e -U ${mongod_user}` 2>/dev/null
+        else
+                return 0
+        fi
+}
+
+run_rc_command "$1"
diff --git a/jails/unifi/includes/rc/unifi b/jails/unifi/includes/rc/unifi
new file mode 100644
index 00000000..eeaa7eb9
--- /dev/null
+++ b/jails/unifi/includes/rc/unifi
@@ -0,0 +1,87 @@
+#!/bin/sh
+# shellcheck disable=SC1091,SC2034,SC2223,SC2154,SC1090,SC2046,SC2086,SC2155,SC2237
+#
+# Created by: Mark Felder <feld@FreeBSD.org>
+# $FreeBSD: branches/2020Q2/net-mgmt/unifi5/files/unifi.in 512281 2019-09-18 17:37:59Z feld $
+#
+
+# PROVIDE: unifi
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+
+#
+# Add the following line to /etc/rc.conf to enable `unifi':
+#
+# unifi_enable="YES"
+#
+# Other configuration settings for unifi that can be set in /etc/rc.conf:
+#
+# unifi_user (str)
+#   This is the user that unifi runs as
+#   Set to unifi by default
+#
+# unifi_group (str)
+#   This is the group that unifi runs as
+#   Set to unifi by default
+#
+# unifi_chdir (str)
+#   This is the directory that unifi chdirs into before starting
+#   Set to /usr/local/share/java/unifi by default
+#
+# unifi_java_home (str)
+#   The path to the base directory for the Java to use to run unifi
+#   Defaults to /usr/local/openjdk8
+#
+# unifi_javaflags (str)
+#   Flags passed to Java to run unifi
+#   Set to "-Djava.awt.headless=true -Xmx1024M" by default
+#
+
+. /etc/rc.subr
+name=unifi
+
+rcvar=unifi_enable
+load_rc_config ${name}
+
+: ${unifi_enable:=NO}
+: ${unifi_user:=unifi}
+: ${unifi_group:=unifi}
+: ${unifi_chdir=/config/controller/unifi}
+: ${unifi_java_home=/usr/local/openjdk8}
+: ${unifi_javaflags="-Djava.awt.headless=true -Xmx1024M"}
+
+pidfile="/var/run/unifi/${name}.pid"
+procname=${unifi_java_home}/bin/java
+command=/usr/sbin/daemon
+command_args="-f -p ${pidfile} ${unifi_java_home}/bin/java ${unifi_javaflags} com.ubnt.ace.Launcher start"
+start_precmd=start_precmd
+stop_precmd=stop_precmd
+stop_postcmd=stop_postcmd
+
+export CLASSPATH=$(echo ${unifi_chdir}/lib/*.jar | tr ' ' ':')
+
+start_precmd()
+{
+	if [ ! -e /var/run/unifi ] ; then
+		install -d -o unifi -g unifi /var/run/unifi;
+	fi
+}
+
+stop_precmd()
+{
+	if [ -r ${pidfile} ]; then
+		_UNIFIPID=$(check_pidfile ${pidfile} ${procname})
+		export _UNIFI_CHILDREN=$(pgrep -P ${_UNIFIPID})
+	fi
+}
+
+stop_postcmd()
+{
+	if ! [ -z ${_UNIFI_CHILDREN} ]; then
+		echo "Cleaning up leftover child processes."
+		kill $sig_stop ${_UNIFI_CHILDREN}
+		wait_for_pids ${_UNIFI_CHILDREN}
+	fi
+}
+
+run_rc_command "$1"
diff --git a/jails/unifi/includes/rc/unifi_poller b/jails/unifi/includes/rc/unifi_poller
new file mode 100644
index 00000000..ff1ee599
--- /dev/null
+++ b/jails/unifi/includes/rc/unifi_poller
@@ -0,0 +1,36 @@
+#!/bin/sh
+# shellcheck disable=SC1091,SC2034,SC2223,SC2154,SC1090,SC2046
+#
+# FreeBSD rc.d startup script for unifi-poller.
+#
+# PROVIDE: unifi-poller
+# REQUIRE: networking syslog
+# KEYWORD:
+
+. /etc/rc.subr
+
+name="unifi_poller"
+real_name="unifi-poller"
+rcvar="unifi_poller_enable"
+unifi_poller_command="/usr/local/bin/${real_name}"
+unifi_poller_user="nobody"
+unifi_poller_config="/config/up.conf"
+pidfile="/var/run/${real_name}/pid"
+
+# This runs `daemon` as the `unifi_poller_user` user.
+command="/usr/sbin/daemon"
+command_args="-P ${pidfile} -r -t ${real_name} -T ${real_name} -l daemon ${unifi_poller_command} -c ${unifi_poller_config}"
+
+load_rc_config ${name}
+: ${unifi_poller_enable:=no}
+
+# Make a place for the pid file.
+mkdir -p $(dirname ${pidfile})
+chown -R $unifi_poller_user $(dirname ${pidfile})
+
+# Suck in optional exported override variables.
+# ie. add something like the following to this file: export UP_POLLER_DEBUG=true
+[ -f "/usr/local/etc/defaults/${real_name}" ] && . "/usr/local/etc/defaults/${real_name}"
+
+# Go!
+run_rc_command "$1"
diff --git a/jails/unifi/includes/up.conf b/jails/unifi/includes/up.conf
new file mode 100644
index 00000000..9ecb7f0b
--- /dev/null
+++ b/jails/unifi/includes/up.conf
@@ -0,0 +1,106 @@
+# UniFi Poller v2 primary configuration file. TOML FORMAT #
+###########################################################
+
+[poller]
+  # Turns on line numbers, microsecond logging, and a per-device log.
+  # The default is false, but I personally leave this on at home (four devices).
+  # This may be noisy if you have a lot of devices. It adds one line per device.
+  debug = false
+
+  # Turns off per-interval logs. Only startup and error logs will be emitted.
+  # Recommend enabling debug with this setting for better error logging.
+  quiet = true
+
+  # Load dynamic plugins. Advanced use; only sample mysql plugin provided by default.
+  plugins = []
+
+#### OUTPUTS
+
+    # If you don't use an output, you can disable it.
+
+[prometheus]
+  disable = true
+  # This controls on which ip and port /metrics is exported when mode is "prometheus".
+  # This has no effect in other modes. Must contain a colon and port.
+  http_listen = "0.0.0.0:9130"
+  report_errors = false
+
+[influxdb]
+  disable = false
+  # InfluxDB does not require auth by default, so the user/password are probably unimportant.
+  url  = "dbip"
+  user = "influxdbuser"
+  pass = "influxdbpass"
+  # Be sure to create this database.
+  db = "unifidb"
+  # If your InfluxDB uses a valid SSL cert, set this to true.
+  verify_ssl = false
+  # The UniFi Controller only updates traffic stats about every 30 seconds.
+  # Setting this to something lower may lead to "zeros" in your data.
+  # If you're getting zeros now, set this to "1m"
+  interval = "30s"
+
+#### INPUTS
+
+[unifi]
+  # Setting this to true and providing default credentials allows you to skip
+  # configuring controllers in this config file. Instead you configure them in
+  # your prometheus.yml config. Prometheus then sends the controller URL to
+  # unifi-poller when it performs the scrape. This is useful if you have many,
+  # or changing controllers. Most people can leave this off. See wiki for more.
+  dynamic = false
+
+# The following section contains the default credentials/configuration for any
+# dynamic controller (see above section), or the primary controller if you do not
+# provide one and dynamic is disabled. In other words, you can just add your
+# controller here and delete the following section.
+[unifi.defaults]
+  #role       = "main controller"
+  url        = "https://127.0.0.1:8443"
+  user       = "unifiuser"
+  pass       = "unifipassword"
+  sites      = ["all"]
+  save_ids   = false
+  save_dpi   = false
+  save_sites = true
+  verify_ssl = false
+
+# The following is optional and used for configurations with multiple controllers.
+
+# You may repeat the following section to poll multiple controllers.
+#[[unifi.controller]]
+  # Friendly name used in dashboards. Uses URL if left empty; which is fine.
+  # Avoid changing this later because it will live forever in your database.
+  # Multiple controllers may share a role. This allows grouping during scrapes.
+  #role = ""
+  #url = "https://127.0.0.1:8443"
+
+  # Make a read-only user in the UniFi Admin Settings, allow it access to all sites.
+  #user = "unifipoller"
+  #pass = "4BB9345C-2341-48D7-99F5-E01B583FF77F"
+
+  # If the controller has more than one site, specify which sites to poll here.
+  # Set this to ["default"] to poll only the first site on the controller.
+  # A setting of ["all"] will poll all sites; this works if you only have 1 site too.
+  #sites = ["all"]
+
+  # Enable collection of Intrusion Detection System Data (InfluxDB only).
+  # Only useful if IDS or IPS are enabled on one of the sites.
+  #save_ids = false
+
+  # Enable collection of Deep Packet Inspection data. This data breaks down traffic
+  # types for each client and site, it powers a dedicated DPI dashboard.
+  # Enabling this adds roughly 150 data points per client.  That's 6000 metrics for
+  # 40 clients.  This adds a little bit of poller run time per interval and causes
+  # more API requests to your controller(s). Don't let these "cons" sway you:
+  # it's cool data. Please provide feedback on your experience with this feature.
+  #save_dpi = false
+
+  # Enable collection of site data. This data powers the Network Sites dashboard.
+  # It's not valuable to everyone and setting this to false will save resources.
+  #save_sites = true
+
+  # If your UniFi controller has a valid SSL certificate (like lets encrypt),
+  # you can enable this option to validate it. Otherwise, any SSL certificate is
+  # valid. If you don't know if you have a valid SSL cert, then you don't have one.
+  #verify_ssl = false
diff --git a/jails/unifi/install.sh b/jails/unifi/install.sh
new file mode 100644
index 00000000..7d810792
--- /dev/null
+++ b/jails/unifi/install.sh
@@ -0,0 +1,91 @@
+#!/usr/local/bin/bash
+# This file contains the install script for unifi-controller & unifi-poller
+
+# Initialize variables
+JAIL_NAME="unifi"
+# shellcheck disable=SC2154
+JAIL_IP="${unifi_ip4_addr%/*}"
+# shellcheck disable=SC2154
+DB_IP="${influxdb_ip4_addr%/*}"
+# shellcheck disable=SC2154
+DB_JAIL="${unifi_db_jail}"
+# shellcheck disable=SC2154
+DB_NAME="${unifi_up_db_name:-unifi}"
+# shellcheck disable=SC2154
+DB_USER="${unifi_up_db_user}"
+# shellcheck disable=SC2154
+DB_PASS="${unifi_up_db_password}"
+# shellcheck disable=SC2154
+UP_USER="${unifi_up_user}"
+# shellcheck disable=SC2154
+UP_PASS="${unifi_up_password}"
+INCLUDES_PATH="${SCRIPT_DIR}/jails/unifi/includes"
+
+# Enable persistent Unifi Controller data
+iocage exec "${JAIL_NAME}" mkdir -p /config/controller/mongodb
+iocage exec "${JAIL_NAME}" cp -Rp /usr/local/share/java/unifi /config/controller
+iocage exec "${JAIL_NAME}" chown -R mongodb:mongodb /config/controller/mongodb
+# shellcheck disable=SC2154
+cp "${INCLUDES_PATH}"/mongodb.conf /mnt/"${global_dataset_iocage}"/jails/"${JAIL_NAME}"/root/usr/local/etc
+# shellcheck disable=SC2154
+cp "${INCLUDES_PATH}"/rc/mongod /mnt/"${global_dataset_iocage}"/jails/"${JAIL_NAME}"/root/usr/local/etc/rc.d/
+# shellcheck disable=SC2154
+cp "${INCLUDES_PATH}"/rc/unifi /mnt/"${global_dataset_iocage}"/jails/"${JAIL_NAME}"/root/usr/local/etc/rc.d/
+iocage exec "${JAIL_NAME}" sysrc unifi_enable=YES
+iocage exec "${JAIL_NAME}" service unifi start
+
+# shellcheck disable=SC2154
+if [[ ! "${unifi_unifi_poller}" ]]; then
+  echo "Installation complete!"
+  echo "Unifi Controller is accessible at https://${JAIL_IP}:8443."
+else
+  # Check if influxdb container exists, create unifi database if it does, error if it is not.
+  echo "Checking if the database jail and database exist..."
+  if [[ -d /mnt/"${global_dataset_iocage}"/jails/"${DB_JAIL}" ]]; then
+    DB_EXISTING=$(iocage exec "${DB_JAIL}" curl -G http://localhost:8086/query --data-urlencode 'q=SHOW DATABASES' | jq '.results [] | .series [] | .values []' | grep "$DB_NAME" | sed 's/"//g' | sed 's/^ *//g')
+    if [[ "$DB_NAME" == "$DB_EXISTING" ]]; then
+      echo "${DB_JAIL} jail with database ${DB_NAME} already exists. Skipping database creation... "
+    else
+      echo "${DB_JAIL} jail exists, but database ${DB_NAME} does not. Creating database ${DB_NAME}."
+      if [[ -z "${DB_USER}" ]] || [[ -z "${DB_PASS}" ]]; then
+        echo "Database username and password not provided. Cannot create database without credentials. Exiting..."
+        exit 1
+      else
+        iocage exec "${DB_JAIL}" "curl -XPOST -u ${DB_USER}:${DB_PASS} http://localhost:8086/query --data-urlencode 'q=CREATE DATABASE ${DB_NAME}'"
+        echo "Database ${DB_NAME} created with username ${DB_USER} with password ${DB_PASS}."
+      fi
+    fi
+  else
+    echo "Influxdb jail does not exist. Unifi-Poller requires Influxdb jail. Please install the Influxdb jail."
+    exit 1
+  fi
+
+  # Download and install Unifi-Poller
+  FILE_NAME=$(curl -s https://api.github.com/repos/unifi-poller/unifi-poller/releases/latest | jq -r ".assets[] | select(.name | contains(\"amd64.txz\")) | .name")
+  DOWNLOAD=$(curl -s https://api.github.com/repos/unifi-poller/unifi-poller/releases/latest | jq -r ".assets[] | select(.name | contains(\"amd64.txz\")) | .browser_download_url")
+  iocage exec "${JAIL_NAME}" fetch -o /config "${DOWNLOAD}"
+
+  # Install downloaded Unifi-Poller package, configure and enable 
+  iocage exec "${JAIL_NAME}" pkg install -qy /config/"${FILE_NAME}"
+  # shellcheck disable=SC2154
+  cp "${INCLUDES_PATH}"/up.conf /mnt/"${global_dataset_config}"/"${JAIL_NAME}"
+  # shellcheck disable=SC2154
+  cp "${INCLUDES_PATH}"/up.conf.example /mnt/"${global_dataset_config}"/"${JAIL_NAME}"
+  # shellcheck disable=SC2154
+  cp "${INCLUDES_PATH}"/rc/unifi_poller /mnt/"${global_dataset_iocage}"/jails/"${JAIL_NAME}"/root/usr/local/etc/rc.d/unifi_poller
+  iocage exec "${JAIL_NAME}" sed -i '' "s|influxdbuser|${DB_USER}|" /config/up.conf
+  iocage exec "${JAIL_NAME}" sed -i '' "s|influxdbpass|${DB_PASS}|" /config/up.conf
+  iocage exec "${JAIL_NAME}" sed -i '' "s|unifidb|${DB_NAME}|" /config/up.conf
+  iocage exec "${JAIL_NAME}" sed -i '' "s|unifiuser|${UP_USER}|" /config/up.conf
+  iocage exec "${JAIL_NAME}" sed -i '' "s|unifipassword|${UP_PASS}|" /config/up.conf
+  iocage exec "${JAIL_NAME}" sed -i '' "s|dbip|http://${DB_IP}:8086|" /config/up.conf
+
+
+  iocage exec "${JAIL_NAME}" sysrc unifi_poller_enable=YES
+  iocage exec "${JAIL_NAME}" service unifi_poller start
+
+  echo "Installation complete!"
+  echo "Unifi Controller is accessible at https://${JAIL_IP}:8443."
+  echo "Please login to the Unifi Controller and add ${UP_USER} as a read-only user."
+  echo "In Grafana, add Unifi-Poller as a data source."
+fi
diff --git a/jails/unifi/readme.md b/jails/unifi/readme.md
new file mode 100644
index 00000000..e9f3e1c8
--- /dev/null
+++ b/jails/unifi/readme.md
@@ -0,0 +1,153 @@
+# Unifi Controller
+
+### Installation:
+
+- This jail requires an existing InfluxDB jail. InfluxDB may be created using the same install command, as long as influxdb is listed first.
+- Once the script runs, a user must be created in the Unifi Controller software for your Unifi-Poller user.
+- To view the data from Unifi-Poller, Grafana is required. Add the unifi InfluxDB database as a data source in Grafana.
+
+### Config Description
+
+- unifi_poller: boolean, true if you want to also install unifi-poller
+- db_jail: This is the name of your influxdb database jail, should be influxdb.
+- unifi_db_name: The name of the database that will be created in influxdb for Unifi Poller.
+- unifi_db_user & unifi_db_password: The created database's credentials for Unifi Poller.
+- up_user & up_password: The Unifi-Poller user credentials. This user must be created in the Unifi Controller web gui after install matching these credentials. This is for the connection between Unifi Controller & Unifi Poller
+
+### Unifi-Controller Post-Install
+
+After the script runs and the unifi jail is running, open the web gui of the unifi jail at port 8443 (i.e. https://192.168.2.250:8443). After completing the initial setup wizard, go to Admins --> Add New Admin. Select "Manually set and share the password", enter the username and password used for up_user & up_password. Uncheck 'Require the user to change their password'. Verify "Role" is set to 'Read Only'. Click Create.
+
+
+## Unifi Controller documentation can be found at https://www.ui.com/download/unifi/default/default/unifi-controller-v5-user-guide
+
+
+## Original README from the upstream Unifi-Poller Github.
+
+https://github.com/unifi-poller/unifi-poller
+
+<img width="320px" src="https://raw.githubusercontent.com/wiki/unifi-poller/unifi-poller/images/unifi-poller-logo.png">
+
+[![discord](https://badgen.net/badge/icon/Discord?color=0011ff&label&icon=https://simpleicons.now.sh/discord/eee "Ubiquiti Discord")](https://discord.gg/KnyKYt2)
+[![twitter](https://badgen.net/twitter/follow/TwitchCaptain?icon=https://simpleicons.now.sh/twitter/0099ff&label=TwitchCaptain&color=0116ff "TwitchCaptain @ Twitter")](https://twitter.com/TwitchCaptain)
+[![grafana](https://badgen.net/https/golift.io/bd/grafana/dashboard-downloads/11310,10419,10414,10415,10416,10417,10418,11311,11312,11313,11314,11315?icon=https://simpleicons.now.sh/grafana/ED7F38&color=0011ff "Grafana Dashboard Downloads")](http://grafana.com/dashboards?search=unifi-poller)
+[![pulls](https://badgen.net/docker/pulls/golift/unifi-poller?icon=https://simpleicons.now.sh/docker/38B1ED&label=pulls&color=0011ff "Docker Pulls")](https://hub.docker.com/r/golift/unifi-poller)
+[![DLs](https://img.shields.io/github/downloads/unifi-poller/unifi-poller/total.svg?logo=github&color=0116ff "GitHub Downloads")](https://www.somsubhra.com/github-release-stats/?username=unifi-poller&repository=unifi-poller)
+
+[![unifi](https://badgen.net/badge/UniFi/5.12.x,5.13.x,UAP,USG,USW,UDM?list=|&icon=https://docs.golift.io/svg/ubiquiti_color.svg&color=0099ee "UniFi Products Supported")](https://github.com/golift/unifi)
+[![builer](https://badgen.net/badge/go/Application%20Builder?label=&icon=https://docs.golift.io/svg/go.svg&color=0099ee "Go Application Builder")](https://github.com/golift/application-builder)
+[![stars](https://badgen.net/github/stars/unifi-poller/unifi-poller?icon=https://simpleicons.now.sh/macys/fab&label=&color=0099ee "GitHub Stars")](https://github.com/unifi-poller/unifi-poller)
+[![travis](https://badgen.net/travis/unifi-poller/unifi-poller?icon=travis&label=build "Travis Build")](https://travis-ci.org/unifi-poller/unifi-poller)
+
+Collect your UniFi controller data and report it to an InfluxDB instance,
+or export it for Prometheus collection.
+[Twelve Grafana Dashboards](http://grafana.com/dashboards?search=unifi-poller)
+included; with screenshots. Six for InfluxDB and six for Prometheus.
+
+## Installation
+
+[See the Wiki!](https://github.com/unifi-poller/unifi-poller/wiki/Installation)
+We have a special place for [Docker Users](https://github.com/unifi-poller/unifi-poller/wiki/Docker).
+I'm willing to help if you have troubles.
+Open an [Issue](https://github.com/unifi-poller/unifi-poller/issues) and
+we'll figure out how to get things working for you. You can also get help in
+the #unifi-poller channel on the [Ubiquiti Discord server](https://discord.gg/KnyKYt2). I've also
+[provided a forum post](https://community.ui.com/questions/Unifi-Poller-Store-Unifi-Controller-Metrics-in-InfluxDB-without-SNMP/58a0ea34-d2b3-41cd-93bb-d95d3896d1a1)
+you may use to get additional help.
+
+## Description
+
+[Ubiquiti](https://www.ui.com) makes networking devices like switches, gateways
+(routers) and wireless access points. They have a line of equipment named
+[UniFi](https://www.ui.com/products/#unifi) that uses a
+[controller](https://www.ui.com/download/unifi/) to keep stats and simplify network
+device configuration. This controller can be installed on Windows, macOS, FreeBSD,
+Linux or Docker. Ubiquiti also provides a dedicated hardware device called a
+[CloudKey](https://www.ui.com/unifi/unifi-cloud-key/) that runs the controller software.
+More recently they've developed the Dream Machine; it's still in
+beta / early access, but UniFi Poller can collect its data!
+
+UniFi Poller is a small Golang application that runs on Windows, macOS, FreeBSD,
+Linux or Docker. In Influx-mode it polls a UniFi controller every 30 seconds for
+measurements and exports the data to an Influx database. In Prometheus mode the
+poller opens a web port and accepts Prometheus polling. It converts the UniFi
+Controller API data into Prometheus exports on the fly.
+
+This application requires your controller to be running all the time. If you run
+a UniFi controller, there's no excuse not to install
+[Influx](https://github.com/unifi-poller/unifi-poller/wiki/InfluxDB) or
+[Prometheus](https://prometheus.io),
+[Grafana](https://github.com/unifi-poller/unifi-poller/wiki/Grafana) and this app.
+You'll have a plethora of data at your fingertips and the ability to craft custom
+graphs to slice the data any way you choose. Good luck!
+
+## Backstory
+
+I found a simple piece of code on GitHub that sorta did what I needed;
+we all know that story. I wanted more data, so I added more data collection.
+I probably wouldn't have made it this far if [Garrett](https://github.com/dewski/unifi)
+hadn't written the original code I started with. Many props my man.
+The original code pulled only the client data. This app now pulls data
+for clients, access points, security gateways, dream machines and switches.
+
+I've been trying to get my UAP data into Grafana. Sure, google search that.
+You'll find [this](https://community.ubnt.com/t5/UniFi-Wireless/Grafana-dashboard-for-UniFi-APs-now-available/td-p/1833532).
+What if you don't want to deal with SNMP?
+Well, here you go. I've replicated 400% of what you see on those SNMP-powered
+dashboards with this Go app running on the same mac as my UniFi controller.
+All without enabling SNMP nor trying to understand those OIDs. Mad props
+to [waterside](https://community.ubnt.com/t5/user/viewprofilepage/user-id/303058)
+for making this dashboard; it gave me a fantastic start to making my own dashboards.
+
+## Operation
+
+You can control this app with puppet, chef, saltstack, homebrew or a simple bash
+script if you needed to. Packages are available for macOS, Linux, FreeBSD and Docker.
+It works just fine on [Windows](https://github.com/unifi-poller/unifi-poller/wiki/Windows) too.
+Most people prefer Docker, and this app is right at home in that environment.
+
+## What's it look like?
+
+There are 12 total dashboards available; the 6 InfluxDB dashboards are very similar
+to the 6 Prometheus dashboards. Below you'll find screenshots of the first four dashboards.
+
+##### Client Dashboard (InfluxDB)
+
+![UniFi Clients Dashboard Image](https://grafana.com/api/dashboards/10418/images/7540/image)
+
+##### USG Dashboard (InfluxDB)
+
+![USG Dashboard Image](https://grafana.com/api/dashboards/10416/images/7543/image)
+
+##### UAP Dashboard (InfluxDB)
+
+![UAP Dashboard Image](https://grafana.com/api/dashboards/10415/images/7542/image)
+
+##### USW / Switch Dashboard (InfluxDB)
+
+You can drill down into specific sites, switches, and ports. Compare ports in different
+sites side-by-side. So easy! This screenshot barely does it justice.
+![USW Dashboard Image](https://grafana.com/api/dashboards/10417/images/7544/image)
+
+## Integrations
+
+The following fine folks are providing their services, completely free! These service
+integrations are used for things like storage, building, compiling, distribution and
+documentation support. This project succeeds because of them. Thank you!
+
+<p style="text-align: center;">
+<a title="Jfrog Bintray" alt="Jfrog Bintray" href="https://bintray.com"><img src="https://docs.golift.io/integrations/bintray.png"/></a>
+<a title="GitHub" alt="GitHub" href="https://GitHub.com"><img src="https://docs.golift.io/integrations/octocat.png"/></a>
+<a title="Docker Cloud" alt="Docker" href="https://cloud.docker.com"><img src="https://docs.golift.io/integrations/docker.png"/></a>
+<a title="Travis-CI" alt="Travis-CI" href="https://Travis-CI.com"><img src="https://docs.golift.io/integrations/travis-ci.png"/></a>
+<a title="Homebrew" alt="Homebrew" href="https://brew.sh"><img src="https://docs.golift.io/integrations/homebrew.png"/></a>
+<a title="Go Lift" alt="Go Lift" href="https://golift.io"><img src="https://docs.golift.io/integrations/golift.png"/></a>
+<a title="Grafana" alt="Grafana" href="https://grafana.com"><img src="https://docs.golift.io/integrations/grafana.png"/></a>
+</p>
+
+## Copyright & License
+
+<img style="float: right;" align="right" width="200px" src="https://raw.githubusercontent.com/wiki/unifi-poller/unifi-poller/images/unifi-poller-logo.png">
+
+- Copyright © 2018-2020 David Newhall II.
+- See [LICENSE](LICENSE) for license information.
diff --git a/jails/unifi/update.sh b/jails/unifi/update.sh
new file mode 100644
index 00000000..f554e205
--- /dev/null
+++ b/jails/unifi/update.sh
@@ -0,0 +1,22 @@
+#!/usr/local/bin/bash
+# This file contains the update script for unifi
+# Unifi Controller is updated through pkg, Unifi-Poller is not. This script updates Unifi-Poller
+
+JAIL_NAME="unifi"
+FILE_NAME=$(curl -s https://api.github.com/repos/unifi-poller/unifi-poller/releases/latest | jq -r ".assets[] | select(.name | contains(\"amd64.txz\")) | .name")
+DOWNLOAD=$(curl -s https://api.github.com/repos/unifi-poller/unifi-poller/releases/latest | jq -r ".assets[] | select(.name | contains(\"amd64.txz\")) | .browser_download_url")
+
+# Check to see if there is an update.
+# shellcheck disable=SC2154
+if [[ -f /mnt/"${global_dataset_config}"/"${JAIL_NAME}"/"${FILE_NAME}" ]]; then
+  echo "Unifi-Poller is up to date."
+  exit 1
+else
+  # Download and install the package
+  iocage exec "${JAIL_NAME}" fetch -o /config "${DOWNLOAD}"
+  iocage exec "${JAIL_NAME}" pkg install -qy /config/"${FILE_NAME}"
+  iocage exec "${JAIL_NAME}" service unifi restart
+  iocage exec "${JAIL_NAME}" service unifi_poller restart
+fi
+
+echo "Update complete!"

From dbfbd489fa2cf4906f99fa126e3302ea211121e4 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sat, 2 May 2020 17:45:13 +0200
Subject: [PATCH 100/147] [WIP] Allow multiple installations of same blueprint
 (#88)

* Multi-install support, Blueprints and config changes. Initial commit

* Migrating jails to blueprints, first steps.
Tested Working:
- Transmission
- Lidarr
- Sonarr
- Radarr

fix lidarr config (+10 squashed commit)

Squashed commit:

[5f14653] always link ports folders

[f18f2f0] Optional (blueprint) ports mount
Fixes #89

[96ef7e7] chmod all the things

[129e707] same mistake... again...

[e1596dc] missing reference

[6da3567] Forgot one reference

[d78b5b6] Update wiki.yml

[cecc53a] Update filecheck.yml

[5244abd] basic settings changed.
More involved blueprints still need changes, such as: Bitwarden, nextcloud, Mariadb

[6568e92] jails -> blueprints

* Added Tested Working:
- KMS
- Plex
- Tautulli
- Organizr
- InfluxDB
- MariaDB

Many squashed small fixes included:
Make *.rc executable (+13 squashed commit)

Squashed commit:

[b28aa83] use .rc for rc.d config files

[e940a48] some mariadb cleanup

[dc27aff] testing another way

[83bd91b] Mariadb root password alter instead of update, initial config for unifi

[0ca3074] some light config cleanup

[a0d4352] also remove database from influxdb example config (db should be created when required)

[2c218cc] Prepare influxdb and remove unneeded content

[1b34109] more shellcheck fixups

[c96566c] Some shellcheck cleanup

[8969ca7] bitwarden mostly done, some work on nextcloud and unifi

[7f89bfa] initial mariadb patch

[dd7e85f] missed one problem

[f814cb7] Initial pseudo-compatibility patch for unifi

* Enable Bitwarden support and some small fixes/tweaks
Fixes #95

more bugs and typo's (+3 squashed commit)

Squashed commit:

[3b5213e] Bitwarden not correctly installing db

[b7438a5] yeah thats not gonna cut it... >.<

[e7987c2] some slight bitwarden tweaks

* Enable Unifi support and some small fixes/tweaks

small unifi cleanup. Unifi is working (+3 squashed commit)

Squashed commit:

[d906d2d] chmod unifi

[545e999] Add extra sanity, remove unneeded variables from example

[b8c0b24] Some small Unifi Tweaks

* Nextcloud Cleanup, Some fixes, Initial support for blueprintsystem
Fixes #96
Fixes #97
Fixes #98

some bloat and syntax fixes (+5 squashed commit)

Squashed commit:

[78f6428] Some more nextcloud cleanup and tweaks
- combines multiple variables for cert system selection (Fixes #98 )
- Default to self signed cert
- Force manual admin password

[7cacae4] slight fixes

[3d81cda] More cleanup

[50496cc] small mariadb fix and more nextcloud cleanup

[c1b2c20] Cleaning nextcloud
- Remove external DB (Fixes #97 )
- Remove Postgresql (Fixes #96 )
- Some preparation for blueprint

* Nextcloud done

and..  another... (+5 squashed commit)

Squashed commit:

[c65751b] caddy not installed right.

[e5da66b] more fixes

[a33300e] Damnit, two typo's same scentence

[4292a7a] another typo

[1b820cf] typo and example hotfix

* Introduce version checking for config file
---
 .github/workflows/filecheck.yml               |   8 +-
 .github/workflows/wiki.yml                    |   5 +-
 blueprints/bitwarden/config.yml               |   3 +
 .../bitwarden/includes/bitwarden.rc           |   0
 .../bitwarden/includes/bitwarden.rc.conf      |   0
 blueprints/bitwarden/install.sh               | 119 ++++
 {jails => blueprints}/bitwarden/readme.md     |   0
 blueprints/bitwarden/update.sh                | 100 +++
 blueprints/influxdb/config.yml                |   3 +
 .../influxdb/includes/influxd.conf            |   0
 blueprints/influxdb/install.sh                |  32 +
 {jails => blueprints}/influxdb/readme.md      |   0
 {jails => blueprints}/influxdb/update.sh      |   4 +-
 blueprints/jackett/config.yml                 |   3 +
 .../jackett/includes/jackett.rc               |   0
 blueprints/jackett/install.sh                 |  14 +
 {jails => blueprints}/jackett/readme.md       |   0
 blueprints/jackett/update.sh                  |  10 +
 blueprints/kms/config.yml                     |   3 +
 .../kms/includes/Activate_Office_2019_Pro.bat |   0
 .../kms/includes/Activate_Windows_10_Pro.bat  |   0
 .../Activate_Windows_Server_2019_Standard.bat |   0
 .../includes/Office-2019-Pro-VLK-Config.xml   |   0
 {jails => blueprints}/kms/includes/Readme.md  |   0
 .../kms/includes/Setup_Office_2019_Pro.txt    |   0
 {jails => blueprints}/kms/includes/py_kms.rc  |   0
 blueprints/kms/install.sh                     |  12 +
 {jails => blueprints}/kms/readme.md           |   0
 blueprints/kms/update.sh                      |  10 +
 blueprints/lidarr/config.yml                  |   3 +
 .../lidarr/includes/lidarr.rc                 |   0
 blueprints/lidarr/install.sh                  |  25 +
 {jails => blueprints}/lidarr/readme.md        |   0
 blueprints/lidarr/update.sh                   |  10 +
 blueprints/mariadb/config.yml                 |   3 +
 .../mariadb/includes/Caddyfile                |   0
 .../mariadb/includes/caddy.rc                 |   0
 .../mariadb/includes/my-system.cnf            |   0
 {jails => blueprints}/mariadb/includes/my.cnf |   0
 blueprints/mariadb/install.sh                 | 117 ++++
 {jails => blueprints}/mariadb/readme.md       |   0
 blueprints/mariadb/update.sh                  |  37 ++
 {jails => blueprints}/nextcloud/LICENSE       |   0
 blueprints/nextcloud/config.yml               |   4 +
 .../nextcloud/includes/Caddyfile              |   0
 .../nextcloud/includes/Caddyfile-nossl        |   0
 .../nextcloud/includes/Caddyfile-selfsigned   |   0
 .../nextcloud/includes/caddy.rc               |   0
 .../nextcloud/includes/my-system.cnf          |   0
 .../nextcloud/includes/my.cnf                 |   0
 .../nextcloud/includes/pgpass                 |   0
 .../nextcloud/includes/php.ini                |   0
 .../nextcloud/includes/redis.conf             |   0
 .../nextcloud/includes/remove-staging.sh      |   0
 .../nextcloud/includes/www-crontab            |   0
 .../nextcloud/includes/www.conf               |   0
 blueprints/nextcloud/install.sh               | 321 ++++++++++
 {jails => blueprints}/nextcloud/readme.md     |   0
 {jails => blueprints}/nextcloud/update.sh     |   0
 blueprints/organizr/config.yml                |   3 +
 .../organizr/includes/custom/organizr.conf    |   0
 .../organizr/includes/custom/phpblock.conf    |   0
 .../organizr/includes/nginx.conf              |   0
 blueprints/organizr/install.sh                |  34 +
 {jails => blueprints}/organizr/readme.md      |   0
 blueprints/organizr/update.sh                 |  12 +
 blueprints/plex/config.yml                    |   3 +
 .../plex/includes/FreeBSD.conf                |   0
 blueprints/plex/install.sh                    |  51 ++
 {jails => blueprints}/plex/readme.md          |   0
 {jails => blueprints}/plex/update.sh          |  12 +-
 blueprints/radarr/config.yml                  |   3 +
 .../radarr/includes/radarr.rc                 |   0
 blueprints/radarr/install.sh                  |  24 +
 {jails => blueprints}/radarr/readme.md        |   0
 blueprints/radarr/update.sh                   |  10 +
 blueprints/sonarr/config.yml                  |   3 +
 .../sonarr/includes/sonarr.rc                 |   0
 blueprints/sonarr/install.sh                  |  24 +
 {jails => blueprints}/sonarr/readme.md        |   0
 blueprints/sonarr/update.sh                   |  10 +
 blueprints/tautulli/config.yml                |   3 +
 blueprints/tautulli/install.sh                |  11 +
 {jails => blueprints}/tautulli/readme.md      |   0
 blueprints/tautulli/update.sh                 |   9 +
 blueprints/transmission/config.yml            |   3 +
 blueprints/transmission/install.sh            |  19 +
 {jails => blueprints}/transmission/readme.md  |   0
 blueprints/transmission/update.sh             |   7 +
 blueprints/unifi/config.yml                   |   3 +
 .../unifi/includes/mongodb.conf               |   0
 .../unifi/includes/rc/mongod.rc               |   0
 .../unifi/includes/rc/unifi.rc                |   0
 .../unifi/includes/rc/unifi_poller.rc         |   0
 {jails => blueprints}/unifi/includes/up.conf  |   0
 blueprints/unifi/install.sh                   | 117 ++++
 {jails => blueprints}/unifi/readme.md         |   0
 {jails => blueprints}/unifi/update.sh         |  11 +-
 config.yml.example                            | 169 +++--
 global.sh                                     |  84 ++-
 jailman.sh                                    |  57 +-
 jails/bitwarden/config.yml                    |   2 -
 jails/bitwarden/install.sh                    |  92 ---
 jails/bitwarden/update.sh                     |  70 ---
 jails/influxdb/config.yml                     |   2 -
 jails/influxdb/includes/influxdb.conf         | 586 ------------------
 jails/influxdb/install.sh                     |  46 --
 jails/jackett/config.yml                      |   2 -
 jails/jackett/install.sh                      |  14 -
 jails/jackett/update.sh                       |  10 -
 jails/kms/config.yml                          |   2 -
 jails/kms/install.sh                          |  13 -
 jails/kms/update.sh                           |  10 -
 jails/lidarr/config.yml                       |   2 -
 jails/lidarr/install.sh                       |  25 -
 jails/lidarr/update.sh                        |  10 -
 jails/mariadb/config.yml                      |   2 -
 jails/mariadb/install.sh                      | 115 ----
 jails/mariadb/update.sh                       |  36 --
 jails/nextcloud/config.yml                    |   2 -
 jails/nextcloud/install.sh                    | 362 -----------
 jails/organizr/config.yml                     |   2 -
 jails/organizr/install.sh                     |  34 -
 jails/organizr/update.sh                      |  12 -
 jails/plex/config.yml                         |   2 -
 jails/plex/install.sh                         |  52 --
 jails/radarr/config.yml                       |   2 -
 jails/radarr/install.sh                       |  24 -
 jails/radarr/update.sh                        |  10 -
 jails/sonarr/config.yml                       |   2 -
 jails/sonarr/install.sh                       |  24 -
 jails/sonarr/update.sh                        |  10 -
 jails/tautulli/config.yml                     |   2 -
 jails/tautulli/install.sh                     |  12 -
 jails/tautulli/update.sh                      |   9 -
 jails/transmission/config.yml                 |   2 -
 jails/transmission/install.sh                 |  19 -
 jails/transmission/update.sh                  |   7 -
 jails/unifi/config.yml                        |   2 -
 jails/unifi/install.sh                        |  91 ---
 140 files changed, 1361 insertions(+), 1888 deletions(-)
 create mode 100644 blueprints/bitwarden/config.yml
 rename {jails => blueprints}/bitwarden/includes/bitwarden.rc (100%)
 rename {jails => blueprints}/bitwarden/includes/bitwarden.rc.conf (100%)
 mode change 100755 => 100644
 create mode 100755 blueprints/bitwarden/install.sh
 rename {jails => blueprints}/bitwarden/readme.md (100%)
 mode change 100755 => 100644
 create mode 100755 blueprints/bitwarden/update.sh
 create mode 100644 blueprints/influxdb/config.yml
 rename {jails => blueprints}/influxdb/includes/influxd.conf (100%)
 create mode 100755 blueprints/influxdb/install.sh
 rename {jails => blueprints}/influxdb/readme.md (100%)
 rename {jails => blueprints}/influxdb/update.sh (64%)
 mode change 100644 => 100755
 create mode 100644 blueprints/jackett/config.yml
 rename {jails => blueprints}/jackett/includes/jackett.rc (100%)
 create mode 100755 blueprints/jackett/install.sh
 rename {jails => blueprints}/jackett/readme.md (100%)
 mode change 100755 => 100644
 create mode 100755 blueprints/jackett/update.sh
 create mode 100644 blueprints/kms/config.yml
 rename {jails => blueprints}/kms/includes/Activate_Office_2019_Pro.bat (100%)
 mode change 100755 => 100644
 rename {jails => blueprints}/kms/includes/Activate_Windows_10_Pro.bat (100%)
 mode change 100755 => 100644
 rename {jails => blueprints}/kms/includes/Activate_Windows_Server_2019_Standard.bat (100%)
 mode change 100755 => 100644
 rename {jails => blueprints}/kms/includes/Office-2019-Pro-VLK-Config.xml (100%)
 mode change 100755 => 100644
 rename {jails => blueprints}/kms/includes/Readme.md (100%)
 mode change 100755 => 100644
 rename {jails => blueprints}/kms/includes/Setup_Office_2019_Pro.txt (100%)
 mode change 100755 => 100644
 rename {jails => blueprints}/kms/includes/py_kms.rc (100%)
 create mode 100755 blueprints/kms/install.sh
 rename {jails => blueprints}/kms/readme.md (100%)
 mode change 100755 => 100644
 create mode 100755 blueprints/kms/update.sh
 create mode 100644 blueprints/lidarr/config.yml
 rename {jails => blueprints}/lidarr/includes/lidarr.rc (100%)
 create mode 100755 blueprints/lidarr/install.sh
 rename {jails => blueprints}/lidarr/readme.md (100%)
 mode change 100755 => 100644
 create mode 100755 blueprints/lidarr/update.sh
 create mode 100644 blueprints/mariadb/config.yml
 rename {jails => blueprints}/mariadb/includes/Caddyfile (100%)
 mode change 100755 => 100644
 rename jails/mariadb/includes/caddy => blueprints/mariadb/includes/caddy.rc (100%)
 rename {jails => blueprints}/mariadb/includes/my-system.cnf (100%)
 mode change 100755 => 100644
 rename {jails => blueprints}/mariadb/includes/my.cnf (100%)
 mode change 100755 => 100644
 create mode 100755 blueprints/mariadb/install.sh
 rename {jails => blueprints}/mariadb/readme.md (100%)
 mode change 100755 => 100644
 create mode 100755 blueprints/mariadb/update.sh
 rename {jails => blueprints}/nextcloud/LICENSE (100%)
 mode change 100755 => 100644
 create mode 100644 blueprints/nextcloud/config.yml
 rename {jails => blueprints}/nextcloud/includes/Caddyfile (100%)
 mode change 100755 => 100644
 rename {jails => blueprints}/nextcloud/includes/Caddyfile-nossl (100%)
 mode change 100755 => 100644
 rename {jails => blueprints}/nextcloud/includes/Caddyfile-selfsigned (100%)
 mode change 100755 => 100644
 rename jails/nextcloud/includes/caddy => blueprints/nextcloud/includes/caddy.rc (100%)
 rename {jails => blueprints}/nextcloud/includes/my-system.cnf (100%)
 mode change 100755 => 100644
 rename {jails => blueprints}/nextcloud/includes/my.cnf (100%)
 mode change 100755 => 100644
 rename {jails => blueprints}/nextcloud/includes/pgpass (100%)
 mode change 100755 => 100644
 rename {jails => blueprints}/nextcloud/includes/php.ini (100%)
 mode change 100755 => 100644
 rename {jails => blueprints}/nextcloud/includes/redis.conf (100%)
 mode change 100755 => 100644
 rename {jails => blueprints}/nextcloud/includes/remove-staging.sh (100%)
 rename {jails => blueprints}/nextcloud/includes/www-crontab (100%)
 mode change 100755 => 100644
 rename {jails => blueprints}/nextcloud/includes/www.conf (100%)
 mode change 100755 => 100644
 create mode 100755 blueprints/nextcloud/install.sh
 rename {jails => blueprints}/nextcloud/readme.md (100%)
 rename {jails => blueprints}/nextcloud/update.sh (100%)
 create mode 100644 blueprints/organizr/config.yml
 rename {jails => blueprints}/organizr/includes/custom/organizr.conf (100%)
 mode change 100755 => 100644
 rename {jails => blueprints}/organizr/includes/custom/phpblock.conf (100%)
 mode change 100755 => 100644
 rename {jails => blueprints}/organizr/includes/nginx.conf (100%)
 mode change 100755 => 100644
 create mode 100755 blueprints/organizr/install.sh
 rename {jails => blueprints}/organizr/readme.md (100%)
 mode change 100755 => 100644
 create mode 100755 blueprints/organizr/update.sh
 create mode 100644 blueprints/plex/config.yml
 rename {jails => blueprints}/plex/includes/FreeBSD.conf (100%)
 mode change 100755 => 100644
 create mode 100755 blueprints/plex/install.sh
 rename {jails => blueprints}/plex/readme.md (100%)
 mode change 100755 => 100644
 rename {jails => blueprints}/plex/update.sh (60%)
 create mode 100644 blueprints/radarr/config.yml
 rename {jails => blueprints}/radarr/includes/radarr.rc (100%)
 create mode 100755 blueprints/radarr/install.sh
 rename {jails => blueprints}/radarr/readme.md (100%)
 mode change 100755 => 100644
 create mode 100755 blueprints/radarr/update.sh
 create mode 100644 blueprints/sonarr/config.yml
 rename {jails => blueprints}/sonarr/includes/sonarr.rc (100%)
 create mode 100755 blueprints/sonarr/install.sh
 rename {jails => blueprints}/sonarr/readme.md (100%)
 mode change 100755 => 100644
 create mode 100755 blueprints/sonarr/update.sh
 create mode 100644 blueprints/tautulli/config.yml
 create mode 100755 blueprints/tautulli/install.sh
 rename {jails => blueprints}/tautulli/readme.md (100%)
 mode change 100755 => 100644
 create mode 100755 blueprints/tautulli/update.sh
 create mode 100644 blueprints/transmission/config.yml
 create mode 100755 blueprints/transmission/install.sh
 rename {jails => blueprints}/transmission/readme.md (100%)
 mode change 100755 => 100644
 create mode 100755 blueprints/transmission/update.sh
 create mode 100644 blueprints/unifi/config.yml
 rename {jails => blueprints}/unifi/includes/mongodb.conf (100%)
 rename jails/unifi/includes/rc/mongod => blueprints/unifi/includes/rc/mongod.rc (100%)
 mode change 100644 => 100755
 rename jails/unifi/includes/rc/unifi => blueprints/unifi/includes/rc/unifi.rc (100%)
 mode change 100644 => 100755
 rename jails/unifi/includes/rc/unifi_poller => blueprints/unifi/includes/rc/unifi_poller.rc (100%)
 mode change 100644 => 100755
 rename {jails => blueprints}/unifi/includes/up.conf (100%)
 create mode 100755 blueprints/unifi/install.sh
 rename {jails => blueprints}/unifi/readme.md (100%)
 rename {jails => blueprints}/unifi/update.sh (67%)
 mode change 100644 => 100755
 delete mode 100644 jails/bitwarden/config.yml
 delete mode 100755 jails/bitwarden/install.sh
 delete mode 100755 jails/bitwarden/update.sh
 delete mode 100644 jails/influxdb/config.yml
 delete mode 100644 jails/influxdb/includes/influxdb.conf
 delete mode 100755 jails/influxdb/install.sh
 delete mode 100644 jails/jackett/config.yml
 delete mode 100755 jails/jackett/install.sh
 delete mode 100755 jails/jackett/update.sh
 delete mode 100644 jails/kms/config.yml
 delete mode 100755 jails/kms/install.sh
 delete mode 100755 jails/kms/update.sh
 delete mode 100644 jails/lidarr/config.yml
 delete mode 100755 jails/lidarr/install.sh
 delete mode 100755 jails/lidarr/update.sh
 delete mode 100644 jails/mariadb/config.yml
 delete mode 100755 jails/mariadb/install.sh
 delete mode 100755 jails/mariadb/update.sh
 delete mode 100644 jails/nextcloud/config.yml
 delete mode 100755 jails/nextcloud/install.sh
 delete mode 100644 jails/organizr/config.yml
 delete mode 100755 jails/organizr/install.sh
 delete mode 100755 jails/organizr/update.sh
 delete mode 100644 jails/plex/config.yml
 delete mode 100755 jails/plex/install.sh
 delete mode 100644 jails/radarr/config.yml
 delete mode 100755 jails/radarr/install.sh
 delete mode 100755 jails/radarr/update.sh
 delete mode 100644 jails/sonarr/config.yml
 delete mode 100755 jails/sonarr/install.sh
 delete mode 100755 jails/sonarr/update.sh
 delete mode 100644 jails/tautulli/config.yml
 delete mode 100755 jails/tautulli/install.sh
 delete mode 100755 jails/tautulli/update.sh
 delete mode 100644 jails/transmission/config.yml
 delete mode 100755 jails/transmission/install.sh
 delete mode 100755 jails/transmission/update.sh
 delete mode 100644 jails/unifi/config.yml
 delete mode 100644 jails/unifi/install.sh

diff --git a/.github/workflows/filecheck.yml b/.github/workflows/filecheck.yml
index 1ba68643..59cba21b 100644
--- a/.github/workflows/filecheck.yml
+++ b/.github/workflows/filecheck.yml
@@ -13,9 +13,9 @@ jobs:
       - uses: actions/checkout@v1
       - name: check existance
         run: |
-         for pathname in jails/*; do test -e $pathname/readme.md || { echo "File missing: $pathname/readme.md"; error="true"; }; done
-         for pathname in jails/*; do test -e $pathname/install.sh || { echo "File missing: $pathname/install.sh"; error="true"; }; done
-         for pathname in jails/*; do test -e $pathname/update.sh || { echo "File missing: $pathname/update.sh"; error="true"; }; done
-         for pathname in jails/*; do test -e $pathname/config.yml || { echo "File missing: $pathname/config.yml"; error="true"; }; done
+         for pathname in blueprints/*; do test -e $pathname/readme.md || { echo "File missing: $pathname/readme.md"; error="true"; }; done
+         for pathname in blueprints/*; do test -e $pathname/install.sh || { echo "File missing: $pathname/install.sh"; error="true"; }; done
+         for pathname in blueprints/*; do test -e $pathname/update.sh || { echo "File missing: $pathname/update.sh"; error="true"; }; done
+         for pathname in blueprints/*; do test -e $pathname/config.yml || { echo "File missing: $pathname/config.yml"; error="true"; }; done
          if [ "${error}" == "true" ]; then echo "Missing files detected" && exit 1; fi
         shell: bash
diff --git a/.github/workflows/wiki.yml b/.github/workflows/wiki.yml
index d87b3899..e5f4a432 100644
--- a/.github/workflows/wiki.yml
+++ b/.github/workflows/wiki.yml
@@ -15,10 +15,7 @@ jobs:
           ref: 'master'
       - name: rename-readme
         run: |
-          for pathname in jails/*/README.MD; do ! cp "$pathname" "docs/jails/$( basename "$( dirname "$pathname" )" ).md"; done
-          for pathname in jails/*/README.md; do ! cp "$pathname" "docs/jails/$( basename "$( dirname "$pathname" )" ).md"; done 
-          for pathname in jails/*/readme.md; do ! cp "$pathname" "docs/jails/$( basename "$( dirname "$pathname" )" ).md"; done
-          for pathname in jails/*/Readme.md; do ! cp "$pathname" "docs/jails/$( basename "$( dirname "$pathname" )" ).md"; done
+          for pathname in blueprints/*/readme.md; do ! cp "$pathname" "docs/blueprints/$( basename "$( dirname "$pathname" )" ).md"; done
         shell: bash
       - name: Deploy docs
         uses: mhausenblas/mkdocs-deploy-gh-pages@master
diff --git a/blueprints/bitwarden/config.yml b/blueprints/bitwarden/config.yml
new file mode 100644
index 00000000..c79bd93c
--- /dev/null
+++ b/blueprints/bitwarden/config.yml
@@ -0,0 +1,3 @@
+blueprint:
+  bitwarden:
+    pkgs: sqlite3 nginx git sudo vim-tiny bash node npm python27-2.7.17_1 mariadb104-client
\ No newline at end of file
diff --git a/jails/bitwarden/includes/bitwarden.rc b/blueprints/bitwarden/includes/bitwarden.rc
similarity index 100%
rename from jails/bitwarden/includes/bitwarden.rc
rename to blueprints/bitwarden/includes/bitwarden.rc
diff --git a/jails/bitwarden/includes/bitwarden.rc.conf b/blueprints/bitwarden/includes/bitwarden.rc.conf
old mode 100755
new mode 100644
similarity index 100%
rename from jails/bitwarden/includes/bitwarden.rc.conf
rename to blueprints/bitwarden/includes/bitwarden.rc.conf
diff --git a/blueprints/bitwarden/install.sh b/blueprints/bitwarden/install.sh
new file mode 100755
index 00000000..9c38e44b
--- /dev/null
+++ b/blueprints/bitwarden/install.sh
@@ -0,0 +1,119 @@
+#!/usr/local/bin/bash
+# This file contains the install script for bitwarden
+
+# Initialise defaults
+JAIL_IP="jail_${1}_ip4_addr"
+JAIL_IP="${!JAIL_IP%/*}"
+HOST_NAME="jail_${1}_host_name"
+
+DB_DATABASE="jail_${1}_db_database"
+DB_DATABASE="${!DB_DATABASE:-$1}"
+
+DB_USER="jail_${1}_db_user"
+DB_USER="${!DB_USER:-$DB_DATABASE}"
+
+# shellcheck disable=SC2154
+INSTALL_TYPE="jail_${1}_db_type"
+INSTALL_TYPE="${!INSTALL_TYPE:-mariadb}"
+
+DB_JAIL="jail_${1}_db_jail"
+# shellcheck disable=SC2154
+DB_HOST="jail_${!DB_JAIL}_ip4_addr"
+DB_HOST="${!DB_HOST%/*}:3306"
+
+# shellcheck disable=SC2154
+DB_PASSWORD="jail_${1}_db_password"
+DB_STRING="mysql://${DB_USER}:${!DB_PASSWORD}@${DB_HOST}/${DB_DATABASE}"
+# shellcheck disable=SC2154
+ADMIN_TOKEN="jail_${1}_admin_token"
+
+if [ -z "${!DB_PASSWORD}" ]; then
+	echo "db_password can't be empty"
+	exit 1
+fi
+
+if [ -z "${!DB_JAIL}" ]; then
+	echo "db_jail can't be empty"
+	exit 1
+fi
+
+if [ -z "${!JAIL_IP}" ]; then
+	echo "ip4_addr can't be empty"
+	exit 1
+fi
+
+if [ -z "${!ADMIN_TOKEN}" ]; then
+ADMIN_TOKEN=$(openssl rand -base64 16)
+fi
+
+# install latest rust version, pkg version is outdated and can't build bitwarden_rs
+iocage exec "${1}" "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y"
+
+# Install Bitwarden_rs
+iocage exec "${1}" mkdir -p /usr/local/share/bitwarden/src
+iocage exec "${1}" git clone https://github.com/dani-garcia/bitwarden_rs/ /usr/local/share/bitwarden/src
+TAG=$(iocage exec "${1}" "git -C /usr/local/share/bitwarden/src tag --sort=v:refname | tail -n1")
+iocage exec "${1}" "git -C /usr/local/share/bitwarden/src checkout ${TAG}"
+#TODO replace with: cargo build --features mysql --release
+if [ "${INSTALL_TYPE}" == "mariadb" ]; then
+	iocage exec "${1}" "cd /usr/local/share/bitwarden/src && $HOME/.cargo/bin/cargo build --features mysql --release"
+	iocage exec "${1}" "cd /usr/local/share/bitwarden/src && $HOME/.cargo/bin/cargo install diesel_cli --no-default-features --features mysql"
+else
+	iocage exec "${1}" "cd /usr/local/share/bitwarden/src && $HOME/.cargo/bin/cargo build --features sqlite --release"
+	iocage exec "${1}" "cd /usr/local/share/bitwarden/src && $HOME/.cargo/bin/cargo install diesel_cli --no-default-features --features sqlite-bundled"
+fi
+
+
+iocage exec "${1}" cp -r /usr/local/share/bitwarden/src/target/release /usr/local/share/bitwarden/bin
+
+# Download and install webvault
+WEB_RELEASE_URL=$(curl -Ls -o /dev/null -w "%{url_effective}" https://github.com/dani-garcia/bw_web_builds/releases/latest)
+WEB_TAG="${WEB_RELEASE_URL##*/}"
+iocage exec "${1}" "fetch http://github.com/dani-garcia/bw_web_builds/releases/download/$WEB_TAG/bw_web_$WEB_TAG.tar.gz -o /usr/local/share/bitwarden"
+iocage exec "${1}" "tar -xzvf /usr/local/share/bitwarden/bw_web_$WEB_TAG.tar.gz -C /usr/local/share/bitwarden/"
+iocage exec "${1}" rm /usr/local/share/bitwarden/bw_web_"$WEB_TAG".tar.gz
+
+# shellcheck disable=SC2154
+if [ -f "/mnt/${global_dataset_config}/${1}/ssl/bitwarden-ssl.crt" ]; then
+    echo "certificate exist... Skipping cert generation"
+else
+	"No ssl certificate present, generating self signed certificate"
+	if [ ! -d "/mnt/${global_dataset_config}/${1}/ssl" ]; then
+		echo "cert folder not existing... creating..."
+		iocage exec "${1}" mkdir /config/ssl
+	fi
+	openssl req -new -newkey rsa:2048 -days 365 -nodes -x509 -subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=localhost" -keyout /mnt/"${global_dataset_config}"/"${1}"/ssl/bitwarden-ssl.key -out /mnt/"${global_dataset_config}"/"${1}"/ssl/bitwarden-ssl.crt
+fi
+
+if [ -f "/mnt/${global_dataset_config}/${1}/bitwarden.log" ]; then
+	echo "Reinstall of Bitwarden detected... using existing config and database"
+elif [ "${INSTALL_TYPE}" == "mariadb" ]; then
+	echo "No config detected, doing clean install, utilizing the Mariadb database ${DB_HOST}"
+	iocage exec "${!DB_JAIL}" mysql -u root -e "CREATE DATABASE ${DB_DATABASE};"
+	iocage exec "${!DB_JAIL}" mysql -u root -e "GRANT ALL ON ${DB_DATABASE}.* TO ${DB_USER}@${JAIL_IP} IDENTIFIED BY '${!DB_PASSWORD}';"
+	iocage exec "${!DB_JAIL}" mysqladmin reload
+else
+	echo "No config detected, doing clean install."
+fi
+
+iocage exec "${1}" "pw user add bitwarden -c bitwarden -u 725 -d /nonexistent -s /usr/bin/nologin"
+iocage exec "${1}" chown -R bitwarden:bitwarden /usr/local/share/bitwarden /config
+iocage exec "${1}" mkdir /usr/local/etc/rc.d /usr/local/etc/rc.conf.d
+# shellcheck disable=SC2154
+cp "${SCRIPT_DIR}"/blueprints/bitwarden/includes/bitwarden.rc /mnt/"${global_dataset_iocage}"/jails/"${1}"/root/usr/local/etc/rc.d/bitwarden
+cp "${SCRIPT_DIR}"/blueprints/bitwarden/includes/bitwarden.rc.conf /mnt/"${global_dataset_iocage}"/jails/"${1}"/root/usr/local/etc/rc.conf.d/bitwarden
+echo 'export DATABASE_URL="'"${DB_STRING}"'"' >> /mnt/"${global_dataset_iocage}"/jails/"${1}"/root/usr/local/etc/rc.conf.d/bitwarden
+echo 'export ADMIN_TOKEN="'"${!ADMIN_TOKEN}"'"' >> /mnt/"${global_dataset_iocage}"/jails/"${1}"/root/usr/local/etc/rc.conf.d/bitwarden
+
+if [ "${!ADMIN_TOKEN}" == "NONE" ]; then
+	echo "Admin_token set to NONE, disabling admin portal"
+else
+	echo "Admin_token set and admin portal enabled"
+	iocage exec "${1}" echo "${DB_NAME} Admin Token is ${!ADMIN_TOKEN}" > /root/"${1}"_admin_token.txt
+fi
+
+iocage exec "${1}" chmod u+x /usr/local/etc/rc.d/bitwarden
+iocage exec "${1}" sysrc "bitwarden_enable=YES"
+iocage exec "${1}" service bitwarden restart
+echo "Jail ${1} finished Bitwarden install."
+echo "Admin Token is ${!ADMIN_TOKEN}"
diff --git a/jails/bitwarden/readme.md b/blueprints/bitwarden/readme.md
old mode 100755
new mode 100644
similarity index 100%
rename from jails/bitwarden/readme.md
rename to blueprints/bitwarden/readme.md
diff --git a/blueprints/bitwarden/update.sh b/blueprints/bitwarden/update.sh
new file mode 100755
index 00000000..a2775815
--- /dev/null
+++ b/blueprints/bitwarden/update.sh
@@ -0,0 +1,100 @@
+#!/usr/local/bin/bash
+# This file contains the update script for bitwarden
+# Due to it being build from scratch or downloaded directly to execution dir, 
+# Update for Bitwarden is pretty similair to installation
+
+# Initialise defaults
+JAIL_IP="jail_${1}_ip4_addr"
+JAIL_IP="${!JAIL_IP%/*}"
+HOST_NAME="jail_${1}_host_name"
+DB_DATABASE="jail_${1}_db_datavase"
+DB_USER="jail_${1}_db_user"
+# shellcheck disable=SC2154
+INSTALL_TYPE="jail_${1}_type"
+DB_JAIL="jail_${1}_db_jail"
+DB_JAIL="${!DB_JAIL}"
+# shellcheck disable=SC2154
+DB_HOST="${DB_JAIL}_ip4_addr"
+DB_HOST="${!DB_HOST%/*}:3306"
+# shellcheck disable=SC2154
+DB_PASSWORD="jail_${1}_db_password"
+DB_STRING="mysql://${!DB_USER}:${!DB_PASSWORD}@${DB_HOST}/${!DB_DATABASE}"
+# shellcheck disable=SC2154
+ADMIN_TOKEN="jail_${1}_admin_token"
+
+if [ -z "${!DB_USER}" ]; then
+	echo "db_user can't be empty"
+	exit 1
+fi
+
+if [ -z "${!DB_DATABASE}" ]; then
+	echo "db_database can't be empty"
+	exit 1
+fi
+
+if [ -z "${!DB_PASSWORD}" ]; then
+	echo "db_password can't be empty"
+	exit 1
+fi
+
+if [ -z "${!DB_JAIL}" ]; then
+	echo "db_jail can't be empty"
+	exit 1
+	fi
+
+if [ -z "${!JAIL_IP}" ]; then
+	echo "ip4_addr can't be empty"
+	exit 1
+fi
+
+if [ -z "${!ADMIN_TOKEN}" ]; then
+ADMIN_TOKEN=$(openssl rand -base64 16)
+fi
+
+iocage exec "${1}" service bitwarden stop
+
+# install latest rust version, pkg version is outdated and can't build bitwarden_rs
+iocage exec "${1}" "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y"
+
+# Install Bitwarden_rs
+iocage exec "${1}" "git -C /usr/local/share/bitwarden/src fetch"
+TAG=$(iocage exec "${1}" "git -C /usr/local/share/bitwarden/src tag --sort=v:refname | tail -n1")
+iocage exec "${1}" "git -C /usr/local/share/bitwarden/src checkout ${TAG}"
+#TODO replace with: cargo build --features mysql --release
+if [ "${INSTALL_TYPE}" == "mariadb" ]; then
+	iocage exec "${1}" "cd /usr/local/share/bitwarden/src && $HOME/.cargo/bin/cargo build --features mysql --release"
+	iocage exec "${1}" "cd /usr/local/share/bitwarden/src && $HOME/.cargo/bin/cargo install diesel_cli --no-default-features --features mysql"
+else
+	iocage exec "${1}" "cd /usr/local/share/bitwarden/src && $HOME/.cargo/bin/cargo build --features sqlite --release"
+	iocage exec "${1}" "cd /usr/local/share/bitwarden/src && $HOME/.cargo/bin/cargo install diesel_cli --no-default-features --features sqlite-bundled"
+fi
+
+
+iocage exec "${1}" cp -r /usr/local/share/bitwarden/src/target/release /usr/local/share/bitwarden/bin
+
+# Download and install webvault
+WEB_RELEASE_URL=$(curl -Ls -o /dev/null -w "%{url_effective}" https://github.com/dani-garcia/bw_web_builds/releases/latest)
+WEB_TAG="${WEB_RELEASE_URL##*/}"
+iocage exec "${1}" "fetch http://github.com/dani-garcia/bw_web_builds/releases/download/$WEB_TAG/bw_web_$WEB_TAG.tar.gz -o /usr/local/share/bitwarden"
+iocage exec "${1}" "tar -xzvf /usr/local/share/bitwarden/bw_web_$WEB_TAG.tar.gz -C /usr/local/share/bitwarden/"
+iocage exec "${1}" rm /usr/local/share/bitwarden/bw_web_"$WEB_TAG".tar.gz
+
+iocage exec "${1}" chown -R bitwarden:bitwarden /usr/local/share/bitwarden /config
+# shellcheck disable=SC2154
+cp "${SCRIPT_DIR}"/blueprints/"${1}"/includes/bitwarden.rc /mnt/"${global_dataset_iocage}"/jails/"${1}"/root/usr/local/etc/rc.d/bitwarden
+cp "${SCRIPT_DIR}"/blueprints/"${1}"/includes/bitwarden.rc.conf /mnt/"${global_dataset_iocage}"/jails/"${1}"/root/usr/local/etc/rc.conf.d/bitwarden
+echo 'export DATABASE_URL="'"${DB_STRING}"'"' >> /mnt/"${global_dataset_iocage}"/jails/"${1}"/root/usr/local/etc/rc.conf.d/bitwarden
+echo 'export ADMIN_TOKEN="'"${!ADMIN_TOKEN}"'"' >> /mnt/"${global_dataset_iocage}"/jails/"${1}"/root/usr/local/etc/rc.conf.d/bitwarden
+
+if [ "${!ADMIN_TOKEN}" == "NONE" ]; then
+	echo "Admin_token set to NONE, disabling admin portal"
+else
+	echo "Admin_token set and admin portal enabled"
+	iocage exec "${1}" echo "${DB_NAME} Admin Token is ${!ADMIN_TOKEN}" > /root/"${1}"_admin_token.txt
+fi
+
+
+iocage exec "${1}" chmod u+x /usr/local/etc/rc.d/bitwarden
+iocage exec "${1}" service bitwarden restart
+echo "Jail ${1} finished Bitwarden update."
+echo "Admin Token is ${!ADMIN_TOKEN}"
diff --git a/blueprints/influxdb/config.yml b/blueprints/influxdb/config.yml
new file mode 100644
index 00000000..da7c0120
--- /dev/null
+++ b/blueprints/influxdb/config.yml
@@ -0,0 +1,3 @@
+blueprint:
+  influxdb:
+    pkgs: influxdb
\ No newline at end of file
diff --git a/jails/influxdb/includes/influxd.conf b/blueprints/influxdb/includes/influxd.conf
similarity index 100%
rename from jails/influxdb/includes/influxd.conf
rename to blueprints/influxdb/includes/influxd.conf
diff --git a/blueprints/influxdb/install.sh b/blueprints/influxdb/install.sh
new file mode 100755
index 00000000..be79b3fe
--- /dev/null
+++ b/blueprints/influxdb/install.sh
@@ -0,0 +1,32 @@
+#!/usr/local/bin/bash
+# This script installs the current release of InfluxDB
+
+#####
+# 
+# Init and Mounts
+#
+#####
+
+# Initialise variables
+# shellcheck disable=SC2154
+JAIL_IP="jail_${1}_ip4_addr"
+JAIL_IP="${!JAIL_IP%/*}"
+INCLUDES_PATH="${SCRIPT_DIR}/blueprints/influxdb/includes"
+
+# Mount and configure proper configuration location
+# shellcheck disable=SC2154
+cp -rf "${INCLUDES_PATH}/influxd.conf" "/mnt/${global_dataset_config}/${1}/influxd.conf"
+iocage exec "${1}" mkdir -p /config/db/data /config/db/meta /config/db/wal
+iocage exec "${1}" chown -R influxd:influxd /config/db
+iocage exec "${1}" sysrc influxd_conf="/config/influxd.conf"
+iocage exec "${1}" sysrc influxd_enable="YES"
+
+# Start influxdb and wait for it to startup
+iocage exec "${1}" service influxd start
+sleep 15
+
+# Done!
+echo "Installation complete!"
+echo "Your may connect InfluxDB plugins to the InfluxDB jail at http://${JAIL_IP}:8086."
+echo "You may connect InfluxDB plugins to the InfluxDB jail at http://${JAIL_IP}:8086."
+echo ""
diff --git a/jails/influxdb/readme.md b/blueprints/influxdb/readme.md
similarity index 100%
rename from jails/influxdb/readme.md
rename to blueprints/influxdb/readme.md
diff --git a/jails/influxdb/update.sh b/blueprints/influxdb/update.sh
old mode 100644
new mode 100755
similarity index 64%
rename from jails/influxdb/update.sh
rename to blueprints/influxdb/update.sh
index a216ec27..c0b00e28
--- a/jails/influxdb/update.sh
+++ b/blueprints/influxdb/update.sh
@@ -1,6 +1,6 @@
 #!/usr/local/bin/bash
 # This file contains the update script for influxdb
 
-iocage exec influxdb service influxd stop
+iocage exec "$1" service influxd stop
 # InfluxDB is updated during PKG update, this file is mostly just a placeholder
-iocage exec influxdb service influxd restart
\ No newline at end of file
+iocage exec "$1" service influxd restart
\ No newline at end of file
diff --git a/blueprints/jackett/config.yml b/blueprints/jackett/config.yml
new file mode 100644
index 00000000..ef43a221
--- /dev/null
+++ b/blueprints/jackett/config.yml
@@ -0,0 +1,3 @@
+blueprint:
+  jackett:
+    pkgs: mono
\ No newline at end of file
diff --git a/jails/jackett/includes/jackett.rc b/blueprints/jackett/includes/jackett.rc
similarity index 100%
rename from jails/jackett/includes/jackett.rc
rename to blueprints/jackett/includes/jackett.rc
diff --git a/blueprints/jackett/install.sh b/blueprints/jackett/install.sh
new file mode 100755
index 00000000..d5e4ede7
--- /dev/null
+++ b/blueprints/jackett/install.sh
@@ -0,0 +1,14 @@
+#!/usr/local/bin/bash
+# This file contains the install script for jackett
+
+iocage exec "$1" "fetch https://github.com/Jackett/Jackett/releases/download/v0.11.502/Jackett.Binaries.Mono.tar.gz -o /usr/local/share"
+iocage exec "$1" "tar -xzvf /usr/local/share/Jackett.Binaries.Mono.tar.gz -C /usr/local/share"
+iocage exec "$1" rm /usr/local/share/Jackett.Binaries.Mono.tar.gz
+iocage exec "$1" "pw user add jackett -c jackett -u 818 -d /nonexistent -s /usr/bin/nologin"
+iocage exec "$1" chown -R jackett:jackett /usr/local/share/Jackett /config
+iocage exec "$1" mkdir /usr/local/etc/rc.d
+# shellcheck disable=SC2154
+cp "${SCRIPT_DIR}"/blueprints/jackett/includes/jackett.rc /mnt/"${global_dataset_iocage}"/jails/"$1"/root/usr/local/etc/rc.d/jackett
+iocage exec "$1" chmod u+x /usr/local/etc/rc.d/jackett
+iocage exec "$1" sysrc "jackett_enable=YES"
+iocage exec "$1" service jackett restart
diff --git a/jails/jackett/readme.md b/blueprints/jackett/readme.md
old mode 100755
new mode 100644
similarity index 100%
rename from jails/jackett/readme.md
rename to blueprints/jackett/readme.md
diff --git a/blueprints/jackett/update.sh b/blueprints/jackett/update.sh
new file mode 100755
index 00000000..f0c700dc
--- /dev/null
+++ b/blueprints/jackett/update.sh
@@ -0,0 +1,10 @@
+#!/usr/local/bin/bash
+# This file contains the update script for jackett
+
+iocage exec "$1" service jackett stop
+#TODO insert code to update jacket itself here
+iocage exec "$1" chown -R jackett:jackett /usr/local/share/Jackett /config
+# shellcheck disable=SC2154
+cp "${SCRIPT_DIR}"/blueprints/jackett/includes/jackett.rc /mnt/"${global_dataset_iocage}"/jails/"$1"/root/usr/local/etc/rc.d/jackett
+iocage exec "$1" chmod u+x /usr/local/etc/rc.d/jackett
+iocage exec "$1" service jackett restart
diff --git a/blueprints/kms/config.yml b/blueprints/kms/config.yml
new file mode 100644
index 00000000..d3aa5d24
--- /dev/null
+++ b/blueprints/kms/config.yml
@@ -0,0 +1,3 @@
+blueprint:
+  kms:
+    pkgs: bash py37-tkinter py37-pip py37-sqlite3 git
\ No newline at end of file
diff --git a/jails/kms/includes/Activate_Office_2019_Pro.bat b/blueprints/kms/includes/Activate_Office_2019_Pro.bat
old mode 100755
new mode 100644
similarity index 100%
rename from jails/kms/includes/Activate_Office_2019_Pro.bat
rename to blueprints/kms/includes/Activate_Office_2019_Pro.bat
diff --git a/jails/kms/includes/Activate_Windows_10_Pro.bat b/blueprints/kms/includes/Activate_Windows_10_Pro.bat
old mode 100755
new mode 100644
similarity index 100%
rename from jails/kms/includes/Activate_Windows_10_Pro.bat
rename to blueprints/kms/includes/Activate_Windows_10_Pro.bat
diff --git a/jails/kms/includes/Activate_Windows_Server_2019_Standard.bat b/blueprints/kms/includes/Activate_Windows_Server_2019_Standard.bat
old mode 100755
new mode 100644
similarity index 100%
rename from jails/kms/includes/Activate_Windows_Server_2019_Standard.bat
rename to blueprints/kms/includes/Activate_Windows_Server_2019_Standard.bat
diff --git a/jails/kms/includes/Office-2019-Pro-VLK-Config.xml b/blueprints/kms/includes/Office-2019-Pro-VLK-Config.xml
old mode 100755
new mode 100644
similarity index 100%
rename from jails/kms/includes/Office-2019-Pro-VLK-Config.xml
rename to blueprints/kms/includes/Office-2019-Pro-VLK-Config.xml
diff --git a/jails/kms/includes/Readme.md b/blueprints/kms/includes/Readme.md
old mode 100755
new mode 100644
similarity index 100%
rename from jails/kms/includes/Readme.md
rename to blueprints/kms/includes/Readme.md
diff --git a/jails/kms/includes/Setup_Office_2019_Pro.txt b/blueprints/kms/includes/Setup_Office_2019_Pro.txt
old mode 100755
new mode 100644
similarity index 100%
rename from jails/kms/includes/Setup_Office_2019_Pro.txt
rename to blueprints/kms/includes/Setup_Office_2019_Pro.txt
diff --git a/jails/kms/includes/py_kms.rc b/blueprints/kms/includes/py_kms.rc
similarity index 100%
rename from jails/kms/includes/py_kms.rc
rename to blueprints/kms/includes/py_kms.rc
diff --git a/blueprints/kms/install.sh b/blueprints/kms/install.sh
new file mode 100755
index 00000000..4ca49f7f
--- /dev/null
+++ b/blueprints/kms/install.sh
@@ -0,0 +1,12 @@
+#!/usr/local/bin/bash
+# This file contains the install script for KMS
+
+iocage exec "$1" svn checkout https://github.com/SystemRage/py-kms/trunk/py-kms /usr/local/share/py-kms
+iocage exec "$1" "pw user add kms -c kms -u 666 -d /nonexistent -s /usr/bin/nologin"
+iocage exec "$1" chown -R kms:kms /usr/local/share/py-kms /config
+iocage exec "$1" mkdir /usr/local/etc/rc.d
+# shellcheck disable=SC2154
+cp "${SCRIPT_DIR}"/blueprints/kms/includes/py_kms.rc /mnt/"${global_dataset_iocage}"/jails/"$1"/root/usr/local/etc/rc.d/py_kms
+iocage exec "$1" chmod u+x /usr/local/etc/rc.d/py_kms
+iocage exec "$1" sysrc "py_kms_enable=YES"
+iocage exec "$1" service py_kms start
\ No newline at end of file
diff --git a/jails/kms/readme.md b/blueprints/kms/readme.md
old mode 100755
new mode 100644
similarity index 100%
rename from jails/kms/readme.md
rename to blueprints/kms/readme.md
diff --git a/blueprints/kms/update.sh b/blueprints/kms/update.sh
new file mode 100755
index 00000000..24636602
--- /dev/null
+++ b/blueprints/kms/update.sh
@@ -0,0 +1,10 @@
+#!/usr/local/bin/bash
+# This file contains the update script for KMS
+
+iocage exec "$1" service py_kms stop
+iocage exec "$1" svn checkout https://github.com/SystemRage/py-kms/trunk/py-kms /usr/local/share/py-kms
+iocage exec "$1" chown -R kms:kms /usr/local/share/py-kms /config
+# shellcheck disable=SC2154
+cp "${SCRIPT_DIR}"/blueprints/kms/includes/py_kms.rc /mnt/"${global_dataset_iocage}"/jails/"$1"/root/usr/local/etc/rc.d/py_kms
+iocage exec "$1" chmod u+x /usr/local/etc/rc.d/py_kms
+iocage exec "$1" service py_kms start
\ No newline at end of file
diff --git a/blueprints/lidarr/config.yml b/blueprints/lidarr/config.yml
new file mode 100644
index 00000000..08b7eec5
--- /dev/null
+++ b/blueprints/lidarr/config.yml
@@ -0,0 +1,3 @@
+blueprint:
+  lidarr: lidarr
+    pkgs: mono mediainfo sqlite3
\ No newline at end of file
diff --git a/jails/lidarr/includes/lidarr.rc b/blueprints/lidarr/includes/lidarr.rc
similarity index 100%
rename from jails/lidarr/includes/lidarr.rc
rename to blueprints/lidarr/includes/lidarr.rc
diff --git a/blueprints/lidarr/install.sh b/blueprints/lidarr/install.sh
new file mode 100755
index 00000000..119f9ebc
--- /dev/null
+++ b/blueprints/lidarr/install.sh
@@ -0,0 +1,25 @@
+#!/usr/local/bin/bash
+# This file contains the install script for lidarr
+
+# Check if dataset for completed download and it parent dataset exist, create if they do not.
+# shellcheck disable=SC2154
+createmount "$1" "${global_dataset_downloads}"
+createmount "$1" "${global_dataset_downloads}"/complete /mnt/fetched
+
+# Check if dataset for media library and the dataset for movies exist, create if they do not.
+# shellcheck disable=SC2154
+createmount "$1" "${global_dataset_media}"
+createmount "$1" "${global_dataset_media}"/music /mnt/music
+
+
+iocage exec "$1" "fetch https://github.com/lidarr/Lidarr/releases/download/v0.2.0.371/Lidarr.develop.0.2.0.371.linux.tar.gz -o /usr/local/share"
+iocage exec "$1" "tar -xzvf /usr/local/share/Lidarr.develop.0.2.0.371.linux.tar.gz -C /usr/local/share"
+iocage exec "$1" "rm /usr/local/share/Lidarr.develop.0.2.0.371.linux.tar.gz"
+iocage exec "$1" "pw user add lidarr -c lidarr -u 353 -d /nonexistent -s /usr/bin/nologin"
+iocage exec "$1" chown -R lidarr:lidarr /usr/local/share/Lidarr /config
+iocage exec "$1" mkdir /usr/local/etc/rc.d
+# shellcheck disable=SC2154
+cp "${SCRIPT_DIR}"/blueprints/lidarr/includes/lidarr.rc /mnt/"${global_dataset_iocage}"/jails/"$1"/root/usr/local/etc/rc.d/lidarr
+iocage exec "$1" chmod u+x /usr/local/etc/rc.d/lidarr
+iocage exec "$1" sysrc "lidarr_enable=YES"
+iocage exec "$1" service lidarr start
diff --git a/jails/lidarr/readme.md b/blueprints/lidarr/readme.md
old mode 100755
new mode 100644
similarity index 100%
rename from jails/lidarr/readme.md
rename to blueprints/lidarr/readme.md
diff --git a/blueprints/lidarr/update.sh b/blueprints/lidarr/update.sh
new file mode 100755
index 00000000..2e5edf9e
--- /dev/null
+++ b/blueprints/lidarr/update.sh
@@ -0,0 +1,10 @@
+#!/usr/local/bin/bash
+# This file contains the update script for lidarr
+
+iocage exec "$1" service lidarr stop
+#TODO insert code to update lidarr itself here
+iocage exec "$1" chown -R lidarr:lidarr /usr/local/share/lidarr /config
+# shellcheck disable=SC2154
+cp "${SCRIPT_DIR}"/blueprints/lidarr/includes/lidarr.rc /mnt/"${global_dataset_iocage}"/jails/"$1"/root/usr/local/etc/rc.d/lidarr
+iocage exec "$1" chmod u+x /usr/local/etc/rc.d/lidarr
+iocage exec "$1" service lidarr restart
\ No newline at end of file
diff --git a/blueprints/mariadb/config.yml b/blueprints/mariadb/config.yml
new file mode 100644
index 00000000..05feae35
--- /dev/null
+++ b/blueprints/mariadb/config.yml
@@ -0,0 +1,3 @@
+blueprint:
+  mariadb:
+    pkgs: mariadb104-server git  php74-session php74-xml php74-ctype php74-openssl php74-filter php74-gd php74-json php74-mysqli php74-mbstring php74-zlib php74-zip php74-bz2 phpMyAdmin5-php74 php74-pdo_mysql php74-mysqli phpMyAdmin5-php74-5.0.1
diff --git a/jails/mariadb/includes/Caddyfile b/blueprints/mariadb/includes/Caddyfile
old mode 100755
new mode 100644
similarity index 100%
rename from jails/mariadb/includes/Caddyfile
rename to blueprints/mariadb/includes/Caddyfile
diff --git a/jails/mariadb/includes/caddy b/blueprints/mariadb/includes/caddy.rc
similarity index 100%
rename from jails/mariadb/includes/caddy
rename to blueprints/mariadb/includes/caddy.rc
diff --git a/jails/mariadb/includes/my-system.cnf b/blueprints/mariadb/includes/my-system.cnf
old mode 100755
new mode 100644
similarity index 100%
rename from jails/mariadb/includes/my-system.cnf
rename to blueprints/mariadb/includes/my-system.cnf
diff --git a/jails/mariadb/includes/my.cnf b/blueprints/mariadb/includes/my.cnf
old mode 100755
new mode 100644
similarity index 100%
rename from jails/mariadb/includes/my.cnf
rename to blueprints/mariadb/includes/my.cnf
diff --git a/blueprints/mariadb/install.sh b/blueprints/mariadb/install.sh
new file mode 100755
index 00000000..e94678b0
--- /dev/null
+++ b/blueprints/mariadb/install.sh
@@ -0,0 +1,117 @@
+#!/usr/local/bin/bash
+# This script installs the current release of Mariadb and PhpMyAdmin into a created jail
+#####
+# 
+# Init and Mounts
+#
+#####
+
+# Initialise defaults
+# shellcheck disable=SC2154
+JAIL_IP="jail_${1}_ip4_addr"
+JAIL_IP="${!JAIL_IP%/*}"
+INCLUDES_PATH="${SCRIPT_DIR}/blueprints/mariadb/includes"
+# shellcheck disable=SC2154
+CERT_EMAIL="jail_${1}_cert_email"
+CERT_EMAIL="${!CERT_EMAIL:-placeholder@email.fake}"
+# shellcheck disable=SC2154
+DB_ROOT_PASSWORD="jail_${1}_db_root_password"
+HOST_NAME="jail_${1}_host_name"
+DL_FLAGS=""
+DNS_ENV=""
+
+# Check that necessary variables were set by nextcloud-config
+if [ -z "${JAIL_IP}" ]; then
+  echo 'Configuration error: The mariadb jail does NOT accept DHCP'
+  echo 'Please reinstall using a fixed IP adress'
+  exit 1
+fi
+
+# Make sure DB_PATH is empty -- if not, MariaDB/PostgreSQL will choke
+# shellcheck disable=SC2154
+if [ "$(ls -A "/mnt/${global_dataset_config}/${1}/db")" ]; then
+	echo "Reinstall of mariadb detected... Continuing"
+	REINSTALL="true"
+fi
+
+# Mount database dataset and set zfs preferences
+createmount "${1}" "${global_dataset_config}"/"${1}"/db /var/db/mysql
+zfs set recordsize=16K "${global_dataset_config}"/"${1}"/db
+zfs set primarycache=metadata "${global_dataset_config}"/"${1}"/db
+
+iocage exec "${1}" chown -R 88:88 /var/db/mysql
+
+# Install includes fstab
+iocage exec "${1}" mkdir -p /mnt/includes
+iocage fstab -a "${1}" "${INCLUDES_PATH}" /mnt/includes nullfs rw 0 0
+
+iocage exec "${1}" mkdir -p /usr/local/www/phpmyadmin
+iocage exec "${1}" chown -R www:www /usr/local/www/phpmyadmin
+
+#####
+# 
+# Install mariadb, Caddy and PhpMyAdmin
+#
+#####
+
+fetch -o /tmp https://getcaddy.com
+if ! iocage exec "${1}" bash -s personal "${DL_FLAGS}" < /tmp/getcaddy.com
+then
+	echo "Failed to download/install Caddy"
+	exit 1
+fi
+
+iocage exec "${1}" sysrc mysql_enable="YES"
+
+# Copy and edit pre-written config files
+echo "Copying Caddyfile for no SSL"
+iocage exec "${1}" cp -f /mnt/includes/caddy.rc /usr/local/etc/rc.d/caddy
+iocage exec "${1}" cp -f /mnt/includes/Caddyfile /usr/local/www/Caddyfile
+# shellcheck disable=SC2154
+iocage exec "${1}" sed -i '' "s/yourhostnamehere/${!HOST_NAME}/" /usr/local/www/Caddyfile
+iocage exec "${1}" sed -i '' "s/JAIL-IP/${JAIL_IP}/" /usr/local/www/Caddyfile
+
+iocage exec "${1}" sysrc caddy_enable="YES"
+iocage exec "${1}" sysrc php_fpm_enable="YES"
+iocage exec "${1}" sysrc caddy_cert_email="${CERT_EMAIL}"
+iocage exec "${1}" sysrc caddy_env="${DNS_ENV}"
+
+iocage restart "${1}"
+sleep 10
+
+if [ "${REINSTALL}" == "true" ]; then
+	echo "Reinstall detected, skipping generaion of new config and database"
+else
+	
+	# Secure database, set root password, create Nextcloud DB, user, and password
+	iocage exec "${1}" cp -f /mnt/includes/my-system.cnf /var/db/mysql/my.cnf
+	iocage exec "${1}" mysql -u root -e "DELETE FROM mysql.user WHERE User='';"
+	iocage exec "${1}" mysql -u root -e "DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1');"
+	iocage exec "${1}" mysql -u root -e "DROP DATABASE IF EXISTS test;"
+	iocage exec "${1}" mysql -u root -e "DELETE FROM mysql.db WHERE Db='test' OR Db='test\\_%';"
+	iocage exec "${1}" mysqladmin --user=root password "${!DB_ROOT_PASSWORD}"
+	iocage exec "${1}" mysqladmin reload
+fi
+iocage exec "${1}" cp -f /mnt/includes/my.cnf /root/.my.cnf
+iocage exec "${1}" sed -i '' "s|mypassword|${!DB_ROOT_PASSWORD}|" /root/.my.cnf
+
+# Save passwords for later reference
+iocage exec "${1}" echo "MariaDB root password is ${!DB_ROOT_PASSWORD}" > /root/"${1}"_db_password.txt
+	
+
+# Don't need /mnt/includes any more, so unmount it
+iocage fstab -r "${1}" "${INCLUDES_PATH}" /mnt/includes nullfs rw 0 0
+
+# Done!
+echo "Installation complete!"
+echo "Using your web browser, go to http://${!HOST_NAME} to log in"
+
+if [ "${REINSTALL}" == "true" ]; then
+	echo "You did a reinstall, please use your old database and account credentials"
+else
+	echo "Database Information"
+	echo "--------------------"
+	echo "The MariaDB root password is ${!DB_ROOT_PASSWORD}"
+	fi
+echo ""
+echo "All passwords are saved in /root/${1}_db_password.txt"
diff --git a/jails/mariadb/readme.md b/blueprints/mariadb/readme.md
old mode 100755
new mode 100644
similarity index 100%
rename from jails/mariadb/readme.md
rename to blueprints/mariadb/readme.md
diff --git a/blueprints/mariadb/update.sh b/blueprints/mariadb/update.sh
new file mode 100755
index 00000000..8e20ef6d
--- /dev/null
+++ b/blueprints/mariadb/update.sh
@@ -0,0 +1,37 @@
+#!/usr/local/bin/bash
+# This file contains the update script for mariadb
+
+# shellcheck disable=SC2154
+JAIL_IP="jail_${1}_ip4_addr"
+JAIL_IP="${!JAIL_IP%/*}"
+HOST_NAME="jail_${1}_host_name"
+INCLUDES_PATH="${SCRIPT_DIR}/blueprints/mariadb/includes"
+
+# Install includes fstab
+iocage exec "${1}" mkdir -p /mnt/includes
+iocage fstab -a "${1}" "${INCLUDES_PATH}" /mnt/includes nullfs rw 0 0
+
+
+iocage exec "${1}" service caddy stop
+iocage exec "${1}" service php-fpm stop
+
+fetch -o /tmp https://getcaddy.com
+if ! iocage exec "${1}" bash -s personal "${DL_FLAGS}" < /tmp/getcaddy.com
+then
+	echo "Failed to download/install Caddy"
+	exit 1
+fi
+
+# Copy and edit pre-written config files
+echo "Copying Caddyfile for no SSL"
+iocage exec "${1}" cp -f /mnt/includes/caddy /usr/local/etc/rc.d/
+iocage exec "${1}" cp -f /mnt/includes/Caddyfile /usr/local/www/Caddyfile
+# shellcheck disable=SC2154
+iocage exec "${1}" sed -i '' "s/yourhostnamehere/${HOST_NAME}/" /usr/local/www/Caddyfile
+iocage exec "${1}" sed -i '' "s/JAIL-IP/${JAIL_IP}/" /usr/local/www/Caddyfile
+
+# Don't need /mnt/includes any more, so unmount it
+iocage fstab -r "${1}" "${INCLUDES_PATH}" /mnt/includes nullfs rw 0 0
+
+iocage exec "${1}" service caddy start
+iocage exec "${1}" service php-fpm start
\ No newline at end of file
diff --git a/jails/nextcloud/LICENSE b/blueprints/nextcloud/LICENSE
old mode 100755
new mode 100644
similarity index 100%
rename from jails/nextcloud/LICENSE
rename to blueprints/nextcloud/LICENSE
diff --git a/blueprints/nextcloud/config.yml b/blueprints/nextcloud/config.yml
new file mode 100644
index 00000000..0f8e0193
--- /dev/null
+++ b/blueprints/nextcloud/config.yml
@@ -0,0 +1,4 @@
+blueprint:
+  nextcloud:
+    pkgs:   nano sudo redis php73-ctype gnupg php73-dom php73-gd php73-iconv php73-json php73-mbstring php73-posix php73-simplexml php73-xmlreader php73-xmlwriter php73-zip php73-zlib php73-hash php73-xml php73 php73-pecl-redis php73-session php73-wddx php73-xsl php73-filter php73-pecl-APCu php73-curl php73-fileinfo php73-bz2 php73-intl php73-openssl php73-ldap php73-ftp php73-imap php73-exif php73-gmp php73-pecl-memcache php73-pecl-imagick php73-pecl-smbclient perl5 p5-Locale-gettext help2man texinfo m4 autoconf
+    ports: true
\ No newline at end of file
diff --git a/jails/nextcloud/includes/Caddyfile b/blueprints/nextcloud/includes/Caddyfile
old mode 100755
new mode 100644
similarity index 100%
rename from jails/nextcloud/includes/Caddyfile
rename to blueprints/nextcloud/includes/Caddyfile
diff --git a/jails/nextcloud/includes/Caddyfile-nossl b/blueprints/nextcloud/includes/Caddyfile-nossl
old mode 100755
new mode 100644
similarity index 100%
rename from jails/nextcloud/includes/Caddyfile-nossl
rename to blueprints/nextcloud/includes/Caddyfile-nossl
diff --git a/jails/nextcloud/includes/Caddyfile-selfsigned b/blueprints/nextcloud/includes/Caddyfile-selfsigned
old mode 100755
new mode 100644
similarity index 100%
rename from jails/nextcloud/includes/Caddyfile-selfsigned
rename to blueprints/nextcloud/includes/Caddyfile-selfsigned
diff --git a/jails/nextcloud/includes/caddy b/blueprints/nextcloud/includes/caddy.rc
similarity index 100%
rename from jails/nextcloud/includes/caddy
rename to blueprints/nextcloud/includes/caddy.rc
diff --git a/jails/nextcloud/includes/my-system.cnf b/blueprints/nextcloud/includes/my-system.cnf
old mode 100755
new mode 100644
similarity index 100%
rename from jails/nextcloud/includes/my-system.cnf
rename to blueprints/nextcloud/includes/my-system.cnf
diff --git a/jails/nextcloud/includes/my.cnf b/blueprints/nextcloud/includes/my.cnf
old mode 100755
new mode 100644
similarity index 100%
rename from jails/nextcloud/includes/my.cnf
rename to blueprints/nextcloud/includes/my.cnf
diff --git a/jails/nextcloud/includes/pgpass b/blueprints/nextcloud/includes/pgpass
old mode 100755
new mode 100644
similarity index 100%
rename from jails/nextcloud/includes/pgpass
rename to blueprints/nextcloud/includes/pgpass
diff --git a/jails/nextcloud/includes/php.ini b/blueprints/nextcloud/includes/php.ini
old mode 100755
new mode 100644
similarity index 100%
rename from jails/nextcloud/includes/php.ini
rename to blueprints/nextcloud/includes/php.ini
diff --git a/jails/nextcloud/includes/redis.conf b/blueprints/nextcloud/includes/redis.conf
old mode 100755
new mode 100644
similarity index 100%
rename from jails/nextcloud/includes/redis.conf
rename to blueprints/nextcloud/includes/redis.conf
diff --git a/jails/nextcloud/includes/remove-staging.sh b/blueprints/nextcloud/includes/remove-staging.sh
similarity index 100%
rename from jails/nextcloud/includes/remove-staging.sh
rename to blueprints/nextcloud/includes/remove-staging.sh
diff --git a/jails/nextcloud/includes/www-crontab b/blueprints/nextcloud/includes/www-crontab
old mode 100755
new mode 100644
similarity index 100%
rename from jails/nextcloud/includes/www-crontab
rename to blueprints/nextcloud/includes/www-crontab
diff --git a/jails/nextcloud/includes/www.conf b/blueprints/nextcloud/includes/www.conf
old mode 100755
new mode 100644
similarity index 100%
rename from jails/nextcloud/includes/www.conf
rename to blueprints/nextcloud/includes/www.conf
diff --git a/blueprints/nextcloud/install.sh b/blueprints/nextcloud/install.sh
new file mode 100755
index 00000000..79f56f3f
--- /dev/null
+++ b/blueprints/nextcloud/install.sh
@@ -0,0 +1,321 @@
+#!/usr/local/bin/bash
+# This script installs the current release of Nextcloud into a create jail
+# Based on the example by danb35: https://github.com/danb35/freenas-iocage-nextcloud
+
+# Initialise defaults
+# General Defaults
+JAIL_IP="jail_${1}_ip4_addr"
+JAIL_IP="${!JAIL_IP%/*}"
+HOST_NAME="jail_${1}_host_name"
+TIME_ZONE="jail_${1}_time_zone"
+INCLUDES_PATH="${SCRIPT_DIR}/blueprints/nextcloud/includes"
+
+# SSL/CERT Defaults
+CERT_TYPE="jail_${1}_cert_type"
+CERT_TYPE="${!CERT_TYPE:-SELFSIGNED_CERT}"
+CERT_EMAIL="jail_${1}_cert_email"
+CERT_EMAIL="${!CERT_EMAIL:-placeholder@email.fake}"
+DNS_PLUGIN="jail_${1}_dns_plugin"
+DNS_ENV="jail_${1}_dns_env"
+
+# Database Defaults
+DB_TYPE="jail_${1}_db_type"
+DB_TYPE="${!DB_TYPE:-mariadb}"
+DB_JAIL="jail_${1}_db_jail"
+# shellcheck disable=SC2154
+DB_HOST="jail_${!DB_JAIL}_ip4_addr"
+DB_HOST="${!DB_HOST%/*}:3306"
+
+DB_PASSWORD="jail_${1}_db_password"
+
+DB_DATABASE="jail_${1}_db_database"
+DB_DATABASE="${!DB_DATABASE:-$1}"
+
+DB_USER="jail_${1}_db_user"
+DB_USER="${!DB_USER:-$DB_DATABASE}"
+
+ADMIN_PASSWORD="jail_${1}_admin_password"
+
+#####
+# 
+# Input Sanity Check 
+#
+#####
+
+
+# Check that necessary variables were set by nextcloud-config
+if [ -z "${JAIL_IP}" ]; then
+  echo 'Configuration error: The Nextcloud jail does NOT accept DHCP'
+  echo 'Please reinstall using a fixed IP adress'
+  exit 1
+fi
+
+if [ -z "${ADMIN_PASSWORD}" ]; then
+  echo 'Configuration error: The Nextcloud jail requires a admin_password'
+  echo 'Please reinstall using a fixed IP adress'
+  exit 1
+fi
+
+if [ -z "${!DB_PASSWORD}" ]; then
+  echo 'Configuration error: The Nextcloud Jail needs a database password'
+  echo 'Please reinstall with a defifined: db_password'
+  exit 1
+fi
+
+# shellcheck disable=SC2154
+if [ -z "${!TIME_ZONE}" ]; then
+  echo 'Configuration error: !TIME_ZONE must be set'
+  exit 1
+fi
+if [ -z "${!HOST_NAME}" ]; then
+  echo 'Configuration error: !HOST_NAME must be set'
+  exit 1
+fi
+
+
+
+if [ "$CERT_TYPE" != "STANDALONE_CERT" ] && [ "$CERT_TYPE" != "DNS_CERT" ] && [ "$CERT_TYPE" != "NO_CERT" ] && [ "$CERT_TYPE" != "SELFSIGNED_CERT" ]; then
+  echo 'Configuration error, cert_type options: STANDALONE_CERT, DNS_CERT, NO_CERT or SELFSIGNED_CERT'
+  exit 1
+fi
+
+if [ "$CERT_TYPE" == "DNS_CERT" ]; then
+	if [ -z "${!DNS_PLUGIN}" ] ; then
+		echo "DNS_PLUGIN must be set to a supported DNS provider."
+		echo "See https://caddyserver.com/docs under the heading of \"DNS Providers\" for list."
+		echo "Be sure to omit the prefix of \"tls.dns.\"."
+		exit 1
+	elif [ -z "${!DNS_ENV}" ] ; then
+		echo "DNS_ENV must be set to a your DNS provider\'s authentication credentials."
+		echo "See https://caddyserver.com/docs under the heading of \"DNS Providers\" for more."
+		exit 1
+	else
+		DL_FLAGS="tls.dns.${DNS_PLUGIN}"
+		DNS_SETTING="dns ${DNS_PLUGIN}"
+	fi 
+fi  
+
+# Make sure DB_PATH is empty -- if not, MariaDB will choke
+# shellcheck disable=SC2154
+if [ "$(ls -A "/mnt/${global_dataset_config}/${1}/config")" ]; then
+	echo "Reinstall of Nextcloud detected... "
+	REINSTALL="true"
+fi
+
+
+#####
+	# 
+# Fstab And Mounts
+#
+#####
+
+# Create and Mount Nextcloud, Config and Files
+createmount "${1}" "${global_dataset_config}"/"${1}"/config /usr/local/www/nextcloud/config
+createmount "${1}" "${global_dataset_config}"/"${1}"/themes /usr/local/www/nextcloud/themes
+createmount "${1}" "${global_dataset_config}"/"${1}"/files /config/files
+
+# Install includes fstab
+iocage exec "${1}" mkdir -p /mnt/includes
+iocage fstab -a "${1}" "${INCLUDES_PATH}" /mnt/includes nullfs rw 0 0
+
+
+iocage exec "${1}" chown -R www:www /config/files
+iocage exec "${1}" chmod -R 770 /config/files
+
+
+#####
+# 
+# Basic dependency install
+#
+#####
+
+if [ "${DB_TYPE}" = "mariadb" ]; then
+  iocage exec "${1}" pkg install -qy mariadb103-client php73-pdo_mysql php73-mysqli
+fi
+
+fetch -o /tmp https://getcaddy.com
+if ! iocage exec "${1}" bash -s personal "${DL_FLAGS}" < /tmp/getcaddy.com
+then
+	echo "Failed to download/install Caddy"
+	exit 1
+fi
+
+iocage exec "${1}" sysrc redis_enable="YES"
+iocage exec "${1}" sysrc php_fpm_enable="YES"
+iocage exec "${1}" sh -c "make -C /usr/ports/www/php73-opcache clean install BATCH=yes"
+iocage exec "${1}" sh -c "make -C /usr/ports/devel/php73-pcntl clean install BATCH=yes"
+
+
+#####
+# 
+# Install Nextcloud
+#
+#####
+
+FILE="latest-18.tar.bz2"
+if ! iocage exec "${1}" fetch -o /tmp https://download.nextcloud.com/server/releases/"${FILE}" https://download.nextcloud.com/server/releases/"${FILE}".asc https://nextcloud.com/nextcloud.asc
+then
+	echo "Failed to download Nextcloud"
+	exit 1
+fi
+iocage exec "${1}" gpg --import /tmp/nextcloud.asc
+if ! iocage exec "${1}" gpg --verify /tmp/"${FILE}".asc
+then
+	echo "GPG Signature Verification Failed!"
+	echo "The Nextcloud download is corrupt."
+	exit 1
+fi
+iocage exec "${1}" tar xjf /tmp/"${FILE}" -C /usr/local/www/
+iocage exec "${1}" chown -R www:www /usr/local/www/nextcloud/
+
+
+# Generate and install self-signed cert, if necessary
+if [ "$CERT_TYPE" == "SELFSIGNED_CERT" ] && [ ! -f "/mnt/${global_dataset_config}/${1}/ssl/privkey.pem" ]; then
+	echo "No ssl certificate present, generating self signed certificate"
+	if [ ! -d "/mnt/${global_dataset_config}/${1}/ssl" ]; then
+		echo "cert folder not existing... creating..."
+		iocage exec "${1}" mkdir /config/ssl
+	fi
+	openssl req -new -newkey rsa:4096 -days 3650 -nodes -x509 -subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=${!HOST_NAME}" -keyout "${INCLUDES_PATH}"/privkey.pem -out "${INCLUDES_PATH}"/fullchain.pem
+	iocage exec "${1}" cp /mnt/includes/privkey.pem /config/ssl/privkey.pem
+	iocage exec "${1}" cp /mnt/includes/fullchain.pem /config/ssl/fullchain.pem
+fi
+
+# Copy and edit pre-written config files
+iocage exec "${1}" cp -f /mnt/includes/php.ini /usr/local/etc/php.ini
+iocage exec "${1}" cp -f /mnt/includes/redis.conf /usr/local/etc/redis.conf
+iocage exec "${1}" cp -f /mnt/includes/www.conf /usr/local/etc/php-fpm.d/
+
+
+if [ "$CERT_TYPE" == "STANDALONE_CERT" ] && [ "$CERT_TYPE" == "DNS_CERT" ]; then
+	iocage exec "${1}" cp -f /mnt/includes/remove-staging.sh /root/
+fi
+
+if [ "$CERT_TYPE" == "NO_CERT" ]; then
+	echo "Copying Caddyfile for no SSL"
+	iocage exec "${1}" cp -f /mnt/includes/Caddyfile-nossl /usr/local/www/Caddyfile
+elif [ "$CERT_TYPE" == "SELFSIGNED_CERT" ]; then
+	echo "Copying Caddyfile for self-signed cert"
+	iocage exec "${1}" cp -f /mnt/includes/Caddyfile-selfsigned /usr/local/www/Caddyfile
+else
+	echo "Copying Caddyfile for Let's Encrypt cert"
+	iocage exec "${1}" cp -f /mnt/includes/Caddyfile /usr/local/www/
+fi
+
+
+iocage exec "${1}" cp -f /mnt/includes/caddy.rc /usr/local/etc/rc.d/caddy
+
+
+iocage exec "${1}" sed -i '' "s/yourhostnamehere/${!HOST_NAME}/" /usr/local/www/Caddyfile
+iocage exec "${1}" sed -i '' "s/DNS-PLACEHOLDER/${DNS_SETTING}/" /usr/local/www/Caddyfile
+iocage exec "${1}" sed -i '' "s/JAIL-IP/${JAIL_IP}/" /usr/local/www/Caddyfile
+iocage exec "${1}" sed -i '' "s|mytimezone|${!TIME_ZONE}|" /usr/local/etc/php.ini
+
+iocage exec "${1}" sysrc caddy_enable="YES"
+iocage exec "${1}" sysrc caddy_cert_email="${CERT_EMAIL}"
+iocage exec "${1}" sysrc caddy_SNI_default="${!HOST_NAME}"
+iocage exec "${1}" sysrc caddy_env="${!DNS_ENV}"
+
+iocage restart "${1}"
+
+if [ "${REINSTALL}" == "true" ]; then
+	echo "Reinstall detected, skipping generaion of new config and database"
+else
+	
+	# Secure database, set root password, create Nextcloud DB, user, and password
+	if  [ "${DB_TYPE}" = "mariadb" ]; then
+		iocage exec "mariadb" mysql -u root -e "CREATE DATABASE ${DB_DATABASE};"
+		iocage exec "mariadb" mysql -u root -e "GRANT ALL ON ${DB_DATABASE}.* TO ${DB_USER}@${JAIL_IP} IDENTIFIED BY '${!DB_PASSWORD}';"
+		iocage exec "mariadb" mysqladmin reload
+	fi
+	
+	
+	# Save passwords for later reference
+	iocage exec "${1}" echo "${DB_NAME} root password is ${DB_ROOT_PASSWORD}" > /root/"${1}"_db_password.txt
+	iocage exec "${1}" echo "Nextcloud database password is ${!DB_PASSWORD}" >> /root/"${1}"_db_password.txt
+	iocage exec "${1}" echo "Nextcloud Administrator password is ${ADMIN_PASSWORD}" >> /root/"${1}"_db_password.txt
+	
+	# CLI installation and configuration of Nextcloud
+	if [ "${DB_TYPE}" = "mariadb" ]; then
+		iocage exec "${1}" su -m www -c "php /usr/local/www/nextcloud/occ maintenance:install --database=\"mysql\" --database-name=\"${DB_DATABASE}\" --database-user=\"${DB_USER}\" --database-pass=\"${!DB_PASSWORD}\" --database-host=\"${DB_HOST}\" --admin-user=\"admin\" --admin-pass=\"${!ADMIN_PASSWORD}\" --data-dir=\"/config/files\""
+		iocage exec "${1}" su -m www -c "php /usr/local/www/nextcloud/occ config:system:set mysql.utf8mb4 --type boolean --value=\"true\""
+	fi
+	iocage exec "${1}" su -m www -c "php /usr/local/www/nextcloud/occ db:add-missing-indices"
+	iocage exec "${1}" su -m www -c "php /usr/local/www/nextcloud/occ db:convert-filecache-bigint --no-interaction"
+	iocage exec "${1}" su -m www -c "php /usr/local/www/nextcloud/occ config:system:set logtimezone --value=\"${!TIME_ZONE}\""
+	iocage exec "${1}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set log_type --value="file"'
+	iocage exec "${1}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set logfile --value="/var/log/nextcloud.log"'
+	iocage exec "${1}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set loglevel --value="2"'
+	iocage exec "${1}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set logrotate_size --value="104847600"'
+	iocage exec "${1}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set memcache.local --value="\OC\Memcache\APCu"'
+	iocage exec "${1}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set redis host --value="/tmp/redis.sock"'
+	iocage exec "${1}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set redis port --value=0 --type=integer'
+	iocage exec "${1}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set memcache.locking --value="\OC\Memcache\Redis"'
+	iocage exec "${1}" su -m www -c "php /usr/local/www/nextcloud/occ config:system:set overwritehost --value=\"${!HOST_NAME}\""
+	iocage exec "${1}" su -m www -c "php /usr/local/www/nextcloud/occ config:system:set overwriteprotocol --value=\"https\""
+	if [ "$CERT_TYPE" == "NO_CERT" ]; then
+		iocage exec "${1}" su -m www -c "php /usr/local/www/nextcloud/occ config:system:set overwrite.cli.url --value=\"http://${!HOST_NAME}/\""
+	else
+		iocage exec "${1}" su -m www -c "php /usr/local/www/nextcloud/occ config:system:set overwrite.cli.url --value=\"https://${!HOST_NAME}/\""
+	fi
+	iocage exec "${1}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set htaccess.RewriteBase --value="/"'
+	iocage exec "${1}" su -m www -c 'php /usr/local/www/nextcloud/occ maintenance:update:htaccess'
+	iocage exec "${1}" su -m www -c "php /usr/local/www/nextcloud/occ config:system:set trusted_domains 1 --value=\"${!HOST_NAME}\""
+	iocage exec "${1}" su -m www -c "php /usr/local/www/nextcloud/occ config:system:set trusted_domains 2 --value=\"${JAIL_IP}\""
+	iocage exec "${1}" su -m www -c 'php /usr/local/www/nextcloud/occ app:enable encryption'
+	iocage exec "${1}" su -m www -c 'php /usr/local/www/nextcloud/occ encryption:enable'
+	iocage exec "${1}" su -m www -c 'php /usr/local/www/nextcloud/occ encryption:disable'
+	iocage exec "${1}" su -m www -c 'php /usr/local/www/nextcloud/occ background:cron'
+	
+fi
+
+iocage exec "${1}" touch /var/log/nextcloud.log
+iocage exec "${1}" chown www /var/log/nextcloud.log
+iocage exec "${1}" su -m www -c 'php -f /usr/local/www/nextcloud/cron.php'
+iocage exec "${1}" crontab -u www /mnt/includes/www-crontab
+
+# Don't need /mnt/includes any more, so unmount it
+iocage fstab -r "${1}" "${INCLUDES_PATH}" /mnt/includes nullfs rw 0 0
+
+# Done!
+echo "Installation complete!"
+if [ "$CERT_TYPE" == "NO_CERT" ]; then
+  echo "Using your web browser, go to http://${!HOST_NAME} to log in"
+else
+  echo "Using your web browser, go to https://${!HOST_NAME} to log in"
+fi
+
+if [ "${REINSTALL}" == "true" ]; then
+	echo "You did a reinstall, please use your old database and account credentials"
+else
+
+	echo "Default user is admin, password is ${ADMIN_PASSWORD}"
+	echo ""
+
+	echo "Database Information"
+	echo "--------------------"
+	echo "Database user = ${DB_USER}"
+	echo "Database password = ${!DB_PASSWORD}"
+	echo ""
+	echo "All passwords are saved in /root/${1}_db_password.txt"
+fi
+
+echo ""
+if [ "$CERT_TYPE" == "STANDALONE_CERT" ] && [ "$CERT_TYPE" == "DNS_CERT" ]; then
+  echo "You have obtained your Let's Encrypt certificate using the staging server."
+  echo "This certificate will not be trusted by your browser and will cause SSL errors"
+  echo "when you connect.  Once you've verified that everything else is working"
+  echo "correctly, you should issue a trusted certificate.  To do this, run:"
+  echo "iocage exec ${1}/root/remove-staging.sh"
+  echo ""
+elif [ "$CERT_TYPE" == "SELFSIGNED_CERT" ]; then
+  echo "You have chosen to create a self-signed TLS certificate for your Nextcloud"
+  echo "installation.  This certificate will not be trusted by your browser and"
+  echo "will cause SSL errors when you connect.  If you wish to replace this certificate"
+  echo "with one obtained elsewhere, the private key is located at:"
+  echo "/config/ssl/privkey.pem"
+  echo "The full chain (server + intermediate certificates together) is at:"
+  echo "/config/ssl/fullchain.pem"
+  echo ""
+fi
+
diff --git a/jails/nextcloud/readme.md b/blueprints/nextcloud/readme.md
similarity index 100%
rename from jails/nextcloud/readme.md
rename to blueprints/nextcloud/readme.md
diff --git a/jails/nextcloud/update.sh b/blueprints/nextcloud/update.sh
similarity index 100%
rename from jails/nextcloud/update.sh
rename to blueprints/nextcloud/update.sh
diff --git a/blueprints/organizr/config.yml b/blueprints/organizr/config.yml
new file mode 100644
index 00000000..a06f8e48
--- /dev/null
+++ b/blueprints/organizr/config.yml
@@ -0,0 +1,3 @@
+blueprint:
+  organizr:
+    pkgs: nginx php72 php72-filter php72-curl php72-hash php72-json php72-openssl php72-pdo php72-pdo_sqlite php72-session php72-simplexml php72-sqlite3 php72-zip git
\ No newline at end of file
diff --git a/jails/organizr/includes/custom/organizr.conf b/blueprints/organizr/includes/custom/organizr.conf
old mode 100755
new mode 100644
similarity index 100%
rename from jails/organizr/includes/custom/organizr.conf
rename to blueprints/organizr/includes/custom/organizr.conf
diff --git a/jails/organizr/includes/custom/phpblock.conf b/blueprints/organizr/includes/custom/phpblock.conf
old mode 100755
new mode 100644
similarity index 100%
rename from jails/organizr/includes/custom/phpblock.conf
rename to blueprints/organizr/includes/custom/phpblock.conf
diff --git a/jails/organizr/includes/nginx.conf b/blueprints/organizr/includes/nginx.conf
old mode 100755
new mode 100644
similarity index 100%
rename from jails/organizr/includes/nginx.conf
rename to blueprints/organizr/includes/nginx.conf
diff --git a/blueprints/organizr/install.sh b/blueprints/organizr/install.sh
new file mode 100755
index 00000000..c52d0538
--- /dev/null
+++ b/blueprints/organizr/install.sh
@@ -0,0 +1,34 @@
+#!/usr/local/bin/bash
+# This file contains the install script for Organizr
+
+iocage exec "$1" sed -i '' -e 's?listen = 127.0.0.1:9000?listen = /var/run/php-fpm.sock?g' /usr/local/etc/php-fpm.d/www.conf
+iocage exec "$1" sed -i '' -e 's/;listen.owner = www/listen.owner = www/g' /usr/local/etc/php-fpm.d/www.conf
+iocage exec "$1" sed -i '' -e 's/;listen.group = www/listen.group = www/g' /usr/local/etc/php-fpm.d/www.conf
+iocage exec "$1" sed -i '' -e 's/;listen.mode = 0660/listen.mode = 0600/g' /usr/local/etc/php-fpm.d/www.conf
+iocage exec "$1" cp /usr/local/etc/php.ini-production /usr/local/etc/php.ini
+iocage exec "$1" sed -i '' -e 's?;date.timezone =?date.timezone = "Universal"?g' /usr/local/etc/php.ini
+iocage exec "$1" sed -i '' -e 's?;cgi.fix_pathinfo=1?cgi.fix_pathinfo=0?g' /usr/local/etc/php.ini
+# shellcheck disable=SC2154
+mv /mnt/"${global_dataset_iocage}"/jails/"$1"/root/usr/local/etc/nginx/nginx.conf /mnt/"${global_dataset_iocage}"/jails/"$1"/root/usr/local/etc/nginx/nginx.conf.bak
+cp "${SCRIPT_DIR}"/blueprints/organizr/includes/nginx.conf /mnt/"${global_dataset_iocage}"/jails/"$1"/root/usr/local/etc/nginx/nginx.conf
+cp -Rf "${SCRIPT_DIR}"/blueprints/organizr/includes/custom /mnt/"${global_dataset_iocage}"/jails/"$1"/root/usr/local/etc/nginx/custom
+# shellcheck disable=SC2154
+if [ ! -d "/mnt/${global_dataset_config}/$1/ssl" ]; then
+	echo "cert folder doesn't exist... creating..."
+	iocage exec "$1" mkdir /config/ssl
+fi
+
+if [ -f "/mnt/${global_dataset_config}/$1/ssl/Organizr-Cert.crt" ]; then
+    echo "certificate exists... Skipping cert generation"
+else
+	echo "No ssl certificate present, generating self signed certificate"
+	openssl req -new -newkey rsa:2048 -days 365 -nodes -x509 -subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=localhost" -keyout /mnt/"${global_dataset_config}"/"$1"/ssl/Organizr-Cert.key -out /mnt/"${global_dataset_config}"/"$1"/ssl/Organizr-Cert.crt
+fi
+
+iocage exec "$1" git clone https://github.com/causefx/Organizr.git /usr/local/www/Organizr
+iocage exec "$1" chown -R www:www /usr/local/www /config /usr/local/etc/nginx/nginx.conf /usr/local/etc/nginx/custom
+iocage exec "$1" ln -s /config/config.php /usr/local/www/Organizr/api/config/config.php
+iocage exec "$1" sysrc nginx_enable=YES
+iocage exec "$1" sysrc php_fpm_enable=YES
+iocage exec "$1" service nginx start
+iocage exec "$1" service php-fpm start
diff --git a/jails/organizr/readme.md b/blueprints/organizr/readme.md
old mode 100755
new mode 100644
similarity index 100%
rename from jails/organizr/readme.md
rename to blueprints/organizr/readme.md
diff --git a/blueprints/organizr/update.sh b/blueprints/organizr/update.sh
new file mode 100755
index 00000000..3021ec5d
--- /dev/null
+++ b/blueprints/organizr/update.sh
@@ -0,0 +1,12 @@
+#!/usr/local/bin/bash
+# This file contains the update script for Organizr
+
+iocage exec "$1" service nginx stop
+iocage exec "$1" service php-fpm stop
+# TODO setup cli update for Organizr here.
+# shellcheck disable=SC2154
+cp "${SCRIPT_DIR}"/blueprints/organizr/includes/nginx.conf /mnt/"${global_dataset_iocage}"/jails/"$1"/root/usr/local/etc/nginx/nginx.conf
+iocage exec "$1" "cd /usr/local/www/Organizr && git pull"
+iocage exec "$1" chown -R www:www /usr/local/www /config /usr/local/etc/nginx/nginx.conf /usr/local/etc/nginx/custom
+iocage exec "$1" service nginx start
+iocage exec "$1" service php-fpm start
\ No newline at end of file
diff --git a/blueprints/plex/config.yml b/blueprints/plex/config.yml
new file mode 100644
index 00000000..bc68372a
--- /dev/null
+++ b/blueprints/plex/config.yml
@@ -0,0 +1,3 @@
+blueprint:
+  plex:
+    pkgs: plexmediaserver
\ No newline at end of file
diff --git a/jails/plex/includes/FreeBSD.conf b/blueprints/plex/includes/FreeBSD.conf
old mode 100755
new mode 100644
similarity index 100%
rename from jails/plex/includes/FreeBSD.conf
rename to blueprints/plex/includes/FreeBSD.conf
diff --git a/blueprints/plex/install.sh b/blueprints/plex/install.sh
new file mode 100755
index 00000000..54766a03
--- /dev/null
+++ b/blueprints/plex/install.sh
@@ -0,0 +1,51 @@
+#!/usr/local/bin/bash
+# This file contains the install script for plex
+
+iocage exec plex mkdir -p /usr/local/etc/pkg/repos
+
+# Change to to more frequent FreeBSD repo to stay up-to-date with plex more.
+# shellcheck disable=SC2154
+cp "${SCRIPT_DIR}"/blueprints/plex/includes/FreeBSD.conf /mnt/"${global_dataset_iocage}"/jails/"$1"/root/usr/local/etc/pkg/repos/FreeBSD.conf
+
+
+# Check if datasets for media librarys exist, create them if they do not.
+# shellcheck disable=SC2154
+createmount "$1" "${global_dataset_media}" /mnt/media
+createmount "$1" "${global_dataset_media}"/movies /mnt/media/movies
+createmount "$1" "${global_dataset_media}"/music /mnt/media/music
+createmount "$1" "${global_dataset_media}"/shows /mnt/media/shows
+
+# Create plex ramdisk if specified
+# shellcheck disable=SC2154
+if [ -z "${plex_ramdisk}" ]; then
+	echo "no ramdisk specified for plex, continuing without randisk"
+else
+	iocage fstab -a "$1" tmpfs /tmp_transcode tmpfs rw,size="${plex_ramdisk}",mode=1777 0 0
+fi
+
+iocage exec "$1" chown -R plex:plex /config
+
+# Force update pkg to get latest plex version
+iocage exec "$1" pkg update
+iocage exec "$1" pkg upgrade -y
+
+# Add plex user to video group for future hw-encoding support
+iocage exec "$1" pw groupmod -n video -m plex
+
+# Run different install procedures depending on Plex vs Plex Beta
+# shellcheck disable=SC2154
+if [ "$plex_beta" == "true" ]; then
+	echo "beta enabled in config.yml... using plex beta for install"
+	iocage exec "$1" sysrc "plexmediaserver_plexpass_enable=YES"
+	iocage exec "$1" sysrc plexmediaserver_plexpass_support_path="/config"
+	iocage exec "$1" chown -R plex:plex /usr/local/share/plexmediaserver-plexpass/
+	iocage exec "$1" service plexmediaserver_plexpass restart
+else
+	echo "beta disabled in config.yml... NOT using plex beta for install"
+	iocage exec "$1" sysrc "plexmediaserver_enable=YES"
+	iocage exec "$1" sysrc plexmediaserver_support_path="/config"
+	iocage exec "$1" chown -R plex:plex /usr/local/share/plexmediaserver/
+	iocage exec "$1" service plexmediaserver restart
+fi
+
+echo "Finished installing plex"
\ No newline at end of file
diff --git a/jails/plex/readme.md b/blueprints/plex/readme.md
old mode 100755
new mode 100644
similarity index 100%
rename from jails/plex/readme.md
rename to blueprints/plex/readme.md
diff --git a/jails/plex/update.sh b/blueprints/plex/update.sh
similarity index 60%
rename from jails/plex/update.sh
rename to blueprints/plex/update.sh
index ca01432a..97d89491 100755
--- a/jails/plex/update.sh
+++ b/blueprints/plex/update.sh
@@ -5,16 +5,16 @@
 # shellcheck disable=SC2154
 if [ "$plex_plexpass" == "true" ]; then
 	echo "beta enabled in config.yml... using plex beta for update..."
-	iocage exec plex service plexmediaserver_plexpass stop
+	iocage exec "$1" service plexmediaserver_plexpass stop
 	# Plex is updated using PKG already, this is mostly a placeholder
-	iocage exec plex chown -R plex:plex /usr/local/share/plexmediaserver-plexpass/
-	iocage exec plex service plexmediaserver_plexpass restart
+	iocage exec "$1" chown -R plex:plex /usr/local/share/plexmediaserver-plexpass/
+	iocage exec "$1" service plexmediaserver_plexpass restart
 else
 	echo "beta disabled in config.yml... NOT using plex beta for update..."
-	iocage exec plex service plexmediaserver stop
+	iocage exec "$1" service plexmediaserver stop
 	# Plex is updated using PKG already, this is mostly a placeholder
-	iocage exec plex chown -R plex:plex /usr/local/share/plexmediaserver/
-	iocage exec plex service plexmediaserver restart
+	iocage exec "$1" chown -R plex:plex /usr/local/share/plexmediaserver/
+	iocage exec "$1" service plexmediaserver restart
 fi
 
 
diff --git a/blueprints/radarr/config.yml b/blueprints/radarr/config.yml
new file mode 100644
index 00000000..6125ba70
--- /dev/null
+++ b/blueprints/radarr/config.yml
@@ -0,0 +1,3 @@
+blueprint:
+  radarr:
+    pkgs: mono mediainfo sqlite3 libgdiplus
\ No newline at end of file
diff --git a/jails/radarr/includes/radarr.rc b/blueprints/radarr/includes/radarr.rc
similarity index 100%
rename from jails/radarr/includes/radarr.rc
rename to blueprints/radarr/includes/radarr.rc
diff --git a/blueprints/radarr/install.sh b/blueprints/radarr/install.sh
new file mode 100755
index 00000000..99442692
--- /dev/null
+++ b/blueprints/radarr/install.sh
@@ -0,0 +1,24 @@
+#!/usr/local/bin/bash
+# This file contains the install script for radarr
+
+# Check if dataset for completed download and it parent dataset exist, create if they do not.
+# shellcheck disable=SC2154
+createmount "$1" "${global_dataset_downloads}"
+createmount "$1" "${global_dataset_downloads}"/complete /mnt/fetched
+
+# Check if dataset for media library and the dataset for movies exist, create if they do not.
+# shellcheck disable=SC2154
+createmount "$1" "${global_dataset_media}"
+createmount "$1" "${global_dataset_media}"/movies /mnt/movies
+
+iocage exec "$1" "fetch https://github.com/Radarr/Radarr/releases/download/v0.2.0.1480/Radarr.develop.0.2.0.1480.linux.tar.gz -o /usr/local/share"
+iocage exec "$1" "tar -xzvf /usr/local/share/Radarr.develop.0.2.0.1480.linux.tar.gz -C /usr/local/share"
+iocage exec "$1" rm /usr/local/share/Radarr.develop.0.2.0.1480.linux.tar.gz
+iocage exec "$1" "pw user add radarr -c radarr -u 352 -d /nonexistent -s /usr/bin/nologin"
+iocage exec "$1" chown -R radarr:radarr /usr/local/share/Radarr /config
+iocage exec "$1" mkdir /usr/local/etc/rc.d
+# shellcheck disable=SC2154
+cp "${SCRIPT_DIR}"/blueprints/radarr/includes/radarr.rc /mnt/"${global_dataset_iocage}"/jails/"$1"/root/usr/local/etc/rc.d/radarr
+iocage exec "$1" chmod u+x /usr/local/etc/rc.d/radarr
+iocage exec "$1" sysrc "radarr_enable=YES"
+iocage exec "$1" service radarr restart
diff --git a/jails/radarr/readme.md b/blueprints/radarr/readme.md
old mode 100755
new mode 100644
similarity index 100%
rename from jails/radarr/readme.md
rename to blueprints/radarr/readme.md
diff --git a/blueprints/radarr/update.sh b/blueprints/radarr/update.sh
new file mode 100755
index 00000000..8275b656
--- /dev/null
+++ b/blueprints/radarr/update.sh
@@ -0,0 +1,10 @@
+#!/usr/local/bin/bash
+# This file contains the update script for radarr
+
+iocage exec "$1" service radarr stop
+#TODO insert code to update radarr itself here
+iocage exec "$1" chown -R radarr:radarr /usr/local/share/Radarr /config
+# shellcheck disable=SC2154
+cp "${SCRIPT_DIR}"/blueprints/radarr/includes/radarr.rc /mnt/"${global_dataset_iocage}"/jails/"$1"/root/usr/local/etc/rc.d/radarr
+iocage exec "$1" chmod u+x /usr/local/etc/rc.d/radarr
+iocage exec "$1" service radarr restart
\ No newline at end of file
diff --git a/blueprints/sonarr/config.yml b/blueprints/sonarr/config.yml
new file mode 100644
index 00000000..ab4801ba
--- /dev/null
+++ b/blueprints/sonarr/config.yml
@@ -0,0 +1,3 @@
+blueprint:
+  sonarr:
+    pkgs: mono mediainfo sqlite3
\ No newline at end of file
diff --git a/jails/sonarr/includes/sonarr.rc b/blueprints/sonarr/includes/sonarr.rc
similarity index 100%
rename from jails/sonarr/includes/sonarr.rc
rename to blueprints/sonarr/includes/sonarr.rc
diff --git a/blueprints/sonarr/install.sh b/blueprints/sonarr/install.sh
new file mode 100755
index 00000000..faec9912
--- /dev/null
+++ b/blueprints/sonarr/install.sh
@@ -0,0 +1,24 @@
+#!/usr/local/bin/bash
+# This file contains the install script for sonarr
+
+# Check if dataset for completed download and it parent dataset exist, create if they do not.
+# shellcheck disable=SC2154
+createmount "$1" "${global_dataset_downloads}"
+createmount "$1" "${global_dataset_downloads}"/complete /mnt/fetched
+
+# Check if dataset for media library and the dataset for tv shows exist, create if they do not.
+# shellcheck disable=SC2154
+createmount "$1" "${global_dataset_media}"
+createmount "$1" "${global_dataset_media}"/shows /mnt/shows
+
+iocage exec "$1" "fetch http://download.sonarr.tv/v2/master/mono/NzbDrone.master.tar.gz -o /usr/local/share"
+iocage exec "$1" "tar -xzvf /usr/local/share/NzbDrone.master.tar.gz -C /usr/local/share"
+iocage exec "$1" rm /usr/local/share/NzbDrone.master.tar.gz
+iocage exec "$1" "pw user add sonarr -c sonarr -u 351 -d /nonexistent -s /usr/bin/nologin"
+iocage exec "$1" chown -R sonarr:sonarr /usr/local/share/NzbDrone /config
+iocage exec "$1" mkdir /usr/local/etc/rc.d
+# shellcheck disable=SC2154
+cp "${SCRIPT_DIR}"/blueprints/sonarr/includes/sonarr.rc /mnt/"${global_dataset_iocage}"/jails/"$1"/root/usr/local/etc/rc.d/sonarr
+iocage exec "$1" chmod u+x /usr/local/etc/rc.d/sonarr
+iocage exec "$1" sysrc "sonarr_enable=YES"
+iocage exec "$1" service sonarr restart
diff --git a/jails/sonarr/readme.md b/blueprints/sonarr/readme.md
old mode 100755
new mode 100644
similarity index 100%
rename from jails/sonarr/readme.md
rename to blueprints/sonarr/readme.md
diff --git a/blueprints/sonarr/update.sh b/blueprints/sonarr/update.sh
new file mode 100755
index 00000000..f81fd987
--- /dev/null
+++ b/blueprints/sonarr/update.sh
@@ -0,0 +1,10 @@
+#!/usr/local/bin/bash
+# This file contains the update script for sonarr
+
+iocage exec "$1" service sonarr stop
+#TODO insert code to update sonarr itself here
+iocage exec "$1" chown -R sonarr:sonarr /usr/local/share/NzbDrone /config
+# shellcheck disable=SC2154
+cp "${SCRIPT_DIR}"/blueprints/sonarr/includes/sonarr.rc /mnt/"${global_dataset_iocage}"/jails/"$1"/root/usr/local/etc/rc.d/sonarr
+iocage exec "$1" chmod u+x /usr/local/etc/rc.d/sonarr
+iocage exec "$1" service sonarr restart
\ No newline at end of file
diff --git a/blueprints/tautulli/config.yml b/blueprints/tautulli/config.yml
new file mode 100644
index 00000000..3c6a9a2d
--- /dev/null
+++ b/blueprints/tautulli/config.yml
@@ -0,0 +1,3 @@
+blueprint:
+  tautulli:
+    pkgs: python2 py27-sqlite3 py27-openssl git
\ No newline at end of file
diff --git a/blueprints/tautulli/install.sh b/blueprints/tautulli/install.sh
new file mode 100755
index 00000000..c87ec954
--- /dev/null
+++ b/blueprints/tautulli/install.sh
@@ -0,0 +1,11 @@
+#!/usr/local/bin/bash
+# This file contains the install script for Tautulli
+
+iocage exec "$1" git clone https://github.com/Tautulli/Tautulli.git /usr/local/share/Tautulli
+iocage exec "$1" "pw user add tautulli -c tautulli -u 109 -d /nonexistent -s /usr/bin/nologin"
+iocage exec "$1" chown -R tautulli:tautulli /usr/local/share/Tautulli /config
+iocage exec "$1" cp /usr/local/share/Tautulli/init-scripts/init.freenas /usr/local/etc/rc.d/tautulli
+iocage exec "$1" chmod u+x /usr/local/etc/rc.d/tautulli
+iocage exec "$1" sysrc "tautulli_enable=YES"
+iocage exec "$1" sysrc "tautulli_flags=--datadir /config"
+iocage exec "$1" service tautulli start
\ No newline at end of file
diff --git a/jails/tautulli/readme.md b/blueprints/tautulli/readme.md
old mode 100755
new mode 100644
similarity index 100%
rename from jails/tautulli/readme.md
rename to blueprints/tautulli/readme.md
diff --git a/blueprints/tautulli/update.sh b/blueprints/tautulli/update.sh
new file mode 100755
index 00000000..500aa181
--- /dev/null
+++ b/blueprints/tautulli/update.sh
@@ -0,0 +1,9 @@
+#!/usr/local/bin/bash
+# This file contains the update script for Tautulli
+
+iocage exec "$1" service tautulli stop
+# Tautulli is updated through pkg, this is mostly just a placeholder
+iocage exec "$1" chown -R tautulli:tautulli /usr/local/share/Tautulli /config
+iocage exec "$1" cp /usr/local/share/Tautulli/init-scripts/init.freenas /usr/local/etc/rc.d/tautulli
+iocage exec "$1" chmod u+x /usr/local/etc/rc.d/tautulli
+iocage exec "$1" service tautulli restart
\ No newline at end of file
diff --git a/blueprints/transmission/config.yml b/blueprints/transmission/config.yml
new file mode 100644
index 00000000..ad770179
--- /dev/null
+++ b/blueprints/transmission/config.yml
@@ -0,0 +1,3 @@
+blueprint:
+  transmission:
+    pkgs: bash unzip unrar transmission
\ No newline at end of file
diff --git a/blueprints/transmission/install.sh b/blueprints/transmission/install.sh
new file mode 100755
index 00000000..50686d9c
--- /dev/null
+++ b/blueprints/transmission/install.sh
@@ -0,0 +1,19 @@
+#!/usr/local/bin/bash
+# This file contains the install script for transmission
+
+# Check if dataset Downloads dataset exist, create if they do not.
+# shellcheck disable=SC2154
+createmount "$1" "${global_dataset_downloads}" /mnt/downloads
+
+# Check if dataset Complete Downloads dataset exist, create if they do not.
+createmount "$1" "${global_dataset_downloads}"/complete /mnt/downloads/complete
+
+# Check if dataset InComplete Downloads dataset exist, create if they do not.
+createmount "$1" "${global_dataset_downloads}"/incomplete /mnt/downloads/incomplete
+
+
+iocage exec "$1" chown -R transmission:transmission /config
+iocage exec "$1" sysrc "transmission_enable=YES"
+iocage exec "$1" sysrc "transmission_conf_dir=/config"
+iocage exec "$1" sysrc "transmission_download_dir=/mnt/downloads/complete"
+iocage exec "$1" service transmission restart
\ No newline at end of file
diff --git a/jails/transmission/readme.md b/blueprints/transmission/readme.md
old mode 100755
new mode 100644
similarity index 100%
rename from jails/transmission/readme.md
rename to blueprints/transmission/readme.md
diff --git a/blueprints/transmission/update.sh b/blueprints/transmission/update.sh
new file mode 100755
index 00000000..6c3d216e
--- /dev/null
+++ b/blueprints/transmission/update.sh
@@ -0,0 +1,7 @@
+#!/usr/local/bin/bash
+# This file contains the update script for transmission
+
+iocage exec "$1" service transmission stop
+# Transmision is updated during PKG update, this file is mostly just a placeholder
+iocage exec "$1" chown -R transmission:transmission /config
+iocage exec "$1" service transmission restart
\ No newline at end of file
diff --git a/blueprints/unifi/config.yml b/blueprints/unifi/config.yml
new file mode 100644
index 00000000..96e874cf
--- /dev/null
+++ b/blueprints/unifi/config.yml
@@ -0,0 +1,3 @@
+blueprint:
+  unifi:
+    pkgs: jq unifi5
\ No newline at end of file
diff --git a/jails/unifi/includes/mongodb.conf b/blueprints/unifi/includes/mongodb.conf
similarity index 100%
rename from jails/unifi/includes/mongodb.conf
rename to blueprints/unifi/includes/mongodb.conf
diff --git a/jails/unifi/includes/rc/mongod b/blueprints/unifi/includes/rc/mongod.rc
old mode 100644
new mode 100755
similarity index 100%
rename from jails/unifi/includes/rc/mongod
rename to blueprints/unifi/includes/rc/mongod.rc
diff --git a/jails/unifi/includes/rc/unifi b/blueprints/unifi/includes/rc/unifi.rc
old mode 100644
new mode 100755
similarity index 100%
rename from jails/unifi/includes/rc/unifi
rename to blueprints/unifi/includes/rc/unifi.rc
diff --git a/jails/unifi/includes/rc/unifi_poller b/blueprints/unifi/includes/rc/unifi_poller.rc
old mode 100644
new mode 100755
similarity index 100%
rename from jails/unifi/includes/rc/unifi_poller
rename to blueprints/unifi/includes/rc/unifi_poller.rc
diff --git a/jails/unifi/includes/up.conf b/blueprints/unifi/includes/up.conf
similarity index 100%
rename from jails/unifi/includes/up.conf
rename to blueprints/unifi/includes/up.conf
diff --git a/blueprints/unifi/install.sh b/blueprints/unifi/install.sh
new file mode 100755
index 00000000..2ad17799
--- /dev/null
+++ b/blueprints/unifi/install.sh
@@ -0,0 +1,117 @@
+#!/usr/local/bin/bash
+# This file contains the install script for unifi-controller & unifi-poller
+
+# Initialize variables
+# shellcheck disable=SC2154
+JAIL_IP="jail_${1}_ip4_addr"
+JAIL_IP="${!JAIL_IP%/*}"
+
+# shellcheck disable=SC2154
+DB_JAIL="jail_${1}_db_jail"
+
+POLLER="jail_${1}_unifi_poller"
+
+# shellcheck disable=SC2154
+DB_IP="jail_${!DB_JAIL}_ip4_addr"
+DB_IP="${!DB_IP%/*}"
+
+# shellcheck disable=SC2154
+DB_NAME="jail_${1}_up_db_name"
+DB_NAME="${!DB_NAME:-$1}"
+
+# shellcheck disable=SC2154
+DB_USER="jail_${1}_up_db_user"
+DB_USER="${!DB_USER:-$DB_NAME}"
+
+# shellcheck disable=SC2154
+DB_PASS="jail_${1}_up_db_password"
+
+# shellcheck disable=SC2154
+UP_USER="jail_${1}_up_user"
+UP_USER="${!UP_USER:-$1}"
+
+# shellcheck disable=SC2154
+UP_PASS="jail_${1}_up_password"
+INCLUDES_PATH="${SCRIPT_DIR}/blueprints/unifi/includes"
+
+if [ -z "${!DB_PASSWORD}" ]; then
+	echo "up_db_password can't be empty"
+	exit 1
+fi
+
+if [ -z "${!DB_JAIL}" ]; then
+	echo "db_jail can't be empty"
+	exit 1
+fi
+
+if [ -z "${!UP_PASS}" ]; then
+	echo "up_password can't be empty"
+	exit 1
+fi
+
+# Enable persistent Unifi Controller data
+iocage exec "${1}" mkdir -p /config/controller/mongodb
+iocage exec "${1}" cp -Rp /usr/local/share/java/unifi /config/controller
+iocage exec "${1}" chown -R mongodb:mongodb /config/controller/mongodb
+# shellcheck disable=SC2154
+cp "${INCLUDES_PATH}"/mongodb.conf /mnt/"${global_dataset_iocage}"/jails/"${1}"/root/usr/local/etc
+# shellcheck disable=SC2154
+cp "${INCLUDES_PATH}"/rc/mongod.rc /mnt/"${global_dataset_iocage}"/jails/"${1}"/root/usr/local/etc/rc.d/mongod
+# shellcheck disable=SC2154
+cp "${INCLUDES_PATH}"/rc/unifi.rc /mnt/"${global_dataset_iocage}"/jails/"${1}"/root/usr/local/etc/rc.d/unifi
+iocage exec "${1}" sysrc unifi_enable=YES
+iocage exec "${1}" service unifi start
+
+# shellcheck disable=SC2154
+if [[ ! "${!POLLER}" ]]; then
+  echo "Installation complete!"
+  echo "Unifi Controller is accessible at https://${JAIL_IP}:8443."
+else
+  # Check if influxdb container exists, create unifi database if it does, error if it is not.
+  echo "Checking if the database jail and database exist..."
+  if [[ -d /mnt/"${global_dataset_iocage}"/jails/"${!DB_JAIL}" ]]; then
+    DB_EXISTING=$(iocage exec "${!DB_JAIL}" curl -G http://localhost:8086/query --data-urlencode 'q=SHOW DATABASES' | jq '.results [] | .series [] | .values []' | grep "$DB_NAME" | sed 's/"//g' | sed 's/^ *//g')
+    if [[ "$DB_NAME" == "$DB_EXISTING" ]]; then
+      echo "${!DB_JAIL} jail with database ${DB_NAME} already exists. Skipping database creation... "
+    else
+      echo "${!DB_JAIL} jail exists, but database ${DB_NAME} does not. Creating database ${DB_NAME}."
+      if [[ -z "${DB_USER}" ]] || [[ -z "${!DB_PASS}" ]]; then
+        echo "Database username and password not provided. Cannot create database without credentials. Exiting..."
+        exit 1
+      else
+        iocage exec "${!DB_JAIL}" "curl -XPOST -u ${DB_USER}:${!DB_PASS} http://localhost:8086/query --data-urlencode 'q=CREATE DATABASE ${DB_NAME}'"
+        echo "Database ${DB_NAME} created with username ${DB_USER} with password ${!DB_PASS}."
+      fi
+    fi
+  else
+    echo "Influxdb jail does not exist. Unifi-Poller requires Influxdb jail. Please install the Influxdb jail."
+    exit 1
+  fi
+
+  # Download and install Unifi-Poller
+  FILE_NAME=$(curl -s https://api.github.com/repos/unifi-poller/unifi-poller/releases/latest | jq -r ".assets[] | select(.name | contains(\"amd64.txz\")) | .name")
+  DOWNLOAD=$(curl -s https://api.github.com/repos/unifi-poller/unifi-poller/releases/latest | jq -r ".assets[] | select(.name | contains(\"amd64.txz\")) | .browser_download_url")
+  iocage exec "${1}" fetch -o /config "${DOWNLOAD}"
+
+  # Install downloaded Unifi-Poller package, configure and enable 
+  iocage exec "${1}" pkg install -qy /config/"${FILE_NAME}"
+  # shellcheck disable=SC2154
+  cp "${INCLUDES_PATH}"/up.conf /mnt/"${global_dataset_config}"/"${1}"
+  # shellcheck disable=SC2154
+  cp "${INCLUDES_PATH}"/rc/unifi_poller.rc /mnt/"${global_dataset_iocage}"/jails/"${1}"/root/usr/local/etc/rc.d/unifi_poller
+  iocage exec "${1}" sed -i '' "s|influxdbuser|${DB_USER}|" /config/up.conf
+  iocage exec "${1}" sed -i '' "s|influxdbpass|${!DB_PASS}|" /config/up.conf
+  iocage exec "${1}" sed -i '' "s|unifidb|${DB_NAME}|" /config/up.conf
+  iocage exec "${1}" sed -i '' "s|unifiuser|${UP_USER}|" /config/up.conf
+  iocage exec "${1}" sed -i '' "s|unifipassword|${!UP_PASS}|" /config/up.conf
+  iocage exec "${1}" sed -i '' "s|dbip|http://${DB_IP}:8086|" /config/up.conf
+
+
+  iocage exec "${1}" sysrc unifi_poller_enable=YES
+  iocage exec "${1}" service unifi_poller start
+
+  echo "Installation complete!"
+  echo "Unifi Controller is accessible at https://${JAIL_IP}:8443."
+  echo "Please login to the Unifi Controller and add ${UP_USER} as a read-only user."
+  echo "In Grafana, add Unifi-Poller as a data source."
+fi
diff --git a/jails/unifi/readme.md b/blueprints/unifi/readme.md
similarity index 100%
rename from jails/unifi/readme.md
rename to blueprints/unifi/readme.md
diff --git a/jails/unifi/update.sh b/blueprints/unifi/update.sh
old mode 100644
new mode 100755
similarity index 67%
rename from jails/unifi/update.sh
rename to blueprints/unifi/update.sh
index f554e205..a585afab
--- a/jails/unifi/update.sh
+++ b/blueprints/unifi/update.sh
@@ -2,21 +2,20 @@
 # This file contains the update script for unifi
 # Unifi Controller is updated through pkg, Unifi-Poller is not. This script updates Unifi-Poller
 
-JAIL_NAME="unifi"
 FILE_NAME=$(curl -s https://api.github.com/repos/unifi-poller/unifi-poller/releases/latest | jq -r ".assets[] | select(.name | contains(\"amd64.txz\")) | .name")
 DOWNLOAD=$(curl -s https://api.github.com/repos/unifi-poller/unifi-poller/releases/latest | jq -r ".assets[] | select(.name | contains(\"amd64.txz\")) | .browser_download_url")
 
 # Check to see if there is an update.
 # shellcheck disable=SC2154
-if [[ -f /mnt/"${global_dataset_config}"/"${JAIL_NAME}"/"${FILE_NAME}" ]]; then
+if [[ -f /mnt/"${global_dataset_config}"/"${1}"/"${FILE_NAME}" ]]; then
   echo "Unifi-Poller is up to date."
   exit 1
 else
   # Download and install the package
-  iocage exec "${JAIL_NAME}" fetch -o /config "${DOWNLOAD}"
-  iocage exec "${JAIL_NAME}" pkg install -qy /config/"${FILE_NAME}"
-  iocage exec "${JAIL_NAME}" service unifi restart
-  iocage exec "${JAIL_NAME}" service unifi_poller restart
+  iocage exec "${1}" fetch -o /config "${DOWNLOAD}"
+  iocage exec "${1}" pkg install -qy /config/"${FILE_NAME}"
+  iocage exec "${1}" service unifi restart
+  iocage exec "${1}" service unifi_poller restart
 fi
 
 echo "Update complete!"
diff --git a/config.yml.example b/config.yml.example
index 1f78d862..6dbc916e 100644
--- a/config.yml.example
+++ b/config.yml.example
@@ -1,4 +1,6 @@
 global:
+  # Config file syntax version (not same as script version)
+  version: 1.2
   # Relevant dataset paths, please use the ZFS dataset syntax such as: tank/apps
   dataset:
    # dataset for internal jail config files
@@ -15,100 +17,89 @@ global:
    # Please use standard space delimited pkg install syntax.
    pkgs: curl ca_root_nss bash
 
-
-# Example configuration, showing how to customise network config. 
-# Use the same jailname on both sides of this variable example: example
-example: example
-  #interfaces is optional and will be autmatically replace with vnet0:bridge0 if not present
-  interfaces: vnet0:bridge0
-  ip4_addr: 192.168.1.99/24
-  gateway: 192.168.1.1
-  # Jail specific pkgs. 
-  # Please use standard space delimited pkg install syntax.
-  pkgs: mono
+jail:
+  plex: 
+    blueprint: plex
+    ip4_addr: 192.168.1.99/24
+    gateway: 192.168.1.1
+    beta: false
   
-plex: plex
-  ip4_addr: 192.168.1.99/24
-  gateway: 192.168.1.1
-  beta: false
-
-lidarr: lidarr
-  ip4_addr: 192.168.1.99/24
-  gateway: 192.168.1.1
+  lidarr: 
+    blueprint: lidarr
+    ip4_addr: 192.168.1.99/24
+    gateway: 192.168.1.1
+    
+  sonarr: 
+    blueprint: sonarr
+    ip4_addr: 192.168.1.99/24
+    gateway: 192.168.1.1
+    
+  radarr: 
+    blueprint: radarr
+    ip4_addr: 192.168.1.99/24
+    gateway: 192.168.1.1
+    
+  kms: 
+    blueprint: kms
+    ip4_addr: 192.168.1.99/24
+    gateway: 192.168.1.1
   
-sonarr: sonarr
-  ip4_addr: 192.168.1.99/24
-  gateway: 192.168.1.1
+  jackett: 
+    blueprint: jackett
+    ip4_addr: 192.168.1.99/24
+    gateway: 192.168.1.1
+    
+  organizr: 
+    blueprint: organizr
+    ip4_addr: 192.168.1.99/24
+    gateway: 192.168.1.1
+    
+  tautulli: 
+    blueprint: tautulli
+    ip4_addr: 192.168.1.99/24
+    gateway: 192.168.1.1
   
-radarr: radarr
-  ip4_addr: 192.168.1.99/24
-  gateway: 192.168.1.1
+  transmission: 
+    blueprint: transmission
+    ip4_addr: 192.168.1.99/24
+    gateway: 192.168.1.1
   
-kms: kms
-  ip4_addr: 192.168.1.99/24
-  gateway: 192.168.1.1
-
-jackett: jackett
-  ip4_addr: 192.168.1.99/24
-  gateway: 192.168.1.1
   
-organizr: organizr
-  ip4_addr: 192.168.1.99/24
-  gateway: 192.168.1.1
+  nextcloud: 
+    blueprint: nextcloud
+    ip4_addr: 192.168.1.99/24
+    gateway: 192.168.1.1
+    time_zone: Europe/Amsterdam
+    host_name: cloud.example.com
+    db_jail: "mariadb"
+    admin_password: "PUTYOUROWNADMINPASSWORDHERE"
+	db_password: "PLEASEALSOPUTYOURPASSWORDHEREADIFFERNTONE"
+    
+  mariadb: 
+    blueprint: mariadb
+    ip4_addr: 192.168.1.98/24
+    gateway: 192.168.1.1
+    db_root_password: ReplaceThisWithYourOwnRootPAssword
+    host_name: mariadb.local.example
   
-tautulli: tautulli
-  ip4_addr: 192.168.1.99/24
-  gateway: 192.168.1.1
+  bitwarden:
+    blueprint: bitwarden
+    ip4_addr: 192.168.1.97/24
+    gateway: 192.168.1.1
+	db_jail: "mariadb"
+    db_password: "YourDBPasswordHerePLEASE"
+    admin_token: "PUTYOURADMINTOKENHEREANDREMOVETHIS"
 
-transmission: transmission
-  ip4_addr: 192.168.1.99/24
-  gateway: 192.168.1.1
+  influxdb: 
+    blueprint: influxdb
+    ip4_addr: 192.168.1.250/24
+    gateway: 192.168.1.1
 
-
-nextcloud: nextcloud
-  ip4_addr: 192.168.1.99/24
-  gateway: 192.168.1.1
-  time_zone: Europe/Amsterdam
-  host_name: cloud.example.com
-  database: mariadb
-  standalone_cert: 0
-  selfsigned_cert: 0
-  dns_cert: 0
-  no_cert: 1
-  dl_flags: ""
-  dns_settings: ""
-  cert_email: "placeholder@holdplace.org"
-  database: mariadb
-#  db_database:
-#  db_user:
-#  db_password
-#  db_host
-  
-mariadb: mariadb
-  ip4_addr: 192.168.1.98/24
-  gateway: 192.168.1.1
-  db_root_password: ReplaceThisWithYourOwnRootPAssword
-  host_name: mariadb.local.example
-
-bitwarden: bitwarden
-  ip4_addr: 192.168.1.97/24
-  gateway: 192.168.1.1
-  db_password: "YourDBPasswordHerePLEASE"
-  type: mariadb
-  admin_token: "PUTYOURADMINTOKENHEREANDREMOVETHIS"
-
-influxdb: influxdb
-  ip4_addr: 192.168.1.250/24
-  gateway: 192.168.1.1
-  database: influxdb
-
-unifi: unifi
-  ip4_addr: 192.168.1.251/24
-  gateway: 192.168.1.1
-  unifi_poller: true
-  db_jail: influxdb
-  up_db_name: unifi
-  up_db_user: unifi-poller
-  up_db_password: unifi-poller
-  up_user: upoller
-  up_password: upoller
+  unifi:
+    blueprint: unifi
+    ip4_addr: 192.168.1.251/24
+    gateway: 192.168.1.1
+    unifi_poller: true
+    db_jail: influxdb
+    up_db_password: unifi-poller
+    up_password: upoller
diff --git a/global.sh b/global.sh
index 4a9f1359..262a72f3 100755
--- a/global.sh
+++ b/global.sh
@@ -43,12 +43,12 @@ fi
 
 jailcreate() {
 echo "Checking config..."
-jailname="${1}"
-jailpkgs="${1}_pkgs"
-jailinterfaces="${1}_interfaces"
-jailip4="${1}_ip4_addr"
-jailgateway="${1}_gateway"
-jaildhcp="${1}_dhcp"
+blueprintpkgs="blueprint_${2}_pkgs"
+blueprintports="blueprint_${2}_ports"
+jailinterfaces="jail_${1}_interfaces"
+jailip4="jail_${1}_ip4_addr"
+jailgateway="jail_${1}_gateway"
+jaildhcp="jail_${1}_dhcp"
 setdhcp=${!jaildhcp}
 
 if [ -z "${!jailinterfaces}" ]; then 
@@ -62,49 +62,47 @@ if [ -z "${setdhcp}" ] && [ -z "${!jailip4}" ] && [ -z "${!jailgateway}" ]; then
 	setdhcp="on"
 fi
 
-if [ -z "${!jailname}" ]; then 
-	echo "ERROR, jail not defined in config.yml"
-	exit 1
-else
-	echo "Creating jail for $1"
+echo "Creating jail for $1"
+# shellcheck disable=SC2154
+pkgs="$(sed 's/[^[:space:]]\{1,\}/"&"/g;s/ /,/g' <<<"${global_jails_pkgs} ${!blueprintpkgs}")"
+echo '{"pkgs":['"${pkgs}"']}' > /tmp/pkg.json
+if [ "${setdhcp}" == "on" ]
+then
 	# shellcheck disable=SC2154
-	pkgs="$(sed 's/[^[:space:]]\{1,\}/"&"/g;s/ /,/g' <<<"${global_jails_pkgs} ${!jailpkgs}")"
-	echo '{"pkgs":['"${pkgs}"']}' > /tmp/pkg.json
-	if [ "${setdhcp}" == "on" ]
+	if ! iocage create -n "${1}" -p /tmp/pkg.json -r "${global_jails_version}" interfaces="${jailinterfaces}" dhcp="on" vnet="on" allow_raw_sockets="1" boot="on" -b
 	then
-		# shellcheck disable=SC2154
-		if ! iocage create -n "${1}" -p /tmp/pkg.json -r "${global_jails_version}" interfaces="${jailinterfaces}" dhcp="on" vnet="on" allow_raw_sockets="1" boot="on" -b
-		then
-			echo "Failed to create jail"
-			exit 1
-		fi
-	else
-		# shellcheck disable=SC2154
-		if ! iocage create -n "${1}" -p /tmp/pkg.json -r "${global_jails_version}" interfaces="${jailinterfaces}" ip4_addr="vnet0|${!jailip4}" defaultrouter="${!jailgateway}" vnet="on" allow_raw_sockets="1" boot="on" -b
-		then
-			echo "Failed to create jail"
-			exit 1
-		fi
-		
+		echo "Failed to create jail"
+		exit 1
 	fi
-
-	rm /tmp/pkg.json
-	echo "creating jail config directory"
+else
 	# shellcheck disable=SC2154
-	createmount "${1}" "${global_dataset_config}"
-	createmount "${1}" "${global_dataset_config}"/"${1}" /config
-	
-	# Create and Mount portsnap
+	if ! iocage create -n "${1}" -p /tmp/pkg.json -r "${global_jails_version}" interfaces="${jailinterfaces}" ip4_addr="vnet0|${!jailip4}" defaultrouter="${!jailgateway}" vnet="on" allow_raw_sockets="1" boot="on" -b
+	then
+		echo "Failed to create jail"
+		exit 1
+	fi
+fi
+
+rm /tmp/pkg.json
+echo "creating jail config directory"
+# shellcheck disable=SC2154
+createmount "${1}" "${global_dataset_config}"
+createmount "${1}" "${global_dataset_config}"/"${1}" /config
+
+# Create and Mount portsnap
+createmount "${1}" "${global_dataset_config}"/portsnap
+createmount "${1}" "${global_dataset_config}"/portsnap/db /var/db/portsnap
+createmount "${1}" "${global_dataset_config}"/portsnap/ports /usr/ports
+if [ "${!blueprintports}" == "true" ]
+then
 	echo "Mounting and fetching ports"
-	createmount "${1}" "${global_dataset_config}"/portsnap
-	createmount "${1}" "${global_dataset_config}"/portsnap/db /var/db/portsnap
-	createmount "${1}" "${global_dataset_config}"/portsnap/ports /usr/ports
-	
 	iocage exec "${1}" "if [ -z /usr/ports ]; then portsnap fetch extract; else portsnap auto; fi"
-	
-	echo "Jail creation completed for ${1}"
-fi	
-	
+else
+	echo "Ports not enabled for blueprint, skipping"
+fi
+
+echo "Jail creation completed for ${1}"
+
 }
 
 # $1 = jail name
diff --git a/jailman.sh b/jailman.sh
index 2111951f..7db54514 100755
--- a/jailman.sh
+++ b/jailman.sh
@@ -20,7 +20,7 @@ if ! [ "$(id -u)" = 0 ]; then
 fi
 
 # Auto Update
-BRANCH="dev"
+BRANCH="multi_install"
 gitupdate ${BRANCH}
 
 # If no option is given, point to the help menu
@@ -107,9 +107,16 @@ export global_dataset_iocage
 
 # Parse the Config YAML
 # shellcheck disable=SC2046
-for configpath in "${SCRIPT_DIR}"/jails/*/config.yml; do ! eval $(parse_yaml "${configpath}"); done
+for configpath in "${SCRIPT_DIR}"/blueprints/*/config.yml; do ! eval $(parse_yaml "${configpath}"); done
 eval "$(parse_yaml config.yml)"
 
+# shellcheck disable=SC2154
+if [ "${global_version}" != "1.2" ]; then
+	echo "You are using old config.yml synatx."
+	echo "Please check the wiki for required changes"
+	exit 1
+fi
+
 # Check and Execute requested jail destructions
 if [ ${#destroyjails[@]} -eq 0 ]; then 
 	echo "No jails to destroy"
@@ -132,12 +139,18 @@ else
 	echo "jails to install ${installjails[@]}"
 	for jail in "${installjails[@]}"
 	do
-		if [ -f "${SCRIPT_DIR}/jails/$jail/install.sh" ]
+		blueprint=jail_${jail}_blueprint
+		if [ -z "${!blueprint}" ]
+		then
+			echo "Config for ${jail} in config.yml incorrect. Please check your config."
+			exit 1
+		elif [ -f "${SCRIPT_DIR}/blueprints/${!blueprint}/install.sh" ]
 		then
 			echo "Installing $jail"
-			jailcreate "${jail}" && "${SCRIPT_DIR}"/jails/"${jail}"/install.sh
+			jailcreate "${jail}" "${!blueprint}" && "${SCRIPT_DIR}"/blueprints/"${!blueprint}"/install.sh "${jail}"
 		else
-			echo "Missing install script for $jail in ${SCRIPT_DIR}/jails/$jail/install.sh"
+			echo "Missing blueprint ${!blueprint} for $jail in ${SCRIPT_DIR}/blueprints/${!blueprint}/install.sh"
+			exit 1
 		fi
 	done
 fi
@@ -150,12 +163,18 @@ else
 	echo "jails to reinstall ${redojails[@]}"
 	for jail in "${redojails[@]}"
 	do
-		if [ -f "${SCRIPT_DIR}/jails/$jail/install.sh" ]
+		blueprint=jail_${jail}_blueprint
+		if [ -z "${!blueprint}" ]
+		then
+			echo "Config for ${jail} in config.yml incorrect. Please check your config."
+			exit 1
+		elif [ -f "${SCRIPT_DIR}/blueprints/${!blueprint}/install.sh" ]
 		then
 			echo "Reinstalling $jail"
-			iocage destroy -f "${jail}" && jailcreate "${jail}" && "${SCRIPT_DIR}"/jails/"${jail}"/install.sh
+			iocage destroy -f "${jail}" && jailcreate "${jail}" "${!blueprint}" && "${SCRIPT_DIR}"/blueprints/"${!blueprint}"/install.sh "${jail}"
 		else
-			echo "Missing install script for $jail in ${SCRIPT_DIR}/jails/$jail/update.sh"
+			echo "Missing blueprint ${!blueprint} for $jail in ${SCRIPT_DIR}/blueprints/${!blueprint}/install.sh"
+			exit 1
 		fi
 	done
 fi
@@ -169,15 +188,21 @@ else
 	echo "jails to update ${updatejails[@]}"
 	for jail in "${updatejails[@]}"
 	do
-		if [ -f "${SCRIPT_DIR}/jails/$jail/update.sh" ]
+		blueprint=jail_${jail}_blueprint
+		if [ -z "${!blueprint}" ]
+		then
+			echo "Config for ${jail} in config.yml incorrect. Please check your config."
+			exit 1
+		elif [ -f "${SCRIPT_DIR}/blueprints/${!blueprint}/update.sh" ]
 		then
 			echo "Updating $jail"
 			iocage update "${jail}"
-			iocage exec "${jail}" "pkg update && pkg upgrade -y" && "${SCRIPT_DIR}"/jails/"${jail}"/update.sh
+			iocage exec "${jail}" "pkg update && pkg upgrade -y" && "${SCRIPT_DIR}"/jails/"${!blueprint}"/update.sh
 			iocage restart "${jail}"
 			iocage start "${jail}"
 		else
-			echo "Missing update script for $jail in ${SCRIPT_DIR}/jails/$jail/update.sh"
+			echo "Missing blueprint ${!blueprint} for $jail in ${SCRIPT_DIR}/blueprints/${!blueprint}/install.sh"
+			exit 1
 		fi
 	done
 fi
@@ -190,11 +215,17 @@ else
 	echo "jails to update ${upgradejails[@]}"
 	for jail in "${upgradejails[@]}"
 	do
-		if [ -f "${SCRIPT_DIR}/jails/$jail/update.sh" ]
+		blueprint=jail_${jail}_blueprint
+		if [ -z "${!blueprint}" ]
+			then
+			echo "Config for ${jail} in config.yml incorrect. Please check your config."
+			exit 1
+		elif [ -f "${SCRIPT_DIR}/blueprints/${!blueprint}/update.sh" ]
 		then
 			echo "Currently Upgrading is not yet included in this script."
 		else
-			echo "Missing update script for $jail in ${SCRIPT_DIR}/jails/$jail/update.sh"
+			echo "Currently Upgrading is not yet included in this script."
+			exit 1
 		fi
 	done
 fi
diff --git a/jails/bitwarden/config.yml b/jails/bitwarden/config.yml
deleted file mode 100644
index 6214896e..00000000
--- a/jails/bitwarden/config.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bitwarden: bitwarden
-  pkgs: sqlite3 nginx git sudo vim-tiny bash node npm python27-2.7.17_1 mariadb104-client
\ No newline at end of file
diff --git a/jails/bitwarden/install.sh b/jails/bitwarden/install.sh
deleted file mode 100755
index 11d445f0..00000000
--- a/jails/bitwarden/install.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/usr/local/bin/bash
-# This file contains the install script for bitwarden
-
-# Initialise defaults
-JAIL_NAME="bitwarden"
-DB_DATABASE=${JAIL_NAME}
-DB_USER=${JAIL_NAME}
-# shellcheck disable=SC2154
-INSTALL_TYPE=${bitwarden_type}
-# shellcheck disable=SC2154
-DB_HOST="${mariadb_ip4_addr%/*}:3306"
-# shellcheck disable=SC2154
-DB_PASSWORD="${bitwarden_db_password}"
-DB_STRING="mysql://${DB_USER}:${DB_PASSWORD}@${DB_HOST}/${DB_DATABASE}"
-# shellcheck disable=SC2154
-ADMIN_TOKEN=${bitwarden_admin_token}
-
-if [ -z "${ADMIN_TOKEN}" ]; then
-ADMIN_TOKEN=$(openssl rand -base64 16)
-fi
-
-# install latest rust version, pkg version is outdated and can't build bitwarden_rs
-iocage exec ${JAIL_NAME} "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y"
-
-# Install Bitwarden_rs
-iocage exec ${JAIL_NAME} mkdir -p /usr/local/share/bitwarden/src
-iocage exec ${JAIL_NAME} git clone https://github.com/dani-garcia/bitwarden_rs/ /usr/local/share/bitwarden/src
-TAG=$(iocage exec ${JAIL_NAME} "git -C /usr/local/share/bitwarden/src tag --sort=v:refname | tail -n1")
-iocage exec ${JAIL_NAME} "git -C /usr/local/share/bitwarden/src checkout ${TAG}"
-#TODO replace with: cargo build --features mysql --release
-if [ "${INSTALL_TYPE}" == "mariadb" ]; then
-	iocage exec ${JAIL_NAME} "cd /usr/local/share/bitwarden/src && $HOME/.cargo/bin/cargo build --features mysql --release"
-	iocage exec ${JAIL_NAME} "cd /usr/local/share/bitwarden/src && $HOME/.cargo/bin/cargo install diesel_cli --no-default-features --features mysql"
-else
-	iocage exec ${JAIL_NAME} "cd /usr/local/share/bitwarden/src && $HOME/.cargo/bin/cargo build --features sqlite --release"
-	iocage exec ${JAIL_NAME} "cd /usr/local/share/bitwarden/src && $HOME/.cargo/bin/cargo install diesel_cli --no-default-features --features sqlite-bundled"
-fi
-
-
-iocage exec ${JAIL_NAME} cp -r /usr/local/share/bitwarden/src/target/release /usr/local/share/bitwarden/bin
-
-# Download and install webvault
-WEB_RELEASE_URL=$(curl -Ls -o /dev/null -w "%{url_effective}" https://github.com/dani-garcia/bw_web_builds/releases/latest)
-WEB_TAG="${WEB_RELEASE_URL##*/}"
-iocage exec ${JAIL_NAME} "fetch http://github.com/dani-garcia/bw_web_builds/releases/download/$WEB_TAG/bw_web_$WEB_TAG.tar.gz -o /usr/local/share/bitwarden"
-iocage exec ${JAIL_NAME} "tar -xzvf /usr/local/share/bitwarden/bw_web_$WEB_TAG.tar.gz -C /usr/local/share/bitwarden/"
-iocage exec ${JAIL_NAME} rm /usr/local/share/bitwarden/bw_web_"$WEB_TAG".tar.gz
-
-# shellcheck disable=SC2154
-if [ -f "/mnt/${global_dataset_config}/${JAIL_NAME}/ssl/bitwarden-ssl.crt" ]; then
-    echo "certificate exist... Skipping cert generation"
-else
-	"No ssl certificate present, generating self signed certificate"
-	if [ ! -d "/mnt/${global_dataset_config}/${JAIL_NAME}/ssl" ]; then
-		echo "cert folder not existing... creating..."
-		iocage exec ${JAIL_NAME} mkdir /config/ssl
-	fi
-	openssl req -new -newkey rsa:2048 -days 365 -nodes -x509 -subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=localhost" -keyout /mnt/"${global_dataset_config}"/${JAIL_NAME}/ssl/bitwarden-ssl.key -out /mnt/"${global_dataset_config}"/${JAIL_NAME}/ssl/bitwarden-ssl.crt
-fi
-
-if [ -f "/mnt/${global_dataset_config}/${JAIL_NAME}/bitwarden.log" ]; then
-	echo "Reinstall of Bitwarden detected... using existing config and database"
-elif [ "${INSTALL_TYPE}" == "mariadb" ]; then
-	echo "No config detected, doing clean install, utilizing the Mariadb database ${DB_HOST}"
-	iocage exec "mariadb" mysql -u root -e "CREATE DATABASE ${DB_DATABASE};"
-	iocage exec "mariadb" mysql -u root -e "GRANT ALL ON ${DB_DATABASE}.* TO ${DB_USER}@${JAIL_IP} IDENTIFIED BY '${DB_PASSWORD}';"
-	iocage exec "mariadb" mysqladmin reload
-else
-	echo "No config detected, doing clean install."
-fi
-
-iocage exec ${JAIL_NAME} "pw user add bitwarden -c bitwarden -u 725 -d /nonexistent -s /usr/bin/nologin"
-iocage exec ${JAIL_NAME} chown -R bitwarden:bitwarden /usr/local/share/bitwarden /config
-iocage exec ${JAIL_NAME} mkdir /usr/local/etc/rc.d /usr/local/etc/rc.conf.d
-# shellcheck disable=SC2154
-cp "${SCRIPT_DIR}"/jails/${JAIL_NAME}/includes/bitwarden.rc /mnt/"${global_dataset_iocage}"/jails/${JAIL_NAME}/root/usr/local/etc/rc.d/bitwarden
-cp "${SCRIPT_DIR}"/jails/${JAIL_NAME}/includes/bitwarden.rc.conf /mnt/"${global_dataset_iocage}"/jails/${JAIL_NAME}/root/usr/local/etc/rc.conf.d/bitwarden
-echo 'export DATABASE_URL="'"${DB_STRING}"'"' >> /mnt/"${global_dataset_iocage}"/jails/${JAIL_NAME}/root/usr/local/etc/rc.conf.d/bitwarden
-echo 'export ADMIN_TOKEN="'"${ADMIN_TOKEN}"'"' >> /mnt/"${global_dataset_iocage}"/jails/${JAIL_NAME}/root/usr/local/etc/rc.conf.d/bitwarden
-
-if [ "${ADMIN_TOKEN}" == "NONE" ]; then
-	echo "Admin_token set to NONE, disabling admin portal"
-else
-	echo "Admin_token set and admin portal enabled"
-	iocage exec "${JAIL_NAME}" echo "${DB_NAME} Admin Token is ${ADMIN_TOKEN}" > /root/${JAIL_NAME}_admin_token.txt
-fi
-
-iocage exec ${JAIL_NAME} chmod u+x /usr/local/etc/rc.d/bitwarden
-iocage exec ${JAIL_NAME} sysrc "bitwarden_enable=YES"
-iocage exec ${JAIL_NAME} service bitwarden restart
-echo "Jail ${JAIL_NAME} finished Bitwarden install."
-echo "Admin Token is ${ADMIN_TOKEN}"
diff --git a/jails/bitwarden/update.sh b/jails/bitwarden/update.sh
deleted file mode 100755
index 15e51002..00000000
--- a/jails/bitwarden/update.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/usr/local/bin/bash
-# This file contains the update script for bitwarden
-# Due to it being build from scratch or downloaded directly to execution dir, 
-# Update for Bitwarden is pretty similair to installation
-
-# Initialise defaults
-JAIL_NAME="bitwarden"
-DB_DATABASE=${JAIL_NAME}
-DB_USER=${JAIL_NAME}
-# shellcheck disable=SC2154
-INSTALL_TYPE=${bitwarden_type}
-# shellcheck disable=SC2154
-DB_HOST="${mariadb_ip4_addr%/*}:3306"
-# shellcheck disable=SC2154
-DB_PASSWORD="${bitwarden_db_password}"
-DB_STRING="mysql://${DB_USER}:${DB_PASSWORD}@${DB_HOST}/${DB_DATABASE}"
-# shellcheck disable=SC2154
-ADMIN_TOKEN=${bitwarden_admin_token}
-
-if [ -z "${ADMIN_TOKEN}" ]; then
-ADMIN_TOKEN=$(openssl rand -base64 16)
-fi
-
-iocage exec ${JAIL_NAME} service bitwarden stop
-
-# install latest rust version, pkg version is outdated and can't build bitwarden_rs
-iocage exec ${JAIL_NAME} "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y"
-
-# Install Bitwarden_rs
-iocage exec ${JAIL_NAME} "git -C /usr/local/share/bitwarden/src fetch"
-TAG=$(iocage exec ${JAIL_NAME} "git -C /usr/local/share/bitwarden/src tag --sort=v:refname | tail -n1")
-iocage exec ${JAIL_NAME} "git -C /usr/local/share/bitwarden/src checkout ${TAG}"
-#TODO replace with: cargo build --features mysql --release
-if [ "${INSTALL_TYPE}" == "mariadb" ]; then
-	iocage exec ${JAIL_NAME} "cd /usr/local/share/bitwarden/src && $HOME/.cargo/bin/cargo build --features mysql --release"
-	iocage exec ${JAIL_NAME} "cd /usr/local/share/bitwarden/src && $HOME/.cargo/bin/cargo install diesel_cli --no-default-features --features mysql"
-else
-	iocage exec ${JAIL_NAME} "cd /usr/local/share/bitwarden/src && $HOME/.cargo/bin/cargo build --features sqlite --release"
-	iocage exec ${JAIL_NAME} "cd /usr/local/share/bitwarden/src && $HOME/.cargo/bin/cargo install diesel_cli --no-default-features --features sqlite-bundled"
-fi
-
-
-iocage exec ${JAIL_NAME} cp -r /usr/local/share/bitwarden/src/target/release /usr/local/share/bitwarden/bin
-
-# Download and install webvault
-WEB_RELEASE_URL=$(curl -Ls -o /dev/null -w "%{url_effective}" https://github.com/dani-garcia/bw_web_builds/releases/latest)
-WEB_TAG="${WEB_RELEASE_URL##*/}"
-iocage exec ${JAIL_NAME} "fetch http://github.com/dani-garcia/bw_web_builds/releases/download/$WEB_TAG/bw_web_$WEB_TAG.tar.gz -o /usr/local/share/bitwarden"
-iocage exec ${JAIL_NAME} "tar -xzvf /usr/local/share/bitwarden/bw_web_$WEB_TAG.tar.gz -C /usr/local/share/bitwarden/"
-iocage exec ${JAIL_NAME} rm /usr/local/share/bitwarden/bw_web_"$WEB_TAG".tar.gz
-
-iocage exec ${JAIL_NAME} chown -R bitwarden:bitwarden /usr/local/share/bitwarden /config
-# shellcheck disable=SC2154
-cp "${SCRIPT_DIR}"/jails/${JAIL_NAME}/includes/bitwarden.rc /mnt/"${global_dataset_iocage}"/jails/${JAIL_NAME}/root/usr/local/etc/rc.d/bitwarden
-cp "${SCRIPT_DIR}"/jails/${JAIL_NAME}/includes/bitwarden.rc.conf /mnt/"${global_dataset_iocage}"/jails/${JAIL_NAME}/root/usr/local/etc/rc.conf.d/bitwarden
-echo 'export DATABASE_URL="'"${DB_STRING}"'"' >> /mnt/"${global_dataset_iocage}"/jails/${JAIL_NAME}/root/usr/local/etc/rc.conf.d/bitwarden
-echo 'export ADMIN_TOKEN="'"${ADMIN_TOKEN}"'"' >> /mnt/"${global_dataset_iocage}"/jails/${JAIL_NAME}/root/usr/local/etc/rc.conf.d/bitwarden
-
-if [ "${ADMIN_TOKEN}" == "NONE" ]; then
-	echo "Admin_token set to NONE, disabling admin portal"
-else
-	echo "Admin_token set and admin portal enabled"
-	iocage exec "${JAIL_NAME}" echo "${DB_NAME} Admin Token is ${ADMIN_TOKEN}" > /root/${JAIL_NAME}_admin_token.txt
-fi
-
-
-iocage exec ${JAIL_NAME} chmod u+x /usr/local/etc/rc.d/bitwarden
-iocage exec ${JAIL_NAME} service bitwarden restart
-echo "Jail ${JAIL_NAME} finished Bitwarden update."
-echo "Admin Token is ${ADMIN_TOKEN}"
diff --git a/jails/influxdb/config.yml b/jails/influxdb/config.yml
deleted file mode 100644
index 2ced3a1c..00000000
--- a/jails/influxdb/config.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-influxdb: influxdb
-  pkgs: influxdb
\ No newline at end of file
diff --git a/jails/influxdb/includes/influxdb.conf b/jails/influxdb/includes/influxdb.conf
deleted file mode 100644
index ad9533b0..00000000
--- a/jails/influxdb/includes/influxdb.conf
+++ /dev/null
@@ -1,586 +0,0 @@
-### Welcome to the InfluxDB configuration file.
-
-# The values in this file override the default values used by the system if
-# a config option is not specified. The commented out lines are the configuration
-# field and the default value used. Uncommenting a line and changing the value
-# will change the value used at runtime when the process is restarted.
-
-# Once every 24 hours InfluxDB will report usage data to usage.influxdata.com
-# The data includes a random ID, os, arch, version, the number of series and other
-# usage data. No data from user databases is ever transmitted.
-# Change this option to true to disable reporting.
-# reporting-disabled = false
-
-# Bind address to use for the RPC service for backup and restore.
-# bind-address = "127.0.0.1:8088"
-
-###
-### [meta]
-###
-### Controls the parameters for the Raft consensus group that stores metadata
-### about the InfluxDB cluster.
-###
-
-[meta]
-  # Where the metadata/raft database is stored
-  dir = "/config/influxdb/database/meta"
-
-  # Automatically create a default retention policy when creating a database.
-  # retention-autocreate = true
-
-  # If log messages are printed for the meta service
-  # logging-enabled = true
-
-###
-### [data]
-###
-### Controls where the actual shard data for InfluxDB lives and how it is
-### flushed from the WAL. "dir" may need to be changed to a suitable place
-### for your system, but the WAL settings are an advanced configuration. The
-### defaults should work for most systems.
-###
-
-[data]
-  # The directory where the TSM storage engine stores TSM files.
-  dir = "/config/influxdb/database/data"
-
-  # The directory where the TSM storage engine stores WAL files.
-  wal-dir = "/config/influxdb/database/wal"
-
-  # The amount of time that a write will wait before fsyncing.  A duration
-  # greater than 0 can be used to batch up multiple fsync calls.  This is useful for slower
-  # disks or when WAL write contention is seen.  A value of 0s fsyncs every write to the WAL.
-  # Values in the range of 0-100ms are recommended for non-SSD disks.
-  # wal-fsync-delay = "0s"
-
-
-  # The type of shard index to use for new shards.  The default is an in-memory index that is
-  # recreated at startup.  A value of "tsi1" will use a disk based index that supports higher
-  # cardinality datasets.
-  # index-version = "inmem"
-
-  # Trace logging provides more verbose output around the tsm engine. Turning
-  # this on can provide more useful output for debugging tsm engine issues.
-  # trace-logging-enabled = false
-
-  # Whether queries should be logged before execution. Very useful for troubleshooting, but will
-  # log any sensitive data contained within a query.
-  # query-log-enabled = true
-
-  # Validates incoming writes to ensure keys only have valid unicode characters.
-  # This setting will incur a small overhead because every key must be checked.
-  # validate-keys = false
-
-  # Settings for the TSM engine
-
-  # CacheMaxMemorySize is the maximum size a shard's cache can
-  # reach before it starts rejecting writes.
-  # Valid size suffixes are k, m, or g (case insensitive, 1024 = 1k).
-  # Values without a size suffix are in bytes.
-  # cache-max-memory-size = "1g"
-
-  # CacheSnapshotMemorySize is the size at which the engine will
-  # snapshot the cache and write it to a TSM file, freeing up memory
-  # Valid size suffixes are k, m, or g (case insensitive, 1024 = 1k).
-  # Values without a size suffix are in bytes.
-  # cache-snapshot-memory-size = "25m"
-
-  # CacheSnapshotWriteColdDuration is the length of time at
-  # which the engine will snapshot the cache and write it to
-  # a new TSM file if the shard hasn't received writes or deletes
-  # cache-snapshot-write-cold-duration = "10m"
-
-  # CompactFullWriteColdDuration is the duration at which the engine
-  # will compact all TSM files in a shard if it hasn't received a
-  # write or delete
-  # compact-full-write-cold-duration = "4h"
-
-  # The maximum number of concurrent full and level compactions that can run at one time.  A
-  # value of 0 results in 50% of runtime.GOMAXPROCS(0) used at runtime.  Any number greater
-  # than 0 limits compactions to that value.  This setting does not apply
-  # to cache snapshotting.
-  # max-concurrent-compactions = 0
-
-  # CompactThroughput is the rate limit in bytes per second that we
-  # will allow TSM compactions to write to disk. Note that short bursts are allowed
-  # to happen at a possibly larger value, set by CompactThroughputBurst
-  # compact-throughput = "48m"
-
-  # CompactThroughputBurst is the rate limit in bytes per second that we
-  # will allow TSM compactions to write to disk.
-  # compact-throughput-burst = "48m"
-
-  # If true, then the mmap advise value MADV_WILLNEED will be provided to the kernel with respect to
-  # TSM files. This setting has been found to be problematic on some kernels, and defaults to off.
-  # It might help users who have slow disks in some cases.
-  # tsm-use-madv-willneed = false
-
-  # Settings for the inmem index
-
-  # The maximum series allowed per database before writes are dropped.  This limit can prevent
-  # high cardinality issues at the database level.  This limit can be disabled by setting it to
-  # 0.
-  # max-series-per-database = 1000000
-
-  # The maximum number of tag values per tag that are allowed before writes are dropped.  This limit
-  # can prevent high cardinality tag values from being written to a measurement.  This limit can be
-  # disabled by setting it to 0.
-  # max-values-per-tag = 100000
-
-  # Settings for the tsi1 index
-
-  # The threshold, in bytes, when an index write-ahead log file will compact
-  # into an index file. Lower sizes will cause log files to be compacted more
-  # quickly and result in lower heap usage at the expense of write throughput.
-  # Higher sizes will be compacted less frequently, store more series in-memory,
-  # and provide higher write throughput.
-  # Valid size suffixes are k, m, or g (case insensitive, 1024 = 1k).
-  # Values without a size suffix are in bytes.
-  # max-index-log-file-size = "1m"
-
-  # The size of the internal cache used in the TSI index to store previously 
-  # calculated series results. Cached results will be returned quickly from the cache rather
-  # than needing to be recalculated when a subsequent query with a matching tag key/value 
-  # predicate is executed. Setting this value to 0 will disable the cache, which may
-  # lead to query performance issues.
-  # This value should only be increased if it is known that the set of regularly used 
-  # tag key/value predicates across all measurements for a database is larger than 100. An
-  # increase in cache size may lead to an increase in heap usage.
-  series-id-set-cache-size = 100
-
-###
-### [coordinator]
-###
-### Controls the clustering service configuration.
-###
-
-[coordinator]
-  # The default time a write request will wait until a "timeout" error is returned to the caller.
-  # write-timeout = "10s"
-
-  # The maximum number of concurrent queries allowed to be executing at one time.  If a query is
-  # executed and exceeds this limit, an error is returned to the caller.  This limit can be disabled
-  # by setting it to 0.
-  # max-concurrent-queries = 0
-
-  # The maximum time a query will is allowed to execute before being killed by the system.  This limit
-  # can help prevent run away queries.  Setting the value to 0 disables the limit.
-  # query-timeout = "0s"
-
-  # The time threshold when a query will be logged as a slow query.  This limit can be set to help
-  # discover slow or resource intensive queries.  Setting the value to 0 disables the slow query logging.
-  # log-queries-after = "0s"
-
-  # The maximum number of points a SELECT can process.  A value of 0 will make
-  # the maximum point count unlimited.  This will only be checked every second so queries will not
-  # be aborted immediately when hitting the limit.
-  # max-select-point = 0
-
-  # The maximum number of series a SELECT can run.  A value of 0 will make the maximum series
-  # count unlimited.
-  # max-select-series = 0
-
-  # The maximum number of group by time bucket a SELECT can create.  A value of zero will max the maximum
-  # number of buckets unlimited.
-  # max-select-buckets = 0
-
-###
-### [retention]
-###
-### Controls the enforcement of retention policies for evicting old data.
-###
-
-[retention]
-  # Determines whether retention policy enforcement enabled.
-  # enabled = true
-
-  # The interval of time when retention policy enforcement checks run.
-  # check-interval = "30m"
-
-###
-### [shard-precreation]
-###
-### Controls the precreation of shards, so they are available before data arrives.
-### Only shards that, after creation, will have both a start- and end-time in the
-### future, will ever be created. Shards are never precreated that would be wholly
-### or partially in the past.
-
-[shard-precreation]
-  # Determines whether shard pre-creation service is enabled.
-  # enabled = true
-
-  # The interval of time when the check to pre-create new shards runs.
-  # check-interval = "10m"
-
-  # The default period ahead of the endtime of a shard group that its successor
-  # group is created.
-  # advance-period = "30m"
-
-###
-### Controls the system self-monitoring, statistics and diagnostics.
-###
-### The internal database for monitoring data is created automatically if
-### if it does not already exist. The target retention within this database
-### is called 'monitor' and is also created with a retention period of 7 days
-### and a replication factor of 1, if it does not exist. In all cases the
-### this retention policy is configured as the default for the database.
-
-[monitor]
-  # Whether to record statistics internally.
-  # store-enabled = true
-
-  # The destination database for recorded statistics
-  # store-database = "_internal"
-
-  # The interval at which to record statistics
-  # store-interval = "10s"
-
-###
-### [http]
-###
-### Controls how the HTTP endpoints are configured. These are the primary
-### mechanism for getting data into and out of InfluxDB.
-###
-
-[http]
-  # Determines whether HTTP endpoint is enabled.
-  # enabled = true
-
-  # Determines whether the Flux query endpoint is enabled.
-  # flux-enabled = false
-
-  # Determines whether the Flux query logging is enabled.
-  # flux-log-enabled = false
-
-  # The bind address used by the HTTP service.
-  # bind-address = ":8086"
-
-  # Determines whether user authentication is enabled over HTTP/HTTPS.
-  # auth-enabled = false
-
-  # The default realm sent back when issuing a basic auth challenge.
-  # realm = "InfluxDB"
-
-  # Determines whether HTTP request logging is enabled.
-  # log-enabled = true
-
-  # Determines whether the HTTP write request logs should be suppressed when the log is enabled.
-  # suppress-write-log = false
-
-  # When HTTP request logging is enabled, this option specifies the path where
-  # log entries should be written. If unspecified, the default is to write to stderr, which
-  # intermingles HTTP logs with internal InfluxDB logging.
-  #
-  # If influxd is unable to access the specified path, it will log an error and fall back to writing
-  # the request log to stderr.
-  # access-log-path = ""
-
-  # Filters which requests should be logged. Each filter is of the pattern NNN, NNX, or NXX where N is
-  # a number and X is a wildcard for any number. To filter all 5xx responses, use the string 5xx.
-  # If multiple filters are used, then only one has to match. The default is to have no filters which
-  # will cause every request to be printed.
-  # access-log-status-filters = []
-
-  # Determines whether detailed write logging is enabled.
-  # write-tracing = false
-
-  # Determines whether the pprof endpoint is enabled.  This endpoint is used for
-  # troubleshooting and monitoring.
-  # pprof-enabled = true
-
-  # Enables authentication on pprof endpoints. Users will need admin permissions
-  # to access the pprof endpoints when this setting is enabled. This setting has
-  # no effect if either auth-enabled or pprof-enabled are set to false.
-  # pprof-auth-enabled = false
-
-  # Enables a pprof endpoint that binds to localhost:6060 immediately on startup.
-  # This is only needed to debug startup issues.
-  # debug-pprof-enabled = false
-
-  # Enables authentication on the /ping, /metrics, and deprecated /status
-  # endpoints. This setting has no effect if auth-enabled is set to false.
-  # ping-auth-enabled = false
-
-  # Determines whether HTTPS is enabled.
-  # https-enabled = false
-
-  # The SSL certificate to use when HTTPS is enabled.
-  # https-certificate = "/config/ssl/influxdb.pem"
-
-  # Use a separate private key location.
-  # https-private-key = ""
-
-  # The JWT auth shared secret to validate requests using JSON web tokens.
-  # shared-secret = ""
-
-  # The default chunk size for result sets that should be chunked.
-  # max-row-limit = 0
-
-  # The maximum number of HTTP connections that may be open at once.  New connections that
-  # would exceed this limit are dropped.  Setting this value to 0 disables the limit.
-  # max-connection-limit = 0
-
-  # Enable http service over unix domain socket
-  # unix-socket-enabled = false
-
-  # The path of the unix domain socket.
-  # bind-socket = "/var/run/influxdb.sock"
-
-  # The maximum size of a client request body, in bytes. Setting this value to 0 disables the limit.
-  # max-body-size = 25000000
-
-  # The maximum number of writes processed concurrently.
-  # Setting this to 0 disables the limit.
-  # max-concurrent-write-limit = 0
-
-  # The maximum number of writes queued for processing.
-  # Setting this to 0 disables the limit.
-  # max-enqueued-write-limit = 0
-
-  # The maximum duration for a write to wait in the queue to be processed.
-  # Setting this to 0 or setting max-concurrent-write-limit to 0 disables the limit.
-  # enqueued-write-timeout = 0
-
-###
-### [logging]
-###
-### Controls how the logger emits logs to the output.
-###
-
-[logging]
-  # Determines which log encoder to use for logs. Available options
-  # are auto, logfmt, and json. auto will use a more a more user-friendly
-  # output format if the output terminal is a TTY, but the format is not as
-  # easily machine-readable. When the output is a non-TTY, auto will use
-  # logfmt.
-  # format = "auto"
-
-  # Determines which level of logs will be emitted. The available levels
-  # are error, warn, info, and debug. Logs that are equal to or above the
-  # specified level will be emitted.
-  # level = "info"
-
-  # Suppresses the logo output that is printed when the program is started.
-  # The logo is always suppressed if STDOUT is not a TTY.
-  # suppress-logo = false
-
-###
-### [subscriber]
-###
-### Controls the subscriptions, which can be used to fork a copy of all data
-### received by the InfluxDB host.
-###
-
-[subscriber]
-  # Determines whether the subscriber service is enabled.
-  # enabled = true
-
-  # The default timeout for HTTP writes to subscribers.
-  # http-timeout = "30s"
-
-  # Allows insecure HTTPS connections to subscribers.  This is useful when testing with self-
-  # signed certificates.
-  # insecure-skip-verify = false
-
-  # The path to the PEM encoded CA certs file. If the empty string, the default system certs will be used
-  # ca-certs = ""
-
-  # The number of writer goroutines processing the write channel.
-  # write-concurrency = 40
-
-  # The number of in-flight writes buffered in the write channel.
-  # write-buffer-size = 1000
-
-
-###
-### [[graphite]]
-###
-### Controls one or many listeners for Graphite data.
-###
-
-[[graphite]]
-  # Determines whether the graphite endpoint is enabled.
-  # enabled = false
-  # database = "graphite"
-  # retention-policy = ""
-  # bind-address = ":2003"
-  # protocol = "tcp"
-  # consistency-level = "one"
-
-  # These next lines control how batching works. You should have this enabled
-  # otherwise you could get dropped metrics or poor performance. Batching
-  # will buffer points in memory if you have many coming in.
-
-  # Flush if this many points get buffered
-  # batch-size = 5000
-
-  # number of batches that may be pending in memory
-  # batch-pending = 10
-
-  # Flush at least this often even if we haven't hit buffer limit
-  # batch-timeout = "1s"
-
-  # UDP Read buffer size, 0 means OS default. UDP listener will fail if set above OS max.
-  # udp-read-buffer = 0
-
-  ### This string joins multiple matching 'measurement' values providing more control over the final measurement name.
-  # separator = "."
-
-  ### Default tags that will be added to all metrics.  These can be overridden at the template level
-  ### or by tags extracted from metric
-  # tags = ["region=us-east", "zone=1c"]
-
-  ### Each template line requires a template pattern.  It can have an optional
-  ### filter before the template and separated by spaces.  It can also have optional extra
-  ### tags following the template.  Multiple tags should be separated by commas and no spaces
-  ### similar to the line protocol format.  There can be only one default template.
-  # templates = [
-  #   "*.app env.service.resource.measurement",
-  #   # Default template
-  #   "server.*",
-  # ]
-
-###
-### [collectd]
-###
-### Controls one or many listeners for collectd data.
-###
-
-[[collectd]]
-  # enabled = false
-  # bind-address = ":25826"
-  # database = "collectd"
-  # retention-policy = ""
-  #
-  # The collectd service supports either scanning a directory for multiple types
-  # db files, or specifying a single db file.
-  # typesdb = "/usr/local/share/collectd"
-  #
-  # security-level = "none"
-  # auth-file = "/etc/collectd/auth_file"
-
-  # These next lines control how batching works. You should have this enabled
-  # otherwise you could get dropped metrics or poor performance. Batching
-  # will buffer points in memory if you have many coming in.
-
-  # Flush if this many points get buffered
-  # batch-size = 5000
-
-  # Number of batches that may be pending in memory
-  # batch-pending = 10
-
-  # Flush at least this often even if we haven't hit buffer limit
-  # batch-timeout = "10s"
-
-  # UDP Read buffer size, 0 means OS default. UDP listener will fail if set above OS max.
-  # read-buffer = 0
-
-  # Multi-value plugins can be handled two ways.
-  # "split" will parse and store the multi-value plugin data into separate measurements
-  # "join" will parse and store the multi-value plugin as a single multi-value measurement.
-  # "split" is the default behavior for backward compatibility with previous versions of influxdb.
-  # parse-multivalue-plugin = "split"
-###
-### [opentsdb]
-###
-### Controls one or many listeners for OpenTSDB data.
-###
-
-[[opentsdb]]
-  # enabled = false
-  # bind-address = ":4242"
-  # database = "opentsdb"
-  # retention-policy = ""
-  # consistency-level = "one"
-  # tls-enabled = false
-  # certificate= "/config/ssl/influxdb.pem"
-
-  # Log an error for every malformed point.
-  # log-point-errors = true
-
-  # These next lines control how batching works. You should have this enabled
-  # otherwise you could get dropped metrics or poor performance. Only points
-  # metrics received over the telnet protocol undergo batching.
-
-  # Flush if this many points get buffered
-  # batch-size = 1000
-
-  # Number of batches that may be pending in memory
-  # batch-pending = 5
-
-  # Flush at least this often even if we haven't hit buffer limit
-  # batch-timeout = "1s"
-
-###
-### [[udp]]
-###
-### Controls the listeners for InfluxDB line protocol data via UDP.
-###
-
-[[udp]]
-  # enabled = false
-  # bind-address = ":8089"
-  # database = "udp"
-  # retention-policy = ""
-
-  # InfluxDB precision for timestamps on received points ("" or "n", "u", "ms", "s", "m", "h")
-  # precision = ""
-
-  # These next lines control how batching works. You should have this enabled
-  # otherwise you could get dropped metrics or poor performance. Batching
-  # will buffer points in memory if you have many coming in.
-
-  # Flush if this many points get buffered
-  # batch-size = 5000
-
-  # Number of batches that may be pending in memory
-  # batch-pending = 10
-
-  # Will flush at least this often even if we haven't hit buffer limit
-  # batch-timeout = "1s"
-
-  # UDP Read buffer size, 0 means OS default. UDP listener will fail if set above OS max.
-  # read-buffer = 0
-
-###
-### [continuous_queries]
-###
-### Controls how continuous queries are run within InfluxDB.
-###
-
-[continuous_queries]
-  # Determines whether the continuous query service is enabled.
-  # enabled = true
-
-  # Controls whether queries are logged when executed by the CQ service.
-  # log-enabled = true
-
-  # Controls whether queries are logged to the self-monitoring data store.
-  # query-stats-enabled = false
-
-  # interval for how often continuous queries will be checked if they need to run
-  # run-interval = "1s"
-
-###
-### [tls]
-###
-### Global configuration settings for TLS in InfluxDB.
-###
-
-[tls]
-  # Determines the available set of cipher suites. See https://golang.org/pkg/crypto/tls/#pkg-constants
-  # for a list of available ciphers, which depends on the version of Go (use the query
-  # SHOW DIAGNOSTICS to see the version of Go used to build InfluxDB). If not specified, uses
-  # the default settings from Go's crypto/tls package.
-  # ciphers = [
-  #   "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305",
-  #   "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
-  # ]
-
-  # Minimum version of the tls protocol that will be negotiated. If not specified, uses the
-  # default settings from Go's crypto/tls package.
-  # min-version = "tls1.2"
-
-  # Maximum version of the tls protocol that will be negotiated. If not specified, uses the
-  # default settings from Go's crypto/tls package.
-  # max-version = "tls1.2"
diff --git a/jails/influxdb/install.sh b/jails/influxdb/install.sh
deleted file mode 100755
index 9fe6886a..00000000
--- a/jails/influxdb/install.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/local/bin/bash
-# This script installs the current release of InfluxDB
-
-#####
-# 
-# Init and Mounts
-#
-#####
-
-# Initialise variables
-JAIL_NAME="influxdb"
-# shellcheck disable=SC2154
-JAIL_IP="${influxdb_ip4_addr%/*}"
-INCLUDES_PATH="${SCRIPT_DIR}/jails/influxdb/includes"
-# shellcheck disable=SC2154
-DATABASE="${influxdb_database}"
-
-# Mount and configure proper configuration location
-# shellcheck disable=SC2154
-cp -rf "${INCLUDES_PATH}/influxd.conf" "/mnt/${global_dataset_config}/${JAIL_NAME}/influxd.conf"
-iocage exec "${JAIL_NAME}" mkdir -p /config/db/data /config/db/meta /config/db/wal
-iocage exec "${JAIL_NAME}" chown -R influxd:influxd /config/db
-iocage exec "${JAIL_NAME}" sysrc influxd_conf="/config/influxd.conf"
-iocage exec "${JAIL_NAME}" sysrc influxd_enable="YES"
-
-# Start influxdb and wait for it to startup
-iocage exec "${JAIL_NAME}" service influxd start
-sleep 15
-
-# Create database and restart
-if iocage exec "${JAIL_NAME}" curl -XPOST http://localhost:8086/query --data-urlencode "q=CREATE DATABASE ${DATABASE}"; then
-  echo "Database created."
-else 
-  echo "Database creation failed. Please attempt to create the database manually."
-  exit 1
-fi
-
-# Done!
-echo "Installation complete!"
-echo "Your may connect InfluxDB plugins to the InfluxDB jail at http://${JAIL_IP}:8086."
-echo "You may connect InfluxDB plugins to the InfluxDB jail at http://${JAIL_IP}:8086."
-echo ""
-echo "Database Information"
-echo "--------------------"
-echo "Database = ${DATABASE} at http://${JAIL_IP}:8086."
-echo ""
\ No newline at end of file
diff --git a/jails/jackett/config.yml b/jails/jackett/config.yml
deleted file mode 100644
index 01cd737f..00000000
--- a/jails/jackett/config.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-jackett: jackett
-  pkgs: mono
\ No newline at end of file
diff --git a/jails/jackett/install.sh b/jails/jackett/install.sh
deleted file mode 100755
index 954d59c5..00000000
--- a/jails/jackett/install.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/local/bin/bash
-# This file contains the install script for jackett
-
-iocage exec jackett "fetch https://github.com/Jackett/Jackett/releases/download/v0.11.502/Jackett.Binaries.Mono.tar.gz -o /usr/local/share"
-iocage exec jackett "tar -xzvf /usr/local/share/Jackett.Binaries.Mono.tar.gz -C /usr/local/share"
-iocage exec jackett rm /usr/local/share/Jackett.Binaries.Mono.tar.gz
-iocage exec jackett "pw user add jackett -c jackett -u 818 -d /nonexistent -s /usr/bin/nologin"
-iocage exec jackett chown -R jackett:jackett /usr/local/share/Jackett /config
-iocage exec jackett mkdir /usr/local/etc/rc.d
-# shellcheck disable=SC2154
-cp "${SCRIPT_DIR}"/jails/jackett/includes/jackett.rc /mnt/"${global_dataset_iocage}"/jails/jackett/root/usr/local/etc/rc.d/jackett
-iocage exec jackett chmod u+x /usr/local/etc/rc.d/jackett
-iocage exec jackett sysrc "jackett_enable=YES"
-iocage exec jackett service jackett restart
diff --git a/jails/jackett/update.sh b/jails/jackett/update.sh
deleted file mode 100755
index b5ad1679..00000000
--- a/jails/jackett/update.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/local/bin/bash
-# This file contains the update script for jackett
-
-iocage exec jackett service jackett stop
-#TODO insert code to update jacket itself here
-iocage exec jackett chown -R jackett:jackett /usr/local/share/Jackett /config
-# shellcheck disable=SC2154
-cp "${SCRIPT_DIR}"/jails/test10/includes/jackett.rc /mnt/"${global_dataset_iocage}"/jails/test10/root/usr/local/etc/rc.d/jackett
-iocage exec jackett chmod u+x /usr/local/etc/rc.d/jackett
-iocage exec jackett service jackett restart
diff --git a/jails/kms/config.yml b/jails/kms/config.yml
deleted file mode 100644
index ca31811d..00000000
--- a/jails/kms/config.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-kms: kms
-  pkgs: bash py37-tkinter py37-pip py37-sqlite3 git
\ No newline at end of file
diff --git a/jails/kms/install.sh b/jails/kms/install.sh
deleted file mode 100755
index c7dffa88..00000000
--- a/jails/kms/install.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/local/bin/bash
-# This file contains the install script for KMS
-
-
-iocage exec kms svn checkout https://github.com/SystemRage/py-kms/trunk/py-kms /usr/local/share/py-kms
-iocage exec kms "pw user add kms -c kms -u 666 -d /nonexistent -s /usr/bin/nologin"
-iocage exec kms chown -R kms:kms /usr/local/share/py-kms /config
-iocage exec kms mkdir /usr/local/etc/rc.d
-# shellcheck disable=SC2154
-cp "${SCRIPT_DIR}"/jails/kms/includes/py_kms.rc /mnt/"${global_dataset_iocage}"/jails/kms/root/usr/local/etc/rc.d/py_kms
-iocage exec kms chmod u+x /usr/local/etc/rc.d/py_kms
-iocage exec kms sysrc "py_kms_enable=YES"
-iocage exec kms service py_kms start
\ No newline at end of file
diff --git a/jails/kms/update.sh b/jails/kms/update.sh
deleted file mode 100755
index e953f084..00000000
--- a/jails/kms/update.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/local/bin/bash
-# This file contains the update script for KMS
-
-iocage exec kms service py_kms stop
-iocage exec kms svn checkout https://github.com/SystemRage/py-kms/trunk/py-kms /usr/local/share/py-kms
-iocage exec kms chown -R kms:kms /usr/local/share/py-kms /config
-# shellcheck disable=SC2154
-cp "${SCRIPT_DIR}"/jails/kms/includes/py_kms.rc /mnt/"${global_dataset_iocage}"/jails/kms/root/usr/local/etc/rc.d/py_kms
-iocage exec kms chmod u+x /usr/local/etc/rc.d/py_kms
-iocage exec kms service py_kms start
\ No newline at end of file
diff --git a/jails/lidarr/config.yml b/jails/lidarr/config.yml
deleted file mode 100644
index c9bc00a2..00000000
--- a/jails/lidarr/config.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-lidarr: lidarr
-  pkgs: mono mediainfo sqlite3
\ No newline at end of file
diff --git a/jails/lidarr/install.sh b/jails/lidarr/install.sh
deleted file mode 100755
index 702d3603..00000000
--- a/jails/lidarr/install.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/local/bin/bash
-# This file contains the install script for lidarr
-
-# Check if dataset for completed download and it parent dataset exist, create if they do not.
-# shellcheck disable=SC2154
-createmount lidarr "${global_dataset_downloads}"
-createmount lidarr "${global_dataset_downloads}"/complete /mnt/fetched
-
-# Check if dataset for media library and the dataset for movies exist, create if they do not.
-# shellcheck disable=SC2154
-createmount lidarr "${global_dataset_media}"
-createmount lidarr "${global_dataset_media}"/music /mnt/music
-
-
-iocage exec lidarr "fetch https://github.com/lidarr/Lidarr/releases/download/v0.2.0.371/Lidarr.develop.0.2.0.371.linux.tar.gz -o /usr/local/share"
-iocage exec lidarr "tar -xzvf /usr/local/share/Lidarr.develop.0.2.0.371.linux.tar.gz -C /usr/local/share"
-iocage exec lidarr "rm /usr/local/share/Lidarr.develop.0.2.0.371.linux.tar.gz"
-iocage exec lidarr "pw user add lidarr -c lidarr -u 353 -d /nonexistent -s /usr/bin/nologin"
-iocage exec lidarr chown -R lidarr:lidarr /usr/local/share/Lidarr /config
-iocage exec lidarr mkdir /usr/local/etc/rc.d
-# shellcheck disable=SC2154
-cp "${SCRIPT_DIR}"/jails/lidarr/includes/lidarr.rc /mnt/"${global_dataset_iocage}"/jails/lidarr/root/usr/local/etc/rc.d/lidarr
-iocage exec lidarr chmod u+x /usr/local/etc/rc.d/lidarr
-iocage exec lidarr sysrc "lidarr_enable=YES"
-iocage exec lidarr service lidarr start
diff --git a/jails/lidarr/update.sh b/jails/lidarr/update.sh
deleted file mode 100755
index a1990a7a..00000000
--- a/jails/lidarr/update.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/local/bin/bash
-# This file contains the update script for lidarr
-
-iocage exec lidarr service lidarr stop
-#TODO insert code to update lidarr itself here
-iocage exec lidarr chown -R lidarr:lidarr /usr/local/share/lidarr /config
-# shellcheck disable=SC2154
-cp "${SCRIPT_DIR}"/jails/lidarr/includes/lidarr.rc /mnt/"${global_dataset_iocage}"/jails/lidarr/root/usr/local/etc/rc.d/lidarr
-iocage exec lidarr chmod u+x /usr/local/etc/rc.d/lidarr
-iocage exec lidarr service lidarr restart
\ No newline at end of file
diff --git a/jails/mariadb/config.yml b/jails/mariadb/config.yml
deleted file mode 100644
index bbe68e55..00000000
--- a/jails/mariadb/config.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-mariadb: mariadb
-  pkgs: mariadb104-server git  php74-session php74-xml php74-ctype php74-openssl php74-filter php74-gd php74-json php74-mysqli php74-mbstring php74-zlib php74-zip php74-bz2 phpMyAdmin5-php74 php74-pdo_mysql php74-mysqli phpMyAdmin5-php74-5.0.1
diff --git a/jails/mariadb/install.sh b/jails/mariadb/install.sh
deleted file mode 100755
index 9bf39b4e..00000000
--- a/jails/mariadb/install.sh
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/usr/local/bin/bash
-# This script installs the current release of Mariadb and PhpMyAdmin into a created jail
-#####
-# 
-# Init and Mounts
-#
-#####
-
-# Initialise defaults
-JAIL_NAME="mariadb"
-# shellcheck disable=SC2154
-JAIL_IP="${mariadb_ip4_addr%/*}"
-INCLUDES_PATH="${SCRIPT_DIR}/jails/mariadb/includes"
-# shellcheck disable=SC2154
-CERT_EMAIL=${mariadb_cert_email}
-# shellcheck disable=SC2154
-DB_ROOT_PASSWORD=${mariadb_db_root_password}
-DB_NAME="MariaDB"
-DL_FLAGS=""
-
-# Check that necessary variables were set by nextcloud-config
-if [ -z "${mariadb_ip4_addr}" ]; then
-  echo 'Configuration error: The mariadb jail does NOT accept DHCP'
-  echo 'Please reinstall using a fixed IP adress'
-  exit 1
-fi
-
-# Make sure DB_PATH is empty -- if not, MariaDB/PostgreSQL will choke
-# shellcheck disable=SC2154
-if [ "$(ls -A "/mnt/${global_dataset_config}/${JAIL_NAME}/db")" ]; then
-	echo "Reinstall of mariadb detected... Continuing"
-	REINSTALL="true"
-fi
-
-# Mount database dataset and set zfs preferences
-createmount ${JAIL_NAME} "${global_dataset_config}"/${JAIL_NAME}/db /var/db/mysql
-zfs set recordsize=16K "${global_dataset_config}"/${JAIL_NAME}/db
-zfs set primarycache=metadata "${global_dataset_config}"/${JAIL_NAME}/db
-
-iocage exec "${JAIL_NAME}" chown -R 88:88 /var/db/mysql
-
-# Install includes fstab
-iocage exec "${JAIL_NAME}" mkdir -p /mnt/includes
-iocage fstab -a "${JAIL_NAME}" "${INCLUDES_PATH}" /mnt/includes nullfs rw 0 0
-
-iocage exec "${JAIL_NAME}" mkdir -p /usr/local/www/phpmyadmin
-iocage exec "${JAIL_NAME}" chown -R www:www /usr/local/www/phpmyadmin
-
-#####
-# 
-# Install mariadb, Caddy and PhpMyAdmin
-#
-#####
-
-fetch -o /tmp https://getcaddy.com
-if ! iocage exec "${JAIL_NAME}" bash -s personal "${DL_FLAGS}" < /tmp/getcaddy.com
-then
-	echo "Failed to download/install Caddy"
-	exit 1
-fi
-
-iocage exec "${JAIL_NAME}" sysrc mysql_enable="YES"
-
-# Copy and edit pre-written config files
-echo "Copying Caddyfile for no SSL"
-iocage exec "${JAIL_NAME}" cp -f /mnt/includes/caddy /usr/local/etc/rc.d/
-iocage exec "${JAIL_NAME}" cp -f /mnt/includes/Caddyfile /usr/local/www/Caddyfile
-# shellcheck disable=SC2154
-iocage exec "${JAIL_NAME}" sed -i '' "s/yourhostnamehere/${mariadb_host_name}/" /usr/local/www/Caddyfile
-iocage exec "${JAIL_NAME}" sed -i '' "s/JAIL-IP/${JAIL_IP}/" /usr/local/www/Caddyfile
-
-iocage exec "${JAIL_NAME}" sysrc caddy_enable="YES"
-iocage exec "${JAIL_NAME}" sysrc php_fpm_enable="YES"
-iocage exec "${JAIL_NAME}" sysrc caddy_cert_email="${CERT_EMAIL}"
-iocage exec "${JAIL_NAME}" sysrc caddy_env="${DNS_ENV}"
-
-iocage restart "${JAIL_NAME}"
-sleep 10
-
-if [ "${REINSTALL}" == "true" ]; then
-	echo "Reinstall detected, skipping generaion of new config and database"
-else
-	
-	# Secure database, set root password, create Nextcloud DB, user, and password
-	iocage exec "${JAIL_NAME}" cp -f /mnt/includes/my-system.cnf /var/db/mysql/my.cnf
-	iocage exec "${JAIL_NAME}" mysql -u root -e "DELETE FROM mysql.user WHERE User='';"
-	iocage exec "${JAIL_NAME}" mysql -u root -e "DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1');"
-	iocage exec "${JAIL_NAME}" mysql -u root -e "DROP DATABASE IF EXISTS test;"
-	iocage exec "${JAIL_NAME}" mysql -u root -e "DELETE FROM mysql.db WHERE Db='test' OR Db='test\\_%';"
-	iocage exec "${JAIL_NAME}" mysql -u root -e "UPDATE mysql.user SET Password=PASSWORD('${DB_ROOT_PASSWORD}') WHERE User='root';"
-	iocage exec "${JAIL_NAME}" mysqladmin reload
-fi
-iocage exec "${JAIL_NAME}" cp -f /mnt/includes/my.cnf /root/.my.cnf
-iocage exec "${JAIL_NAME}" sed -i '' "s|mypassword|${DB_ROOT_PASSWORD}|" /root/.my.cnf
-
-# Save passwords for later reference
-iocage exec "${JAIL_NAME}" echo "${DB_NAME} root password is ${DB_ROOT_PASSWORD}" > /root/${JAIL_NAME}_db_password.txt
-	
-
-# Don't need /mnt/includes any more, so unmount it
-iocage fstab -r "${JAIL_NAME}" "${INCLUDES_PATH}" /mnt/includes nullfs rw 0 0
-
-# Done!
-echo "Installation complete!"
-echo "Using your web browser, go to http://${mariadb_host_name} to log in"
-
-if [ "${REINSTALL}" == "true" ]; then
-	echo "You did a reinstall, please use your old database and account credentials"
-else
-	echo "Database Information"
-	echo "--------------------"
-	echo "The ${DB_NAME} root password is ${DB_ROOT_PASSWORD}"
-	fi
-echo ""
-echo "All passwords are saved in /root/${JAIL_NAME}_db_password.txt"
diff --git a/jails/mariadb/update.sh b/jails/mariadb/update.sh
deleted file mode 100755
index c3d8ad2f..00000000
--- a/jails/mariadb/update.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/local/bin/bash
-# This file contains the update script for mariadb
-
-JAIL_NAME="mariadb"
-# shellcheck disable=SC2154
-JAIL_IP="${mariadb_ip4_addr%/*}"
-INCLUDES_PATH="${SCRIPT_DIR}/jails/mariadb/includes"
-
-# Install includes fstab
-iocage exec "${JAIL_NAME}" mkdir -p /mnt/includes
-iocage fstab -a "${JAIL_NAME}" "${INCLUDES_PATH}" /mnt/includes nullfs rw 0 0
-
-
-iocage exec ${JAIL_NAME} service caddy stop
-iocage exec ${JAIL_NAME} service php-fpm stop
-
-fetch -o /tmp https://getcaddy.com
-if ! iocage exec "${JAIL_NAME}" bash -s personal "${DL_FLAGS}" < /tmp/getcaddy.com
-then
-	echo "Failed to download/install Caddy"
-	exit 1
-fi
-
-# Copy and edit pre-written config files
-echo "Copying Caddyfile for no SSL"
-iocage exec "${JAIL_NAME}" cp -f /mnt/includes/caddy /usr/local/etc/rc.d/
-iocage exec "${JAIL_NAME}" cp -f /mnt/includes/Caddyfile /usr/local/www/Caddyfile
-# shellcheck disable=SC2154
-iocage exec "${JAIL_NAME}" sed -i '' "s/yourhostnamehere/${mariadb_host_name}/" /usr/local/www/Caddyfile
-iocage exec "${JAIL_NAME}" sed -i '' "s/JAIL-IP/${JAIL_IP}/" /usr/local/www/Caddyfile
-
-# Don't need /mnt/includes any more, so unmount it
-iocage fstab -r "${JAIL_NAME}" "${INCLUDES_PATH}" /mnt/includes nullfs rw 0 0
-
-iocage exec ${JAIL_NAME} service caddy start
-iocage exec ${JAIL_NAME} service php-fpm start
\ No newline at end of file
diff --git a/jails/nextcloud/config.yml b/jails/nextcloud/config.yml
deleted file mode 100644
index dfe6c31d..00000000
--- a/jails/nextcloud/config.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-nextcloud: nextcloud
-  pkgs:   nano sudo redis php73-ctype gnupg php73-dom php73-gd php73-iconv php73-json php73-mbstring php73-posix php73-simplexml php73-xmlreader php73-xmlwriter php73-zip php73-zlib php73-hash php73-xml php73 php73-pecl-redis php73-session php73-wddx php73-xsl php73-filter php73-pecl-APCu php73-curl php73-fileinfo php73-bz2 php73-intl php73-openssl php73-ldap php73-ftp php73-imap php73-exif php73-gmp php73-pecl-memcache php73-pecl-imagick php73-pecl-smbclient perl5 p5-Locale-gettext help2man texinfo m4 autoconf
\ No newline at end of file
diff --git a/jails/nextcloud/install.sh b/jails/nextcloud/install.sh
deleted file mode 100755
index a519faea..00000000
--- a/jails/nextcloud/install.sh
+++ /dev/null
@@ -1,362 +0,0 @@
-#!/usr/local/bin/bash
-# This script installs the current release of Nextcloud into a create jail
-# Based on the example by danb35: https://github.com/danb35/freenas-iocage-nextcloud
-
-
-# Initialise defaults
-JAIL_NAME="nextcloud"
-# shellcheck disable=SC2154
-JAIL_IP="${nextcloud_ip4_addr%/*}"
-# shellcheck disable=SC2154
-DATABASE="$nextcloud_database"
-INCLUDES_PATH="${SCRIPT_DIR}/jails/nextcloud/includes"
-# shellcheck disable=SC2154
-STANDALONE_CERT=${nextcloud_standalone_cert}
-# shellcheck disable=SC2154
-SELFSIGNED_CERT=${nextcloud_selfsigned_cert}
-# shellcheck disable=SC2154
-DNS_CERT=${nextcloud_dns_cert}
-# shellcheck disable=SC2154
-NO_CERT=${nextcloud_no_cert}
-# shellcheck disable=SC2154
-DL_FLAGS=${nextcloud_dl_flags}
-# shellcheck disable=SC2154
-DNS_SETTING=${nextcloud_dns_settings}
-# shellcheck disable=SC2154
-CERT_EMAIL=${nextcloud_cert_email}
-# shellcheck disable=SC2154
-HOST_NAME=${nextcloud_host_name}
-
-# Only generate new DB passwords when using buildin database
-# Set DB username and database to fixed "nextcloud"
-
-if [ "${DATABASE}" = "pgsql-external" ]; then
-  DB_NAME="PostgreSQL"
-  # shellcheck disable=SC2154
-  DB_HOST="${nextcloud_db_host}"
-  # shellcheck disable=SC2154
-  DB_DATABASE="${nextcloud_db_database}"
-  # shellcheck disable=SC2154
-  DB_USER="${nextcloud_db_user}"
-  # shellcheck disable=SC2154
-  DB_PASSWORD="${nextcloud_db_password}"
-elif [ "${DATABASE}" = "mariadb-external" ]; then
-  DB_NAME="MariaDB"
-  DB_HOST="${nextcloud_db_host}"
-  DB_DATABASE="${nextcloud_db_database}"
-  DB_USER="${nextcloud_db_user}"
-  DB_PASSWORD="${nextcloud_db_password}"
-elif [ "${DATABASE}" = "mariadb-jail" ]; then
-  DB_DATABASE="nextcloud"
-  DB_USER="nextcloud"
-  # shellcheck disable=SC2154
-  DB_HOST="${mariadb_ip4_addr%/*}:3306"
-  DB_PASSWORD="${nextcloud_db_password}"
-else
-  echo "Invalid ${JAIL_NAME}_database selected please select one from the following options:"
-  echo "mariadb-jail, mariadb-external, pgsql-external"
-  exit 1
-fi
-
-
-ADMIN_PASSWORD=$(openssl rand -base64 12)
-
-#####
-# 
-# Input Sanity Check 
-#
-#####
-
-
-# Check that necessary variables were set by nextcloud-config
-if [ -z "${nextcloud_ip4_addr}" ]; then
-  echo 'Configuration error: The Nextcloud jail does NOT accept DHCP'
-  echo 'Please reinstall using a fixed IP adress'
-  exit 1
-fi
-
-if [ -z "${DB_PASSWORD}" ]; then
-  echo 'Configuration error: The Nextcloud Jail needs a database password'
-  echo 'Please reinstall with a defifined: db_password'
-  exit 1
-fi
-
-if [ -z "${DB_USER}" ]; then
-  echo 'Configuration error: The Nextcloud Jail needs a database user'
-  echo 'Please reinstall with a defifined: db_user'
-  exit 1
-fi
-
-if [ -z "${DB_HOST}" ]; then
-	echo 'Configuration error: The Nextcloud Jail needs a database host'
-  echo 'Please reinstall with a defifined: db_host'
-  exit 1
-fi
-
-if [ -z "${DB_DATABASE}" ]; then
-	echo 'Configuration error: The Nextcloud Jail needs a database name'
-  echo 'Please reinstall with a defifined: db_database'
-  exit 1
-fi
-
-# shellcheck disable=SC2154
-if [ -z "${nextcloud_time_zone}" ]; then
-  echo 'Configuration error: TIME_ZONE must be set'
-  exit 1
-fi
-if [ -z "${HOST_NAME}" ]; then
-  echo 'Configuration error: HOST_NAME must be set'
-  exit 1
-fi
-if [ "$STANDALONE_CERT" -eq 0 ] && [ "$DNS_CERT" -eq 0 ] && [ "$NO_CERT" -eq 0 ] && [ "$SELFSIGNED_CERT" -eq 0 ]; then
-  echo 'Configuration error: Either STANDALONE_CERT, DNS_CERT, NO_CERT,'
-  echo 'or SELFSIGNED_CERT must be set to 1.'
-  exit 1
-fi
-if [ "$STANDALONE_CERT" -eq 1 ] && [ "$DNS_CERT" -eq 1 ] ; then
-  echo 'Configuration error: Only one of STANDALONE_CERT and DNS_CERT'
-  echo 'may be set to 1.'
-  exit 1
-fi
-
-if [ "$DNS_CERT" -eq 1 ] && [ -z "${DNS_PLUGIN}" ] ; then
-  echo "DNS_PLUGIN must be set to a supported DNS provider."
-  echo "See https://caddyserver.com/docs under the heading of \"DNS Providers\" for list."
-  echo "Be sure to omit the prefix of \"tls.dns.\"."
-  exit 1
-fi  
-if [ "$DNS_CERT" -eq 1 ] && [ -z "${DNS_ENV}" ] ; then
-  echo "DNS_ENV must be set to a your DNS provider\'s authentication credentials."
-  echo "See https://caddyserver.com/docs under the heading of \"DNS Providers\" for more."
-  exit 1
-fi  
-
-if [ "$DNS_CERT" -eq 1 ] ; then
-  DL_FLAGS="tls.dns.${DNS_PLUGIN}"
-  DNS_SETTING="dns ${DNS_PLUGIN}"
-fi
-
-# Make sure DB_PATH is empty -- if not, MariaDB/PostgreSQL will choke
-# shellcheck disable=SC2154
-if [ "$(ls -A "/mnt/${global_dataset_config}/${JAIL_NAME}/config")" ]; then
-	echo "Reinstall of Nextcloud detected... "
-	echo "External database selected, unable to verify compatibility. REINSTALL MIGHT NOT WORK... Continuing"
-	REINSTALL="true"
-fi
-
-
-#####
-	# 
-# Fstab And Mounts
-#
-#####
-
-# Create and Mount Nextcloud, Config and Files
-createmount ${JAIL_NAME} "${global_dataset_config}"/${JAIL_NAME}/config /usr/local/www/nextcloud/config
-createmount ${JAIL_NAME} "${global_dataset_config}"/${JAIL_NAME}/themes /usr/local/www/nextcloud/themes
-createmount ${JAIL_NAME} "${global_dataset_config}"/${JAIL_NAME}/files /config/files
-
-# Install includes fstab
-iocage exec "${JAIL_NAME}" mkdir -p /mnt/includes
-iocage fstab -a "${JAIL_NAME}" "${INCLUDES_PATH}" /mnt/includes nullfs rw 0 0
-
-
-iocage exec "${JAIL_NAME}" chown -R www:www /config/files
-iocage exec "${JAIL_NAME}" chmod -R 770 /config/files
-
-
-#####
-# 
-# Basic dependency install
-#
-#####
-
-if [ "${DATABASE}" = "mariadb-external" ] || [ "${DATABASE}" = "mariadb-jail" ]; then
-  iocage exec "${JAIL_NAME}" pkg install -qy mariadb103-client php73-pdo_mysql php73-mysqli
-elif [ "${DATABASE}" = "pgsql-external" ]; then
-  iocage exec "${JAIL_NAME}" pkg install -qy postgresql10-client php73-pgsql php73-pdo_pgsql
-fi
-
-fetch -o /tmp https://getcaddy.com
-if ! iocage exec "${JAIL_NAME}" bash -s personal "${DL_FLAGS}" < /tmp/getcaddy.com
-then
-	echo "Failed to download/install Caddy"
-	exit 1
-fi
-
-iocage exec "${JAIL_NAME}" sysrc redis_enable="YES"
-iocage exec "${JAIL_NAME}" sysrc php_fpm_enable="YES"
-iocage exec "${JAIL_NAME}" sh -c "make -C /usr/ports/www/php73-opcache clean install BATCH=yes"
-iocage exec "${JAIL_NAME}" sh -c "make -C /usr/ports/devel/php73-pcntl clean install BATCH=yes"
-
-
-#####
-# 
-# Install Nextcloud
-#
-#####
-
-FILE="latest-18.tar.bz2"
-if ! iocage exec "${JAIL_NAME}" fetch -o /tmp https://download.nextcloud.com/server/releases/"${FILE}" https://download.nextcloud.com/server/releases/"${FILE}".asc https://nextcloud.com/nextcloud.asc
-then
-	echo "Failed to download Nextcloud"
-	exit 1
-fi
-iocage exec "${JAIL_NAME}" gpg --import /tmp/nextcloud.asc
-if ! iocage exec "${JAIL_NAME}" gpg --verify /tmp/"${FILE}".asc
-then
-	echo "GPG Signature Verification Failed!"
-	echo "The Nextcloud download is corrupt."
-	exit 1
-fi
-iocage exec "${JAIL_NAME}" tar xjf /tmp/"${FILE}" -C /usr/local/www/
-iocage exec "${JAIL_NAME}" chown -R www:www /usr/local/www/nextcloud/
-
-
-# Generate and install self-signed cert, if necessary
-if [ "$SELFSIGNED_CERT" -eq 1 ] && [ ! -f "/mnt/${global_dataset_config}/${JAIL_NAME}/ssl/privkey.pem" ]; then
-	echo "No ssl certificate present, generating self signed certificate"
-	if [ ! -d "/mnt/${global_dataset_config}/${JAIL_NAME}/ssl" ]; then
-		echo "cert folder not existing... creating..."
-		iocage exec ${JAIL_NAME} mkdir /config/ssl
-	fi
-	openssl req -new -newkey rsa:4096 -days 3650 -nodes -x509 -subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=${HOST_NAME}" -keyout "${INCLUDES_PATH}"/privkey.pem -out "${INCLUDES_PATH}"/fullchain.pem
-	iocage exec "${JAIL_NAME}" cp /mnt/includes/privkey.pem /config/ssl/privkey.pem
-	iocage exec "${JAIL_NAME}" cp /mnt/includes/fullchain.pem /config/ssl/fullchain.pem
-fi
-
-# Copy and edit pre-written config files
-iocage exec "${JAIL_NAME}" cp -f /mnt/includes/php.ini /usr/local/etc/php.ini
-iocage exec "${JAIL_NAME}" cp -f /mnt/includes/redis.conf /usr/local/etc/redis.conf
-iocage exec "${JAIL_NAME}" cp -f /mnt/includes/www.conf /usr/local/etc/php-fpm.d/
-if [ "$STANDALONE_CERT" -eq 1 ] || [ "$DNS_CERT" -eq 1 ]; then
-  iocage exec "${JAIL_NAME}" cp -f /mnt/includes/remove-staging.sh /root/
-fi
-if [ "$NO_CERT" -eq 1 ]; then
-  echo "Copying Caddyfile for no SSL"
-  iocage exec "${JAIL_NAME}" cp -f /mnt/includes/Caddyfile-nossl /usr/local/www/Caddyfile
-elif [ "$SELFSIGNED_CERT" -eq 1 ]; then
-  echo "Copying Caddyfile for self-signed cert"
-  iocage exec "${JAIL_NAME}" cp -f /mnt/includes/Caddyfile-selfsigned /usr/local/www/Caddyfile
-else
-  echo "Copying Caddyfile for Let's Encrypt cert"
-  iocage exec "${JAIL_NAME}" cp -f /mnt/includes/Caddyfile /usr/local/www/
-fi
-iocage exec "${JAIL_NAME}" cp -f /mnt/includes/caddy /usr/local/etc/rc.d/
-
-
-iocage exec "${JAIL_NAME}" sed -i '' "s/yourhostnamehere/${HOST_NAME}/" /usr/local/www/Caddyfile
-iocage exec "${JAIL_NAME}" sed -i '' "s/DNS-PLACEHOLDER/${DNS_SETTING}/" /usr/local/www/Caddyfile
-iocage exec "${JAIL_NAME}" sed -i '' "s/JAIL-IP/${JAIL_IP}/" /usr/local/www/Caddyfile
-iocage exec "${JAIL_NAME}" sed -i '' "s|mytimezone|${nextcloud_time_zone}|" /usr/local/etc/php.ini
-
-iocage exec "${JAIL_NAME}" sysrc caddy_enable="YES"
-iocage exec "${JAIL_NAME}" sysrc caddy_cert_email="${CERT_EMAIL}"
-iocage exec "${JAIL_NAME}" sysrc caddy_SNI_default="${HOST_NAME}"
-iocage exec "${JAIL_NAME}" sysrc caddy_env="${DNS_ENV}"
-
-iocage restart "${JAIL_NAME}"
-
-if [ "${REINSTALL}" == "true" ]; then
-	echo "Reinstall detected, skipping generaion of new config and database"
-else
-	
-	# Secure database, set root password, create Nextcloud DB, user, and password
-	if  [ "${DATABASE}" = "mariadb-jail" ]; then
-		iocage exec "mariadb" mysql -u root -e "CREATE DATABASE ${DB_DATABASE};"
-		iocage exec "mariadb" mysql -u root -e "GRANT ALL ON ${DB_DATABASE}.* TO ${DB_USER}@${JAIL_IP} IDENTIFIED BY '${DB_PASSWORD}';"
-		iocage exec "mariadb" mysqladmin reload
-	fi
-	
-	
-	# Save passwords for later reference
-	iocage exec "${JAIL_NAME}" echo "${DB_NAME} root password is ${DB_ROOT_PASSWORD}" > /root/${JAIL_NAME}_db_password.txt
-	iocage exec "${JAIL_NAME}" echo "Nextcloud database password is ${DB_PASSWORD}" >> /root/${JAIL_NAME}_db_password.txt
-	iocage exec "${JAIL_NAME}" echo "Nextcloud Administrator password is ${ADMIN_PASSWORD}" >> /root/${JAIL_NAME}_db_password.txt
-	
-	# CLI installation and configuration of Nextcloud
-	if [ "${DATABASE}" = "mariadb-external" ] || [ "${DATABASE}" = "mariadb-jail" ]; then
-		iocage exec "${JAIL_NAME}" su -m www -c "php /usr/local/www/nextcloud/occ maintenance:install --database=\"mysql\" --database-name=\"${DB_DATABASE}\" --database-user=\"${DB_USER}\" --database-pass=\"${DB_PASSWORD}\" --database-host=\"${DB_HOST}\" --admin-user=\"admin\" --admin-pass=\"${ADMIN_PASSWORD}\" --data-dir=\"/config/files\""
-		iocage exec "${JAIL_NAME}" su -m www -c "php /usr/local/www/nextcloud/occ config:system:set mysql.utf8mb4 --type boolean --value=\"true\""
-	elif [ "${DATABASE}" = "pgsql-external" ]; then
-		iocage exec "${JAIL_NAME}" su -m www -c "php /usr/local/www/nextcloud/occ maintenance:install --database=\"pgsql\" --database-name=\"${DB_DATABASE}\" --database-user=\"${DB_USER}\" --database-pass=\"${DB_PASSWORD}\" --database-host=\"${DB_HOST}\" --admin-user=\"admin\" --admin-pass=\"${ADMIN_PASSWORD}\" --data-dir=\"/config/files\""
-	fi
-	iocage exec "${JAIL_NAME}" su -m www -c "php /usr/local/www/nextcloud/occ db:add-missing-indices"
-	iocage exec "${JAIL_NAME}" su -m www -c "php /usr/local/www/nextcloud/occ db:convert-filecache-bigint --no-interaction"
-	iocage exec "${JAIL_NAME}" su -m www -c "php /usr/local/www/nextcloud/occ config:system:set logtimezone --value=\"${nextcloud_time_zone}\""
-	iocage exec "${JAIL_NAME}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set log_type --value="file"'
-	iocage exec "${JAIL_NAME}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set logfile --value="/var/log/nextcloud.log"'
-	iocage exec "${JAIL_NAME}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set loglevel --value="2"'
-	iocage exec "${JAIL_NAME}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set logrotate_size --value="104847600"'
-	iocage exec "${JAIL_NAME}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set memcache.local --value="\OC\Memcache\APCu"'
-	iocage exec "${JAIL_NAME}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set redis host --value="/tmp/redis.sock"'
-	iocage exec "${JAIL_NAME}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set redis port --value=0 --type=integer'
-	iocage exec "${JAIL_NAME}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set memcache.locking --value="\OC\Memcache\Redis"'
-	iocage exec "${JAIL_NAME}" su -m www -c "php /usr/local/www/nextcloud/occ config:system:set overwritehost --value=\"${HOST_NAME}\""
-	iocage exec "${JAIL_NAME}" su -m www -c "php /usr/local/www/nextcloud/occ config:system:set overwriteprotocol --value=\"https\""
-	if [ "$NO_CERT" -eq 1 ]; then
-		iocage exec "${JAIL_NAME}" su -m www -c "php /usr/local/www/nextcloud/occ config:system:set overwrite.cli.url --value=\"http://${HOST_NAME}/\""
-	else
-		iocage exec "${JAIL_NAME}" su -m www -c "php /usr/local/www/nextcloud/occ config:system:set overwrite.cli.url --value=\"https://${HOST_NAME}/\""
-	fi
-	iocage exec "${JAIL_NAME}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set htaccess.RewriteBase --value="/"'
-	iocage exec "${JAIL_NAME}" su -m www -c 'php /usr/local/www/nextcloud/occ maintenance:update:htaccess'
-	iocage exec "${JAIL_NAME}" su -m www -c "php /usr/local/www/nextcloud/occ config:system:set trusted_domains 1 --value=\"${HOST_NAME}\""
-	iocage exec "${JAIL_NAME}" su -m www -c "php /usr/local/www/nextcloud/occ config:system:set trusted_domains 2 --value=\"${JAIL_IP}\""
-	iocage exec "${JAIL_NAME}" su -m www -c 'php /usr/local/www/nextcloud/occ app:enable encryption'
-	iocage exec "${JAIL_NAME}" su -m www -c 'php /usr/local/www/nextcloud/occ encryption:enable'
-	iocage exec "${JAIL_NAME}" su -m www -c 'php /usr/local/www/nextcloud/occ encryption:disable'
-	iocage exec "${JAIL_NAME}" su -m www -c 'php /usr/local/www/nextcloud/occ background:cron'
-	
-fi
-
-iocage exec "${JAIL_NAME}" touch /var/log/nextcloud.log
-iocage exec "${JAIL_NAME}" chown www /var/log/nextcloud.log
-iocage exec "${JAIL_NAME}" su -m www -c 'php -f /usr/local/www/nextcloud/cron.php'
-iocage exec "${JAIL_NAME}" crontab -u www /mnt/includes/www-crontab
-
-# Don't need /mnt/includes any more, so unmount it
-iocage fstab -r "${JAIL_NAME}" "${INCLUDES_PATH}" /mnt/includes nullfs rw 0 0
-
-# Done!
-echo "Installation complete!"
-if [ "$NO_CERT" -eq 1 ]; then
-  echo "Using your web browser, go to http://${HOST_NAME} to log in"
-else
-  echo "Using your web browser, go to https://${HOST_NAME} to log in"
-fi
-
-if [ "${REINSTALL}" == "true" ]; then
-	echo "You did a reinstall, please use your old database and account credentials"
-else
-
-	echo "Default user is admin, password is ${ADMIN_PASSWORD}"
-	echo ""
-
-	echo "Database Information"
-	echo "--------------------"
-	echo "Database user = ${DB_USER}"
-	echo "Database password = ${DB_PASSWORD}"
-	echo ""
-	echo "All passwords are saved in /root/${JAIL_NAME}_db_password.txt"
-fi
-
-echo ""
-if [ "$STANDALONE_CERT" -eq 1 ] || [ "$DNS_CERT" -eq 1 ]; then
-  echo "You have obtained your Let's Encrypt certificate using the staging server."
-  echo "This certificate will not be trusted by your browser and will cause SSL errors"
-  echo "when you connect.  Once you've verified that everything else is working"
-  echo "correctly, you should issue a trusted certificate.  To do this, run:"
-  echo "  iocage exec ${JAIL_NAME} /root/remove-staging.sh"
-  echo ""
-elif [ "$SELFSIGNED_CERT" -eq 1 ]; then
-  echo "You have chosen to create a self-signed TLS certificate for your Nextcloud"
-  echo "installation.  This certificate will not be trusted by your browser and"
-  echo "will cause SSL errors when you connect.  If you wish to replace this certificate"
-  echo "with one obtained elsewhere, the private key is located at:"
-  echo "/config/ssl/privkey.pem"
-  echo "The full chain (server + intermediate certificates together) is at:"
-  echo "/config/ssl/fullchain.pem"
-  echo ""
-fi
-
diff --git a/jails/organizr/config.yml b/jails/organizr/config.yml
deleted file mode 100644
index 887c1645..00000000
--- a/jails/organizr/config.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-organizr: organizr
-  pkgs: nginx php72 php72-filter php72-curl php72-hash php72-json php72-openssl php72-pdo php72-pdo_sqlite php72-session php72-simplexml php72-sqlite3 php72-zip git
\ No newline at end of file
diff --git a/jails/organizr/install.sh b/jails/organizr/install.sh
deleted file mode 100755
index 951ff0d8..00000000
--- a/jails/organizr/install.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/local/bin/bash
-# This file contains the install script for Organizr
-
-iocage exec organizr sed -i '' -e 's?listen = 127.0.0.1:9000?listen = /var/run/php-fpm.sock?g' /usr/local/etc/php-fpm.d/www.conf
-iocage exec organizr sed -i '' -e 's/;listen.owner = www/listen.owner = www/g' /usr/local/etc/php-fpm.d/www.conf
-iocage exec organizr sed -i '' -e 's/;listen.group = www/listen.group = www/g' /usr/local/etc/php-fpm.d/www.conf
-iocage exec organizr sed -i '' -e 's/;listen.mode = 0660/listen.mode = 0600/g' /usr/local/etc/php-fpm.d/www.conf
-iocage exec organizr cp /usr/local/etc/php.ini-production /usr/local/etc/php.ini
-iocage exec organizr sed -i '' -e 's?;date.timezone =?date.timezone = "Universal"?g' /usr/local/etc/php.ini
-iocage exec organizr sed -i '' -e 's?;cgi.fix_pathinfo=1?cgi.fix_pathinfo=0?g' /usr/local/etc/php.ini
-# shellcheck disable=SC2154
-mv /mnt/"${global_dataset_iocage}"/jails/organizr/root/usr/local/etc/nginx/nginx.conf /mnt/"${global_dataset_iocage}"/jails/organizr/root/usr/local/etc/nginx/nginx.conf.bak
-cp "${SCRIPT_DIR}"/jails/organizr/includes/nginx.conf /mnt/"${global_dataset_iocage}"/jails/organizr/root/usr/local/etc/nginx/nginx.conf
-cp -Rf "${SCRIPT_DIR}"/jails/organizr/includes/custom /mnt/"${global_dataset_iocage}"/jails/organizr/root/usr/local/etc/nginx/custom
-# shellcheck disable=SC2154
-if [ ! -d "/mnt/${global_dataset_config}/organizr/ssl" ]; then
-	echo "cert folder doesn't exist... creating..."
-	iocage exec organizr mkdir /config/ssl
-fi
-
-if [ -f "/mnt/${global_dataset_config}/organizr/ssl/Organizr-Cert.crt" ]; then
-    echo "certificate exists... Skipping cert generation"
-else
-	echo "No ssl certificate present, generating self signed certificate"
-	openssl req -new -newkey rsa:2048 -days 365 -nodes -x509 -subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=localhost" -keyout /mnt/"${global_dataset_config}"/organizr/ssl/Organizr-Cert.key -out /mnt/"${global_dataset_config}"/organizr/ssl/Organizr-Cert.crt
-fi
-
-iocage exec organizr git clone https://github.com/causefx/Organizr.git /usr/local/www/Organizr
-iocage exec organizr chown -R www:www /usr/local/www /config /usr/local/etc/nginx/nginx.conf /usr/local/etc/nginx/custom
-iocage exec organizr ln -s /config/config.php /usr/local/www/Organizr/api/config/config.php
-iocage exec organizr sysrc nginx_enable=YES
-iocage exec organizr sysrc php_fpm_enable=YES
-iocage exec organizr service nginx start
-iocage exec organizr service php-fpm start
diff --git a/jails/organizr/update.sh b/jails/organizr/update.sh
deleted file mode 100755
index b24f1154..00000000
--- a/jails/organizr/update.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/local/bin/bash
-# This file contains the update script for Organizr
-
-iocage exec organizr service nginx stop
-iocage exec organizr service php-fpm stop
-# TODO setup cli update for Organizr here.
-# shellcheck disable=SC2154
-cp "${SCRIPT_DIR}"/jails/organizr/includes/nginx.conf /mnt/"${global_dataset_iocage}"/jails/organizr/root/usr/local/etc/nginx/nginx.conf
-iocage exec organizr "cd /usr/local/www/Organizr && git pull"
-iocage exec organizr chown -R www:www /usr/local/www /config /usr/local/etc/nginx/nginx.conf /usr/local/etc/nginx/custom
-iocage exec organizr service nginx start
-iocage exec organizr service php-fpm start
\ No newline at end of file
diff --git a/jails/plex/config.yml b/jails/plex/config.yml
deleted file mode 100644
index 8206391a..00000000
--- a/jails/plex/config.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-plex: plex
-  pkgs: plexmediaserver
\ No newline at end of file
diff --git a/jails/plex/install.sh b/jails/plex/install.sh
deleted file mode 100755
index cdeb3803..00000000
--- a/jails/plex/install.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/local/bin/bash
-# This file contains the install script for plex
-
-iocage exec plex mkdir -p /usr/local/etc/pkg/repos
-
-
-# Change to to more frequent FreeBSD repo to stay up-to-date with plex more.
-# shellcheck disable=SC2154
-cp "${SCRIPT_DIR}"/jails/plex/includes/FreeBSD.conf /mnt/"${global_dataset_iocage}"/jails/plex/root/usr/local/etc/pkg/repos/FreeBSD.conf
-
-
-# Check if datasets for media librarys exist, create them if they do not.
-# shellcheck disable=SC2154
-createmount plex "${global_dataset_media}" /mnt/media
-createmount plex "${global_dataset_media}"/movies /mnt/media/movies
-createmount plex "${global_dataset_media}"/music /mnt/media/music
-createmount plex "${global_dataset_media}"/shows /mnt/media/shows
-
-# Create plex ramdisk if specified
-# shellcheck disable=SC2154
-if [ -z "${plex_ramdisk}" ]; then
-	echo "no ramdisk specified for plex, continuing without randisk"
-else
-	iocage fstab -a plex tmpfs /tmp_transcode tmpfs rw,size="${plex_ramdisk}",mode=1777 0 0
-fi
-
-iocage exec plex chown -R plex:plex /config
-
-# Force update pkg to get latest plex version
-iocage exec plex pkg update
-iocage exec plex pkg upgrade -y
-
-# Add plex user to video group for future hw-encoding support
-iocage exec plex pw groupmod -n video -m plex
-
-# Run different install procedures depending on Plex vs Plex Beta
-# shellcheck disable=SC2154
-if [ "$plex_beta" == "true" ]; then
-	echo "beta enabled in config.yml... using plex beta for install"
-	iocage exec plex sysrc "plexmediaserver_plexpass_enable=YES"
-	iocage exec plex sysrc plexmediaserver_plexpass_support_path="/config"
-	iocage exec plex chown -R plex:plex /usr/local/share/plexmediaserver-plexpass/
-	iocage exec plex service plexmediaserver_plexpass restart
-else
-	echo "beta disabled in config.yml... NOT using plex beta for install"
-	iocage exec plex sysrc "plexmediaserver_enable=YES"
-	iocage exec plex sysrc plexmediaserver_support_path="/config"
-	iocage exec plex chown -R plex:plex /usr/local/share/plexmediaserver/
-	iocage exec plex service plexmediaserver restart
-fi
-
-echo "Finished installing plex"
\ No newline at end of file
diff --git a/jails/radarr/config.yml b/jails/radarr/config.yml
deleted file mode 100644
index 789ec723..00000000
--- a/jails/radarr/config.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-radarr: radarr
-  pkgs: mono mediainfo sqlite3 libgdiplus
\ No newline at end of file
diff --git a/jails/radarr/install.sh b/jails/radarr/install.sh
deleted file mode 100755
index d8305480..00000000
--- a/jails/radarr/install.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/local/bin/bash
-# This file contains the install script for radarr
-
-# Check if dataset for completed download and it parent dataset exist, create if they do not.
-# shellcheck disable=SC2154
-createmount radarr "${global_dataset_downloads}"
-createmount radarr "${global_dataset_downloads}"/complete /mnt/fetched
-
-# Check if dataset for media library and the dataset for movies exist, create if they do not.
-# shellcheck disable=SC2154
-createmount radarr "${global_dataset_media}"
-createmount radarr "${global_dataset_media}"/movies /mnt/movies
-
-iocage exec radarr "fetch https://github.com/Radarr/Radarr/releases/download/v0.2.0.1480/Radarr.develop.0.2.0.1480.linux.tar.gz -o /usr/local/share"
-iocage exec radarr "tar -xzvf /usr/local/share/Radarr.develop.0.2.0.1480.linux.tar.gz -C /usr/local/share"
-iocage exec radarr rm /usr/local/share/Radarr.develop.0.2.0.1480.linux.tar.gz
-iocage exec radarr "pw user add radarr -c radarr -u 352 -d /nonexistent -s /usr/bin/nologin"
-iocage exec radarr chown -R radarr:radarr /usr/local/share/Radarr /config
-iocage exec radarr mkdir /usr/local/etc/rc.d
-# shellcheck disable=SC2154
-cp "${SCRIPT_DIR}"/jails/radarr/includes/radarr.rc /mnt/"${global_dataset_iocage}"/jails/radarr/root/usr/local/etc/rc.d/radarr
-iocage exec radarr chmod u+x /usr/local/etc/rc.d/radarr
-iocage exec radarr sysrc "radarr_enable=YES"
-iocage exec radarr service radarr restart
diff --git a/jails/radarr/update.sh b/jails/radarr/update.sh
deleted file mode 100755
index b527d0ce..00000000
--- a/jails/radarr/update.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/local/bin/bash
-# This file contains the update script for radarr
-
-iocage exec radarr service radarr stop
-#TODO insert code to update radarr itself here
-iocage exec radarr chown -R radarr:radarr /usr/local/share/Radarr /config
-# shellcheck disable=SC2154
-cp "${SCRIPT_DIR}"/jails/radarr/includes/radarr.rc /mnt/"${global_dataset_iocage}"/jails/radarr/root/usr/local/etc/rc.d/radarr
-iocage exec radarr chmod u+x /usr/local/etc/rc.d/radarr
-iocage exec radarr service radarr restart
\ No newline at end of file
diff --git a/jails/sonarr/config.yml b/jails/sonarr/config.yml
deleted file mode 100644
index 1197e640..00000000
--- a/jails/sonarr/config.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-sonarr: sonarr
-  pkgs: mono mediainfo sqlite3
\ No newline at end of file
diff --git a/jails/sonarr/install.sh b/jails/sonarr/install.sh
deleted file mode 100755
index b63614b9..00000000
--- a/jails/sonarr/install.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/local/bin/bash
-# This file contains the install script for sonarr
-
-# Check if dataset for completed download and it parent dataset exist, create if they do not.
-# shellcheck disable=SC2154
-createmount sonarr "${global_dataset_downloads}"
-createmount sonarr "${global_dataset_downloads}"/complete /mnt/fetched
-
-# Check if dataset for media library and the dataset for tv shows exist, create if they do not.
-# shellcheck disable=SC2154
-createmount sonarr "${global_dataset_media}"
-createmount sonarr "${global_dataset_media}"/shows /mnt/shows
-
-iocage exec sonarr "fetch http://download.sonarr.tv/v2/master/mono/NzbDrone.master.tar.gz -o /usr/local/share"
-iocage exec sonarr "tar -xzvf /usr/local/share/NzbDrone.master.tar.gz -C /usr/local/share"
-iocage exec sonarr rm /usr/local/share/NzbDrone.master.tar.gz
-iocage exec sonarr "pw user add sonarr -c sonarr -u 351 -d /nonexistent -s /usr/bin/nologin"
-iocage exec sonarr chown -R sonarr:sonarr /usr/local/share/NzbDrone /config
-iocage exec sonarr mkdir /usr/local/etc/rc.d
-# shellcheck disable=SC2154
-cp "${SCRIPT_DIR}"/jails/sonarr/includes/sonarr.rc /mnt/"${global_dataset_iocage}"/jails/sonarr/root/usr/local/etc/rc.d/sonarr
-iocage exec sonarr chmod u+x /usr/local/etc/rc.d/sonarr
-iocage exec sonarr sysrc "sonarr_enable=YES"
-iocage exec sonarr service sonarr restart
diff --git a/jails/sonarr/update.sh b/jails/sonarr/update.sh
deleted file mode 100755
index 47f94384..00000000
--- a/jails/sonarr/update.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/local/bin/bash
-# This file contains the update script for sonarr
-
-iocage exec sonarr service sonarr stop
-#TODO insert code to update sonarr itself here
-iocage exec sonarr chown -R sonarr:sonarr /usr/local/share/NzbDrone /config
-# shellcheck disable=SC2154
-cp "${SCRIPT_DIR}"/jails/sonarr/includes/sonarr.rc /mnt/"${global_dataset_iocage}"/jails/sonarr/root/usr/local/etc/rc.d/sonarr
-iocage exec sonarr chmod u+x /usr/local/etc/rc.d/sonarr
-iocage exec sonarr service sonarr restart
\ No newline at end of file
diff --git a/jails/tautulli/config.yml b/jails/tautulli/config.yml
deleted file mode 100644
index 34256990..00000000
--- a/jails/tautulli/config.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-tautulli: tautulli
-  pkgs: python2 py27-sqlite3 py27-openssl git
\ No newline at end of file
diff --git a/jails/tautulli/install.sh b/jails/tautulli/install.sh
deleted file mode 100755
index eee596bb..00000000
--- a/jails/tautulli/install.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/local/bin/bash
-# This file contains the install script for Tautulli
-
-
-iocage exec tautulli git clone https://github.com/Tautulli/Tautulli.git /usr/local/share/Tautulli
-iocage exec tautulli "pw user add tautulli -c tautulli -u 109 -d /nonexistent -s /usr/bin/nologin"
-iocage exec tautulli chown -R tautulli:tautulli /usr/local/share/Tautulli /config
-iocage exec tautulli cp /usr/local/share/Tautulli/init-scripts/init.freenas /usr/local/etc/rc.d/tautulli
-iocage exec tautulli chmod u+x /usr/local/etc/rc.d/tautulli
-iocage exec tautulli sysrc "tautulli_enable=YES"
-iocage exec tautulli sysrc "tautulli_flags=--datadir /config"
-iocage exec tautulli service tautulli start
\ No newline at end of file
diff --git a/jails/tautulli/update.sh b/jails/tautulli/update.sh
deleted file mode 100755
index 52c00a18..00000000
--- a/jails/tautulli/update.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/local/bin/bash
-# This file contains the update script for Tautulli
-
-iocage exec tautulli service tautulli stop
-# Tautulli is updated through pkg, this is mostly just a placeholder
-iocage exec tautulli chown -R tautulli:tautulli /usr/local/share/Tautulli /config
-iocage exec tautulli cp /usr/local/share/Tautulli/init-scripts/init.freenas /usr/local/etc/rc.d/tautulli
-iocage exec tautulli chmod u+x /usr/local/etc/rc.d/tautulli
-iocage exec tautulli service tautulli restart
\ No newline at end of file
diff --git a/jails/transmission/config.yml b/jails/transmission/config.yml
deleted file mode 100644
index efec5ece..00000000
--- a/jails/transmission/config.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-transmission: transmission
-  pkgs: bash unzip unrar transmission
\ No newline at end of file
diff --git a/jails/transmission/install.sh b/jails/transmission/install.sh
deleted file mode 100755
index 43c298c5..00000000
--- a/jails/transmission/install.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/local/bin/bash
-# This file contains the install script for transmission
-
-# Check if dataset Downloads dataset exist, create if they do not.
-# shellcheck disable=SC2154
-createmount transmission "${global_dataset_downloads}" /mnt/downloads
-
-# Check if dataset Complete Downloads dataset exist, create if they do not.
-createmount transmission "${global_dataset_downloads}"/complete /mnt/downloads/complete
-
-# Check if dataset InComplete Downloads dataset exist, create if they do not.
-createmount transmission "${global_dataset_downloads}"/incomplete /mnt/downloads/incomplete
-
-
-iocage exec transmission chown -R transmission:transmission /config
-iocage exec transmission sysrc "transmission_enable=YES"
-iocage exec transmission sysrc "transmission_conf_dir=/config"
-iocage exec transmission sysrc "transmission_download_dir=/mnt/downloads/complete"
-iocage exec transmission service transmission restart
\ No newline at end of file
diff --git a/jails/transmission/update.sh b/jails/transmission/update.sh
deleted file mode 100755
index a0c0e40b..00000000
--- a/jails/transmission/update.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/local/bin/bash
-# This file contains the update script for transmission
-
-iocage exec transmission service transmission stop
-# Transmision is updated during PKG update, this file is mostly just a placeholder
-iocage exec transmission chown -R transmission:transmission /config
-iocage exec transmission service transmission restart
\ No newline at end of file
diff --git a/jails/unifi/config.yml b/jails/unifi/config.yml
deleted file mode 100644
index 3d74c1ae..00000000
--- a/jails/unifi/config.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-unifi: unifi
-    pkgs: jq unifi5
\ No newline at end of file
diff --git a/jails/unifi/install.sh b/jails/unifi/install.sh
deleted file mode 100644
index 7d810792..00000000
--- a/jails/unifi/install.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/usr/local/bin/bash
-# This file contains the install script for unifi-controller & unifi-poller
-
-# Initialize variables
-JAIL_NAME="unifi"
-# shellcheck disable=SC2154
-JAIL_IP="${unifi_ip4_addr%/*}"
-# shellcheck disable=SC2154
-DB_IP="${influxdb_ip4_addr%/*}"
-# shellcheck disable=SC2154
-DB_JAIL="${unifi_db_jail}"
-# shellcheck disable=SC2154
-DB_NAME="${unifi_up_db_name:-unifi}"
-# shellcheck disable=SC2154
-DB_USER="${unifi_up_db_user}"
-# shellcheck disable=SC2154
-DB_PASS="${unifi_up_db_password}"
-# shellcheck disable=SC2154
-UP_USER="${unifi_up_user}"
-# shellcheck disable=SC2154
-UP_PASS="${unifi_up_password}"
-INCLUDES_PATH="${SCRIPT_DIR}/jails/unifi/includes"
-
-# Enable persistent Unifi Controller data
-iocage exec "${JAIL_NAME}" mkdir -p /config/controller/mongodb
-iocage exec "${JAIL_NAME}" cp -Rp /usr/local/share/java/unifi /config/controller
-iocage exec "${JAIL_NAME}" chown -R mongodb:mongodb /config/controller/mongodb
-# shellcheck disable=SC2154
-cp "${INCLUDES_PATH}"/mongodb.conf /mnt/"${global_dataset_iocage}"/jails/"${JAIL_NAME}"/root/usr/local/etc
-# shellcheck disable=SC2154
-cp "${INCLUDES_PATH}"/rc/mongod /mnt/"${global_dataset_iocage}"/jails/"${JAIL_NAME}"/root/usr/local/etc/rc.d/
-# shellcheck disable=SC2154
-cp "${INCLUDES_PATH}"/rc/unifi /mnt/"${global_dataset_iocage}"/jails/"${JAIL_NAME}"/root/usr/local/etc/rc.d/
-iocage exec "${JAIL_NAME}" sysrc unifi_enable=YES
-iocage exec "${JAIL_NAME}" service unifi start
-
-# shellcheck disable=SC2154
-if [[ ! "${unifi_unifi_poller}" ]]; then
-  echo "Installation complete!"
-  echo "Unifi Controller is accessible at https://${JAIL_IP}:8443."
-else
-  # Check if influxdb container exists, create unifi database if it does, error if it is not.
-  echo "Checking if the database jail and database exist..."
-  if [[ -d /mnt/"${global_dataset_iocage}"/jails/"${DB_JAIL}" ]]; then
-    DB_EXISTING=$(iocage exec "${DB_JAIL}" curl -G http://localhost:8086/query --data-urlencode 'q=SHOW DATABASES' | jq '.results [] | .series [] | .values []' | grep "$DB_NAME" | sed 's/"//g' | sed 's/^ *//g')
-    if [[ "$DB_NAME" == "$DB_EXISTING" ]]; then
-      echo "${DB_JAIL} jail with database ${DB_NAME} already exists. Skipping database creation... "
-    else
-      echo "${DB_JAIL} jail exists, but database ${DB_NAME} does not. Creating database ${DB_NAME}."
-      if [[ -z "${DB_USER}" ]] || [[ -z "${DB_PASS}" ]]; then
-        echo "Database username and password not provided. Cannot create database without credentials. Exiting..."
-        exit 1
-      else
-        iocage exec "${DB_JAIL}" "curl -XPOST -u ${DB_USER}:${DB_PASS} http://localhost:8086/query --data-urlencode 'q=CREATE DATABASE ${DB_NAME}'"
-        echo "Database ${DB_NAME} created with username ${DB_USER} with password ${DB_PASS}."
-      fi
-    fi
-  else
-    echo "Influxdb jail does not exist. Unifi-Poller requires Influxdb jail. Please install the Influxdb jail."
-    exit 1
-  fi
-
-  # Download and install Unifi-Poller
-  FILE_NAME=$(curl -s https://api.github.com/repos/unifi-poller/unifi-poller/releases/latest | jq -r ".assets[] | select(.name | contains(\"amd64.txz\")) | .name")
-  DOWNLOAD=$(curl -s https://api.github.com/repos/unifi-poller/unifi-poller/releases/latest | jq -r ".assets[] | select(.name | contains(\"amd64.txz\")) | .browser_download_url")
-  iocage exec "${JAIL_NAME}" fetch -o /config "${DOWNLOAD}"
-
-  # Install downloaded Unifi-Poller package, configure and enable 
-  iocage exec "${JAIL_NAME}" pkg install -qy /config/"${FILE_NAME}"
-  # shellcheck disable=SC2154
-  cp "${INCLUDES_PATH}"/up.conf /mnt/"${global_dataset_config}"/"${JAIL_NAME}"
-  # shellcheck disable=SC2154
-  cp "${INCLUDES_PATH}"/up.conf.example /mnt/"${global_dataset_config}"/"${JAIL_NAME}"
-  # shellcheck disable=SC2154
-  cp "${INCLUDES_PATH}"/rc/unifi_poller /mnt/"${global_dataset_iocage}"/jails/"${JAIL_NAME}"/root/usr/local/etc/rc.d/unifi_poller
-  iocage exec "${JAIL_NAME}" sed -i '' "s|influxdbuser|${DB_USER}|" /config/up.conf
-  iocage exec "${JAIL_NAME}" sed -i '' "s|influxdbpass|${DB_PASS}|" /config/up.conf
-  iocage exec "${JAIL_NAME}" sed -i '' "s|unifidb|${DB_NAME}|" /config/up.conf
-  iocage exec "${JAIL_NAME}" sed -i '' "s|unifiuser|${UP_USER}|" /config/up.conf
-  iocage exec "${JAIL_NAME}" sed -i '' "s|unifipassword|${UP_PASS}|" /config/up.conf
-  iocage exec "${JAIL_NAME}" sed -i '' "s|dbip|http://${DB_IP}:8086|" /config/up.conf
-
-
-  iocage exec "${JAIL_NAME}" sysrc unifi_poller_enable=YES
-  iocage exec "${JAIL_NAME}" service unifi_poller start
-
-  echo "Installation complete!"
-  echo "Unifi Controller is accessible at https://${JAIL_IP}:8443."
-  echo "Please login to the Unifi Controller and add ${UP_USER} as a read-only user."
-  echo "In Grafana, add Unifi-Poller as a data source."
-fi

From 795eb809afe37de22d98baaede537b9290c09101 Mon Sep 17 00:00:00 2001
From: Matt Coleman <mdcoleman001@gmail.com>
Date: Tue, 5 May 2020 08:58:49 -0400
Subject: [PATCH 101/147] Unifi fixes (#99)

* fix database creation, set rc script executable

* fix lint errors

* fix typo
---
 blueprints/unifi/install.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/blueprints/unifi/install.sh b/blueprints/unifi/install.sh
index 2ad17799..66e46d16 100755
--- a/blueprints/unifi/install.sh
+++ b/blueprints/unifi/install.sh
@@ -34,7 +34,7 @@ UP_USER="${!UP_USER:-$1}"
 UP_PASS="jail_${1}_up_password"
 INCLUDES_PATH="${SCRIPT_DIR}/blueprints/unifi/includes"
 
-if [ -z "${!DB_PASSWORD}" ]; then
+if [ -z "${!DB_PASS}" ]; then
 	echo "up_db_password can't be empty"
 	exit 1
 fi
@@ -70,7 +70,7 @@ else
   # Check if influxdb container exists, create unifi database if it does, error if it is not.
   echo "Checking if the database jail and database exist..."
   if [[ -d /mnt/"${global_dataset_iocage}"/jails/"${!DB_JAIL}" ]]; then
-    DB_EXISTING=$(iocage exec "${!DB_JAIL}" curl -G http://localhost:8086/query --data-urlencode 'q=SHOW DATABASES' | jq '.results [] | .series [] | .values []' | grep "$DB_NAME" | sed 's/"//g' | sed 's/^ *//g')
+    DB_EXISTING=$(iocage exec "${!DB_JAIL}" curl -G http://"${DB_IP}":8086/query --data-urlencode 'q=SHOW DATABASES' | jq '.results [] | .series [] | .values []' | grep "$DB_NAME" | sed 's/"//g' | sed 's/^ *//g')
     if [[ "$DB_NAME" == "$DB_EXISTING" ]]; then
       echo "${!DB_JAIL} jail with database ${DB_NAME} already exists. Skipping database creation... "
     else
@@ -79,7 +79,8 @@ else
         echo "Database username and password not provided. Cannot create database without credentials. Exiting..."
         exit 1
       else
-        iocage exec "${!DB_JAIL}" "curl -XPOST -u ${DB_USER}:${!DB_PASS} http://localhost:8086/query --data-urlencode 'q=CREATE DATABASE ${DB_NAME}'"
+        # shellcheck disable=SC2027,2086
+        iocage exec "${!DB_JAIL}" "curl -XPOST -u ${DB_USER}:${!DB_PASS} http://"${DB_IP}":8086/query --data-urlencode 'q=CREATE DATABASE ${DB_NAME}'"
         echo "Database ${DB_NAME} created with username ${DB_USER} with password ${!DB_PASS}."
       fi
     fi
@@ -99,6 +100,7 @@ else
   cp "${INCLUDES_PATH}"/up.conf /mnt/"${global_dataset_config}"/"${1}"
   # shellcheck disable=SC2154
   cp "${INCLUDES_PATH}"/rc/unifi_poller.rc /mnt/"${global_dataset_iocage}"/jails/"${1}"/root/usr/local/etc/rc.d/unifi_poller
+  chmod +x /mnt/"${global_dataset_iocage}"/jails/"${1}"/root/usr/local/etc/rc.d/unifi_poller
   iocage exec "${1}" sed -i '' "s|influxdbuser|${DB_USER}|" /config/up.conf
   iocage exec "${1}" sed -i '' "s|influxdbpass|${!DB_PASS}|" /config/up.conf
   iocage exec "${1}" sed -i '' "s|unifidb|${DB_NAME}|" /config/up.conf

From 17714136c9011da07e53b8d1eca8f0a1368fa448 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Tue, 5 May 2020 14:57:15 +0200
Subject: [PATCH 102/147] set branch to dev

---
 jailman.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jailman.sh b/jailman.sh
index 7db54514..0e9c6cd1 100755
--- a/jailman.sh
+++ b/jailman.sh
@@ -20,7 +20,7 @@ if ! [ "$(id -u)" = 0 ]; then
 fi
 
 # Auto Update
-BRANCH="multi_install"
+BRANCH="dev"
 gitupdate ${BRANCH}
 
 # If no option is given, point to the help menu

From 137a25595d894dfdc4fcf24d113c7bdf7264e0c9 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Tue, 5 May 2020 15:05:44 +0200
Subject: [PATCH 103/147] plex typo fix

---
 blueprints/plex/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blueprints/plex/install.sh b/blueprints/plex/install.sh
index 54766a03..0ea7fb20 100755
--- a/blueprints/plex/install.sh
+++ b/blueprints/plex/install.sh
@@ -18,7 +18,7 @@ createmount "$1" "${global_dataset_media}"/shows /mnt/media/shows
 # Create plex ramdisk if specified
 # shellcheck disable=SC2154
 if [ -z "${plex_ramdisk}" ]; then
-	echo "no ramdisk specified for plex, continuing without randisk"
+	echo "no ramdisk specified for plex, continuing without ramdisk"
 else
 	iocage fstab -a "$1" tmpfs /tmp_transcode tmpfs rw,size="${plex_ramdisk}",mode=1777 0 0
 fi

From c26a4bfbc1bf92e6755d60088071dd4140aaba79 Mon Sep 17 00:00:00 2001
From: Matt Coleman <mdcoleman001@gmail.com>
Date: Tue, 5 May 2020 09:21:37 -0400
Subject: [PATCH 104/147] fix typo; add influxdb to readme (#100)

---
 blueprints/influxdb/install.sh | 1 -
 docs/Readme.md                 | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/blueprints/influxdb/install.sh b/blueprints/influxdb/install.sh
index be79b3fe..a8744d0c 100755
--- a/blueprints/influxdb/install.sh
+++ b/blueprints/influxdb/install.sh
@@ -27,6 +27,5 @@ sleep 15
 
 # Done!
 echo "Installation complete!"
-echo "Your may connect InfluxDB plugins to the InfluxDB jail at http://${JAIL_IP}:8086."
 echo "You may connect InfluxDB plugins to the InfluxDB jail at http://${JAIL_IP}:8086."
 echo ""
diff --git a/docs/Readme.md b/docs/Readme.md
index 5ebff60c..69d78a28 100644
--- a/docs/Readme.md
+++ b/docs/Readme.md
@@ -76,6 +76,7 @@ Basic means: The same setup as a FreeNAS plugin would've, DHCP on bridge0.
 
 #### Backend
 - mariadb
+- influxdb
 
 #### Downloads
 

From 36e2df80de83cabfdb96ed2cba9c2cd6c623b353 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Fri, 8 May 2020 00:26:20 +0200
Subject: [PATCH 105/147] Add update to readme

---
 docs/Readme.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/Readme.md b/docs/Readme.md
index 69d78a28..ca567794 100644
--- a/docs/Readme.md
+++ b/docs/Readme.md
@@ -48,6 +48,11 @@ Example:
 Example:
 `./jailman.sh -r sonarr`
 
+- Update:
+`./jailman.sh -u $jailname`
+Example:
+`./jailman.sh -u sonarr`
+
 - Destroy
 `./jailman.sh -d $jailname`
 Example:

From f6766b3fa287d0ef5097b6cb8b9f1afc3611e4b3 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Fri, 8 May 2020 00:26:51 +0200
Subject: [PATCH 106/147] Fix bitwarden indent

---
 config.yml.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.yml.example b/config.yml.example
index 6dbc916e..89ad6c10 100644
--- a/config.yml.example
+++ b/config.yml.example
@@ -86,7 +86,7 @@ jail:
     blueprint: bitwarden
     ip4_addr: 192.168.1.97/24
     gateway: 192.168.1.1
-	db_jail: "mariadb"
+    db_jail: "mariadb"
     db_password: "YourDBPasswordHerePLEASE"
     admin_token: "PUTYOURADMINTOKENHEREANDREMOVETHIS"
 

From 9b4bedfa48199d2dc1b2d05640284415a28ae061 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sun, 17 May 2020 14:00:36 +0200
Subject: [PATCH 107/147] Add migration documentation

---
 docs/migration/v1.1.x to v1.2.x.md | 61 ++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 docs/migration/v1.1.x to v1.2.x.md

diff --git a/docs/migration/v1.1.x to v1.2.x.md b/docs/migration/v1.1.x to v1.2.x.md
new file mode 100644
index 00000000..e8e9947c
--- /dev/null
+++ b/docs/migration/v1.1.x to v1.2.x.md	
@@ -0,0 +1,61 @@
+## v1.1.x to v1.2.x
+
+With v1.2 we made it possible to run multiple jails of the same type.
+This is done by seperating jails (your individual installs) from blueprints (our designs).
+
+Due to this change, the config file has been changed and thus you need to adapt your config file.
+
+
+### Jails
+
+All your jails need to be indented by 2 spaces under a main group "jails" like this:
+
+`
+jail:
+  plex: 
+    blueprint: plex
+    ip4_addr: 192.168.1.99/24
+    gateway: 192.168.1.1
+    beta: false
+`
+
+Also note:
+Where previously we used `plex: plex`, we can now just use `plex:`
+
+### Blueprints
+
+Every jail now requires a blueprint to be defined. for example:
+v1.1.x
+`
+
+plex: plex
+  ip4_addr: 192.168.1.99/24
+  gateway: 192.168.1.1
+  plexpass: false
+`
+
+In v1.2.x becomes:
+`
+jail:
+  plex: 
+    blueprint: plex
+    ip4_addr: 192.168.1.99/24
+    gateway: 192.168.1.1
+    beta: false
+`
+
+### Plex
+
+Due to community feedback in v1.2.x "plexpass" has been renamed to "beta".
+
+### pkgs
+
+pkgs are removed from jail config in v1.2.x and are now part of the blueprint. This way we can keep them up-to-date for you.
+
+### Documentation
+
+All jails now have wiki documentation pages and all basic jail values have been documented
+
+### Other changes
+
+Some other minor changes in config file values have been done, please refer to the example document and compare your config to the example
\ No newline at end of file

From 0fadea4befb2d08da1866f51e818df6a74056ac3 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sun, 17 May 2020 14:07:22 +0200
Subject: [PATCH 108/147] master fix

---
 jailman.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jailman.sh b/jailman.sh
index 0e9c6cd1..511cb148 100755
--- a/jailman.sh
+++ b/jailman.sh
@@ -20,7 +20,7 @@ if ! [ "$(id -u)" = 0 ]; then
 fi
 
 # Auto Update
-BRANCH="dev"
+BRANCH="master"
 gitupdate ${BRANCH}
 
 # If no option is given, point to the help menu

From d4ee43bab660279f44c4c4fd03535299a5d4a5d7 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Fri, 22 May 2020 19:24:04 +0200
Subject: [PATCH 109/147] Add blueprints folder for docs

---
 docs/blueprints/General | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 docs/blueprints/General

diff --git a/docs/blueprints/General b/docs/blueprints/General
new file mode 100644
index 00000000..f12d6cb1
--- /dev/null
+++ b/docs/blueprints/General
@@ -0,0 +1,5 @@
+## General Info
+
+Blueprints are the blueprint on which your created jails are going to be based.
+
+More info TBD

From 762cb452f1e1f915efdb0c9e4cb699ef7a36e074 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Fri, 22 May 2020 19:30:39 +0200
Subject: [PATCH 110/147] test different cp

---
 .github/workflows/wiki.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/wiki.yml b/.github/workflows/wiki.yml
index e5f4a432..a9259253 100644
--- a/.github/workflows/wiki.yml
+++ b/.github/workflows/wiki.yml
@@ -15,7 +15,7 @@ jobs:
           ref: 'master'
       - name: rename-readme
         run: |
-          for pathname in blueprints/*/readme.md; do ! cp "$pathname" "docs/blueprints/$( basename "$( dirname "$pathname" )" ).md"; done
+          for pathname in blueprints/*/readme.md; do cp "$pathname" "docs/blueprints/$( basename "$( dirname "$pathname" )" ).md"; done
         shell: bash
       - name: Deploy docs
         uses: mhausenblas/mkdocs-deploy-gh-pages@master

From 153e0a97fa9fca2c71e26bb69f0f08fbd41f18e3 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Fri, 22 May 2020 19:30:57 +0200
Subject: [PATCH 111/147] remove old jail docs

---
 docs/jails/jails.md | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 docs/jails/jails.md

diff --git a/docs/jails/jails.md b/docs/jails/jails.md
deleted file mode 100644
index 9daeafb9..00000000
--- a/docs/jails/jails.md
+++ /dev/null
@@ -1 +0,0 @@
-test

From 29c0e13eb7571384daf6dc6367a1b44877723cf6 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sun, 24 May 2020 10:39:39 +0200
Subject: [PATCH 112/147] Add placeholder .cirrus.yml

---
 .cirrus.yml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .cirrus.yml

diff --git a/.cirrus.yml b/.cirrus.yml
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/.cirrus.yml
@@ -0,0 +1 @@
+

From 9483212dba0934c9d38a8c7c83def4d13d6eb7c3 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sun, 24 May 2020 23:00:59 +0200
Subject: [PATCH 113/147] gitfix

---
 global.sh  | 5 +++--
 jailman.sh | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/global.sh b/global.sh
index 262a72f3..b22fbff5 100755
--- a/global.sh
+++ b/global.sh
@@ -24,10 +24,11 @@ parse_yaml() {
 
 # automatic update function
 gitupdate() {
+git remote add upstream https://github.com/jailmanager/jailman.git > /dev/null 2>&1
 echo "checking for updates using Branch: $1"
-git fetch
+git fetch upstream
 git update-index -q --refresh
-CHANGED=$(git diff --name-only origin/"$1")
+CHANGED=$(git diff --name-only "$1")
 if [ -n "$CHANGED" ];
 then
     echo "script requires update"
diff --git a/jailman.sh b/jailman.sh
index 511cb148..f9b570ed 100755
--- a/jailman.sh
+++ b/jailman.sh
@@ -20,13 +20,13 @@ if ! [ "$(id -u)" = 0 ]; then
 fi
 
 # Auto Update
-BRANCH="master"
+BRANCH="upstream/master"
 gitupdate ${BRANCH}
 
 # If no option is given, point to the help menu
 if [ $# -eq 0 ]
 then
-        echo "Missing options!"
+echo "Missing options!"
         echo "(run $0 -h for help)"
         echo ""
         exit 0

From 61af3c2e7d6b38ad0e28610d188081913f85057d Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sun, 24 May 2020 23:01:54 +0200
Subject: [PATCH 114/147] change readme references

---
 docs/Readme.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/Readme.md b/docs/Readme.md
index ca567794..96882269 100644
--- a/docs/Readme.md
+++ b/docs/Readme.md
@@ -5,7 +5,7 @@
 
 ---
 
-[![GitHub last commit](https://img.shields.io/github/last-commit/ornias1993/jailman/dev.svg)](https://github.com/ornias1993/jailman/commits/dev) [![GitHub Release](https://img.shields.io/github/release/ornias1993/jailman.svg)](https://github.com/ornias1993/jailman/releases/latest) [![License: GPL v2](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](https://github.com/ornias1993/jailman/blob/master/docs/LICENSE.GPLV2) [![License](https://img.shields.io/badge/License-BSD%202--Clause-orange.svg)](https://github.com/ornias1993/jailman/blob/master/docs/LICENSE.BSD2)
+[![GitHub last commit](https://img.shields.io/github/last-commit/jailmanager/jailman/dev.svg)](https://github.com/jailmanager/jailman/commits/dev) [![GitHub Release](https://img.shields.io/github/release/jailmanager/jailman.svg)](https://github.com/jailmanager/jailman/releases/latest) [![License: GPL v2](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](https://github.com/jailmanager/jailman/blob/master/docs/LICENSE.GPLV2) [![License](https://img.shields.io/badge/License-BSD%202--Clause-orange.svg)](https://github.com/jailmanager/jailman/blob/master/docs/LICENSE.BSD2)
 
 ## Intro
 
@@ -19,7 +19,7 @@ The goal of this project is to be able to install, update, reinstall, upgrade an
 ### Installing
 - Get into FreeNAS using the in-gui console or SSH.
 Run the following commands to install jailman:
-- `git clone https://github.com/Ornias1993/jailman.git`
+- `git clone https://github.com/jailmanager/jailman.git`
 - `cd jailman`
 - `cp config.yml.example config.yml`
 - edit config.yml to reflect your personal settings (optional, see "use")

From 1b662fdff50e7f6f3d4a6f7866050bdb9b07520e Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sun, 24 May 2020 23:04:35 +0200
Subject: [PATCH 115/147] remove cirrus ci

---
 .cirrus.yml | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 .cirrus.yml

diff --git a/.cirrus.yml b/.cirrus.yml
deleted file mode 100644
index 8b137891..00000000
--- a/.cirrus.yml
+++ /dev/null
@@ -1 +0,0 @@
-

From 4512edff0d5cd29ffc9ed0d55bcf3e8653678c63 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sun, 24 May 2020 23:11:33 +0200
Subject: [PATCH 116/147] devnull all the things, we do our own messages

---
 global.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/global.sh b/global.sh
index b22fbff5..07dd4039 100755
--- a/global.sh
+++ b/global.sh
@@ -26,15 +26,15 @@ parse_yaml() {
 gitupdate() {
 git remote add upstream https://github.com/jailmanager/jailman.git > /dev/null 2>&1
 echo "checking for updates using Branch: $1"
-git fetch upstream
-git update-index -q --refresh
-CHANGED=$(git diff --name-only "$1")
+git fetch upstream > /dev/null 2>&1
+git update-index -q --refresh > /dev/null 2>&1
+CHANGED=$(git diff --name-only "$1") > /dev/null 2>&1
 if [ -n "$CHANGED" ];
 then
     echo "script requires update"
-    git reset --hard
-    git checkout "${1}"
-    git pull
+    git reset --hard > /dev/null 2>&1
+    git checkout "${1}" > /dev/null 2>&1
+    git pull > /dev/null 2>&1
     echo "script updated, please restart the script manually"
     exit 1
 else

From 13be3ca313b90244b3b61d38eca729e227ce2d40 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sun, 24 May 2020 23:12:31 +0200
Subject: [PATCH 117/147] dont /dev/null variable, oops

---
 global.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/global.sh b/global.sh
index 07dd4039..37a1d607 100755
--- a/global.sh
+++ b/global.sh
@@ -28,7 +28,7 @@ git remote add upstream https://github.com/jailmanager/jailman.git > /dev/null 2
 echo "checking for updates using Branch: $1"
 git fetch upstream > /dev/null 2>&1
 git update-index -q --refresh > /dev/null 2>&1
-CHANGED=$(git diff --name-only "$1") > /dev/null 2>&1
+CHANGED=$(git diff --name-only "$1")
 if [ -n "$CHANGED" ];
 then
     echo "script requires update"

From 0b43d76338d376ce4e0b6d7000f3008ab5f195ac Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Fri, 22 May 2020 19:15:36 +0200
Subject: [PATCH 118/147] reset to dev branch

---
 jailman.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/jailman.sh b/jailman.sh
index f9b570ed..b797aa42 100755
--- a/jailman.sh
+++ b/jailman.sh
@@ -20,7 +20,6 @@ if ! [ "$(id -u)" = 0 ]; then
 fi
 
 # Auto Update
-BRANCH="upstream/master"
 gitupdate ${BRANCH}
 
 # If no option is given, point to the help menu

From 9348c3a968299c624f5d7828aaabd8d878eb74c4 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Mon, 25 May 2020 23:46:07 +0200
Subject: [PATCH 119/147] add code owners (#123)

---
 docs/CODEOWNERS | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 docs/CODEOWNERS

diff --git a/docs/CODEOWNERS b/docs/CODEOWNERS
new file mode 100644
index 00000000..c762adab
--- /dev/null
+++ b/docs/CODEOWNERS
@@ -0,0 +1,9 @@
+# Default code owner
+*       @ornias1993
+
+# code owner for the docs.
+/docs/  @ornias1993
+
+# Code owners for individual blueprints
+/blueprints/influxdb/ @colemamd
+/blueprints/unifi/ @colemamd
\ No newline at end of file

From b82a02e3592aee053499014116b1b1745b57b529 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Mon, 25 May 2020 23:47:04 +0200
Subject: [PATCH 120/147] globaly disable shellcheck SC2154 because it isn't
 compatible with this repo. (#126)

---
 .shellcheckrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.shellcheckrc b/.shellcheckrc
index d5a471e7..e70c8981 100644
--- a/.shellcheckrc
+++ b/.shellcheckrc
@@ -1 +1 @@
-disable=SC2034
+disable=SC2034,SC2154

From cdd5127ce61035704b12ef97678cbfbb60cbba0d Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Tue, 26 May 2020 01:10:19 +0200
Subject: [PATCH 121/147] fix accidentel removed update function and set to dev

---
 jailman.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jailman.sh b/jailman.sh
index b797aa42..feb5ed11 100755
--- a/jailman.sh
+++ b/jailman.sh
@@ -20,7 +20,8 @@ if ! [ "$(id -u)" = 0 ]; then
 fi
 
 # Auto Update
-gitupdate ${BRANCH}
+BRANCH="upstream/dev"
+gitupdate "${BRANCH}"
 
 # If no option is given, point to the help menu
 if [ $# -eq 0 ]

From 80c058070793a12629d19814c195cb812c9653ac Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Tue, 26 May 2020 01:28:43 +0200
Subject: [PATCH 122/147] set right repo

---
 jailman.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jailman.sh b/jailman.sh
index feb5ed11..e68a013a 100755
--- a/jailman.sh
+++ b/jailman.sh
@@ -20,7 +20,7 @@ if ! [ "$(id -u)" = 0 ]; then
 fi
 
 # Auto Update
-BRANCH="upstream/dev"
+BRANCH="upstream/minor-dev"
 gitupdate "${BRANCH}"
 
 # If no option is given, point to the help menu

From c35208061c8b991fbd55064f55b5d934bd4316bf Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Tue, 26 May 2020 15:20:44 +0200
Subject: [PATCH 123/147] Make auto-update git aware (#133)

* Make auto-update git aware
Fixes #106

* Some slight tweaking and bug-fixing
---
 global.sh  | 34 +++++++++++++++++++++-------------
 jailman.sh |  3 +--
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/global.sh b/global.sh
index 37a1d607..1276b098 100755
--- a/global.sh
+++ b/global.sh
@@ -24,21 +24,29 @@ parse_yaml() {
 
 # automatic update function
 gitupdate() {
-git remote add upstream https://github.com/jailmanager/jailman.git > /dev/null 2>&1
-echo "checking for updates using Branch: $1"
-git fetch upstream > /dev/null 2>&1
-git update-index -q --refresh > /dev/null 2>&1
-CHANGED=$(git diff --name-only "$1")
-if [ -n "$CHANGED" ];
+if [ "$(git config --get remote.origin.url)" = "https://github.com/Ornias1993/jailman" ]
 then
-    echo "script requires update"
-    git reset --hard > /dev/null 2>&1
-    git checkout "${1}" > /dev/null 2>&1
-    git pull > /dev/null 2>&1
-    echo "script updated, please restart the script manually"
-    exit 1
+	echo "The repository has been moved, please reinstall using the new repository: jailmanager/jailman"
+	exit 1
+fi
+if [ "$1" = "" ] || [ "$1" = "HEAD" ];
+then
+	echo "Detatched or invalid GIT HEAD detected, please reinstall"
 else
-    echo "script up-to-date"
+	echo "checking for updates using Branch: $1"
+	git fetch > /dev/null 2>&1
+	git update-index -q --refresh > /dev/null 2>&1
+	CHANGED=$(git diff --name-only "$1")
+	if [ -n "$CHANGED" ];
+	then
+		echo "script requires update"
+		git reset --hard > /dev/null 2>&1
+		git pull > /dev/null 2>&1
+		echo "script updated, please restart the script manually"
+		exit 1
+	else
+		echo "script up-to-date"
+	fi
 fi
 }
 
diff --git a/jailman.sh b/jailman.sh
index e68a013a..1841bd53 100755
--- a/jailman.sh
+++ b/jailman.sh
@@ -20,8 +20,7 @@ if ! [ "$(id -u)" = 0 ]; then
 fi
 
 # Auto Update
-BRANCH="upstream/minor-dev"
-gitupdate "${BRANCH}"
+gitupdate $(git for-each-ref --format='%(upstream:short)' "$(git symbolic-ref -q HEAD)") || exit 1
 
 # If no option is given, point to the help menu
 if [ $# -eq 0 ]

From 67318354ebd4fe426ad9e7239fbf2c9bcc9138ad Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Tue, 26 May 2020 01:07:23 +0200
Subject: [PATCH 124/147] Correct datavase typo

---
 blueprints/bitwarden/update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blueprints/bitwarden/update.sh b/blueprints/bitwarden/update.sh
index a2775815..b46e4a6e 100755
--- a/blueprints/bitwarden/update.sh
+++ b/blueprints/bitwarden/update.sh
@@ -7,7 +7,7 @@
 JAIL_IP="jail_${1}_ip4_addr"
 JAIL_IP="${!JAIL_IP%/*}"
 HOST_NAME="jail_${1}_host_name"
-DB_DATABASE="jail_${1}_db_datavase"
+DB_DATABASE="jail_${1}_db_database"
 DB_USER="jail_${1}_db_user"
 # shellcheck disable=SC2154
 INSTALL_TYPE="jail_${1}_type"

From a23c4840e2b25d3c33393638079d730100ff2169 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Tue, 26 May 2020 16:11:18 +0200
Subject: [PATCH 125/147] Update shellcheck.yml

---
 .github/workflows/shellcheck.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml
index e5d12b6f..d4e3bd5b 100644
--- a/.github/workflows/shellcheck.yml
+++ b/.github/workflows/shellcheck.yml
@@ -8,6 +8,7 @@ on:
     branches:
       - master
       - dev
+      - minor-dev
 
 jobs:
   Shellcheck:

From e8acdbc16f9539c0afa2165618cb986a2028e521 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Tue, 26 May 2020 16:11:37 +0200
Subject: [PATCH 126/147] Update filecheck.yml

---
 .github/workflows/filecheck.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/filecheck.yml b/.github/workflows/filecheck.yml
index 59cba21b..e3efcef8 100644
--- a/.github/workflows/filecheck.yml
+++ b/.github/workflows/filecheck.yml
@@ -4,6 +4,7 @@ on:
     branches:
       - master
       - dev
+      - minor-dev
 
 jobs:
   build:

From f434cd612532b2be253a3d9e83fd3e4a6035355d Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Tue, 26 May 2020 14:27:11 +0200
Subject: [PATCH 127/147] Don't try to update unifi poller if it isn't
 installed Fixes #111

---
 blueprints/unifi/update.sh | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/blueprints/unifi/update.sh b/blueprints/unifi/update.sh
index a585afab..f40a1b24 100755
--- a/blueprints/unifi/update.sh
+++ b/blueprints/unifi/update.sh
@@ -2,20 +2,25 @@
 # This file contains the update script for unifi
 # Unifi Controller is updated through pkg, Unifi-Poller is not. This script updates Unifi-Poller
 
-FILE_NAME=$(curl -s https://api.github.com/repos/unifi-poller/unifi-poller/releases/latest | jq -r ".assets[] | select(.name | contains(\"amd64.txz\")) | .name")
-DOWNLOAD=$(curl -s https://api.github.com/repos/unifi-poller/unifi-poller/releases/latest | jq -r ".assets[] | select(.name | contains(\"amd64.txz\")) | .browser_download_url")
-
-# Check to see if there is an update.
-# shellcheck disable=SC2154
-if [[ -f /mnt/"${global_dataset_config}"/"${1}"/"${FILE_NAME}" ]]; then
-  echo "Unifi-Poller is up to date."
-  exit 1
+if [[ ! "${!POLLER}" ]]; then
+	echo "Skipping Unifi Poller for update, not installed"
 else
-  # Download and install the package
-  iocage exec "${1}" fetch -o /config "${DOWNLOAD}"
-  iocage exec "${1}" pkg install -qy /config/"${FILE_NAME}"
-  iocage exec "${1}" service unifi restart
-  iocage exec "${1}" service unifi_poller restart
+	
+	FILE_NAME=$(curl -s https://api.github.com/repos/unifi-poller/unifi-poller/releases/latest | jq -r ".assets[] | select(.name | contains(\"amd64.txz\")) | .name")
+	DOWNLOAD=$(curl -s https://api.github.com/repos/unifi-poller/unifi-poller/releases/latest | jq -r ".assets[] | select(.name | contains(\"amd64.txz\")) | .browser_download_url")
+	
+	# Check to see if there is an update.
+	# shellcheck disable=SC2154
+	if [[ -f /mnt/"${global_dataset_config}"/"${1}"/"${FILE_NAME}" ]]; then
+		echo "Unifi-Poller is up to date."
+		exit 1
+	else
+		# Download and install the package
+		iocage exec "${1}" fetch -o /config "${DOWNLOAD}"
+		iocage exec "${1}" pkg install -qy /config/"${FILE_NAME}"
+		
+		iocage exec "${1}" service unifi_poller restart
+	fi
 fi
-
-echo "Update complete!"
+iocage exec "${1}" service unifi restart
+echo "Update complete!"
\ No newline at end of file

From 7de49f42975b8a6377188b8519566a3eba85bd4a Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Tue, 26 May 2020 17:40:55 +0200
Subject: [PATCH 128/147] Make sure mariadb could save persistant (#135)

* Make sure mariadb could save persistant
Fixes #134

* Trigger checks
---
 blueprints/mariadb/install.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/blueprints/mariadb/install.sh b/blueprints/mariadb/install.sh
index e94678b0..d7d52499 100755
--- a/blueprints/mariadb/install.sh
+++ b/blueprints/mariadb/install.sh
@@ -35,6 +35,8 @@ if [ "$(ls -A "/mnt/${global_dataset_config}/${1}/db")" ]; then
 fi
 
 # Mount database dataset and set zfs preferences
+iocage exec "${1}" service mysql-server stop
+iocage exec "${1}" rm -Rf /var/db/mysql
 createmount "${1}" "${global_dataset_config}"/"${1}"/db /var/db/mysql
 zfs set recordsize=16K "${global_dataset_config}"/"${1}"/db
 zfs set primarycache=metadata "${global_dataset_config}"/"${1}"/db

From 8cb1af316eb38069fcc36d9556371a1f29615d10 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Tue, 26 May 2020 00:16:44 +0200
Subject: [PATCH 129/147] Update All The Blueprints (and remove unneeded pkgs)

- add some missing nextcloud dependencies
 - Move the ports installs to pkg
- Remove/Disable ports
- update organizr php
- update mariadb and phpmyadmin
- update Lidarr
- Update Jackett
- Remove possibly useless dependancies
---
 blueprints/bitwarden/config.yml   | 2 +-
 blueprints/jackett/install.sh     | 2 +-
 blueprints/lidarr/install.sh      | 6 +++---
 blueprints/mariadb/config.yml     | 2 +-
 blueprints/nextcloud/config.yml   | 3 +--
 blueprints/nextcloud/install.sh   | 2 --
 blueprints/organizr/config.yml    | 2 +-
 blueprints/transmission/update.sh | 1 +
 8 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/blueprints/bitwarden/config.yml b/blueprints/bitwarden/config.yml
index c79bd93c..b0a293d7 100644
--- a/blueprints/bitwarden/config.yml
+++ b/blueprints/bitwarden/config.yml
@@ -1,3 +1,3 @@
 blueprint:
   bitwarden:
-    pkgs: sqlite3 nginx git sudo vim-tiny bash node npm python27-2.7.17_1 mariadb104-client
\ No newline at end of file
+    pkgs: git sudo bash node npm mariadb104-client
\ No newline at end of file
diff --git a/blueprints/jackett/install.sh b/blueprints/jackett/install.sh
index d5e4ede7..51f22fc5 100755
--- a/blueprints/jackett/install.sh
+++ b/blueprints/jackett/install.sh
@@ -1,7 +1,7 @@
 #!/usr/local/bin/bash
 # This file contains the install script for jackett
 
-iocage exec "$1" "fetch https://github.com/Jackett/Jackett/releases/download/v0.11.502/Jackett.Binaries.Mono.tar.gz -o /usr/local/share"
+iocage exec "$1" "fetch https://github.com/Jackett/Jackett/releases/download/v0.16.546/Jackett.Binaries.Mono.tar.gz -o /usr/local/share"
 iocage exec "$1" "tar -xzvf /usr/local/share/Jackett.Binaries.Mono.tar.gz -C /usr/local/share"
 iocage exec "$1" rm /usr/local/share/Jackett.Binaries.Mono.tar.gz
 iocage exec "$1" "pw user add jackett -c jackett -u 818 -d /nonexistent -s /usr/bin/nologin"
diff --git a/blueprints/lidarr/install.sh b/blueprints/lidarr/install.sh
index 119f9ebc..ef8b0d54 100755
--- a/blueprints/lidarr/install.sh
+++ b/blueprints/lidarr/install.sh
@@ -12,9 +12,9 @@ createmount "$1" "${global_dataset_media}"
 createmount "$1" "${global_dataset_media}"/music /mnt/music
 
 
-iocage exec "$1" "fetch https://github.com/lidarr/Lidarr/releases/download/v0.2.0.371/Lidarr.develop.0.2.0.371.linux.tar.gz -o /usr/local/share"
-iocage exec "$1" "tar -xzvf /usr/local/share/Lidarr.develop.0.2.0.371.linux.tar.gz -C /usr/local/share"
-iocage exec "$1" "rm /usr/local/share/Lidarr.develop.0.2.0.371.linux.tar.gz"
+iocage exec "$1" "fetch https://github.com/lidarr/Lidarr/releases/download/v0.7.1.1381/Lidarr.master.0.7.1.1381.linux.tar.gz -o /usr/local/share"
+iocage exec "$1" "tar -xzvf Lidarr.master.0.7.1.1381.linux.tar.gz -C /usr/local/share"
+iocage exec "$1" "rm /usr/local/share/Lidarr.master.0.7.1.1381.linux.tar.gz"
 iocage exec "$1" "pw user add lidarr -c lidarr -u 353 -d /nonexistent -s /usr/bin/nologin"
 iocage exec "$1" chown -R lidarr:lidarr /usr/local/share/Lidarr /config
 iocage exec "$1" mkdir /usr/local/etc/rc.d
diff --git a/blueprints/mariadb/config.yml b/blueprints/mariadb/config.yml
index 05feae35..403cb8a9 100644
--- a/blueprints/mariadb/config.yml
+++ b/blueprints/mariadb/config.yml
@@ -1,3 +1,3 @@
 blueprint:
   mariadb:
-    pkgs: mariadb104-server git  php74-session php74-xml php74-ctype php74-openssl php74-filter php74-gd php74-json php74-mysqli php74-mbstring php74-zlib php74-zip php74-bz2 phpMyAdmin5-php74 php74-pdo_mysql php74-mysqli phpMyAdmin5-php74-5.0.1
+    pkgs: mariadb104-server git  php74-session php74-xml php74-ctype php74-openssl php74-filter php74-gd php74-json php74-mysqli php74-mbstring php74-zlib php74-zip php74-bz2 phpMyAdmin5-php74 php74-pdo_mysql php74-mysqli phpMyAdmin5-php74
diff --git a/blueprints/nextcloud/config.yml b/blueprints/nextcloud/config.yml
index 0f8e0193..edbf9d25 100644
--- a/blueprints/nextcloud/config.yml
+++ b/blueprints/nextcloud/config.yml
@@ -1,4 +1,3 @@
 blueprint:
   nextcloud:
-    pkgs:   nano sudo redis php73-ctype gnupg php73-dom php73-gd php73-iconv php73-json php73-mbstring php73-posix php73-simplexml php73-xmlreader php73-xmlwriter php73-zip php73-zlib php73-hash php73-xml php73 php73-pecl-redis php73-session php73-wddx php73-xsl php73-filter php73-pecl-APCu php73-curl php73-fileinfo php73-bz2 php73-intl php73-openssl php73-ldap php73-ftp php73-imap php73-exif php73-gmp php73-pecl-memcache php73-pecl-imagick php73-pecl-smbclient perl5 p5-Locale-gettext help2man texinfo m4 autoconf
-    ports: true
\ No newline at end of file
+    pkgs:   nano sudo redis php73-ctype gnupg php73-dom php73-gd php73-iconv php73-json php73-mbstring php73-posix php73-simplexml php73-xmlreader php73-xmlwriter php73-zip php73-zlib php73-hash php73-xml php73 php73-pecl-redis php73-session php73-wddx php73-xsl php73-filter php73-pecl-APCu php73-curl php73-fileinfo php73-bz2 php73-intl php73-openssl php73-ldap php73-ftp php73-imap php73-exif php73-gmp php73-pecl-memcache php73-pecl-imagick php73-pecl-smbclient perl5 p5-Locale-gettext help2man texinfo m4 autoconf php73-opcache php73-pcntl php73-bcmath php73-pecl-APCu
\ No newline at end of file
diff --git a/blueprints/nextcloud/install.sh b/blueprints/nextcloud/install.sh
index 79f56f3f..d704d839 100755
--- a/blueprints/nextcloud/install.sh
+++ b/blueprints/nextcloud/install.sh
@@ -142,8 +142,6 @@ fi
 
 iocage exec "${1}" sysrc redis_enable="YES"
 iocage exec "${1}" sysrc php_fpm_enable="YES"
-iocage exec "${1}" sh -c "make -C /usr/ports/www/php73-opcache clean install BATCH=yes"
-iocage exec "${1}" sh -c "make -C /usr/ports/devel/php73-pcntl clean install BATCH=yes"
 
 
 #####
diff --git a/blueprints/organizr/config.yml b/blueprints/organizr/config.yml
index a06f8e48..a952ad5c 100644
--- a/blueprints/organizr/config.yml
+++ b/blueprints/organizr/config.yml
@@ -1,3 +1,3 @@
 blueprint:
   organizr:
-    pkgs: nginx php72 php72-filter php72-curl php72-hash php72-json php72-openssl php72-pdo php72-pdo_sqlite php72-session php72-simplexml php72-sqlite3 php72-zip git
\ No newline at end of file
+    pkgs: nginx php74 php74-filter php74-curl php74-hash php74-json php74-openssl php74-pdo php74-pdo_sqlite php74-session php74-simplexml php74-sqlite3 php74-zip git
\ No newline at end of file
diff --git a/blueprints/transmission/update.sh b/blueprints/transmission/update.sh
index 6c3d216e..8b0ec710 100755
--- a/blueprints/transmission/update.sh
+++ b/blueprints/transmission/update.sh
@@ -2,6 +2,7 @@
 # This file contains the update script for transmission
 
 iocage exec "$1" service transmission stop
+
 # Transmision is updated during PKG update, this file is mostly just a placeholder
 iocage exec "$1" chown -R transmission:transmission /config
 iocage exec "$1" service transmission restart
\ No newline at end of file

From 1dd70ad50804b903ca3f404a98ade1f1351cdf47 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Tue, 26 May 2020 14:20:49 +0200
Subject: [PATCH 130/147] exit on dataset creation/mount errors Fixes #107 (and
 other issues)

---
 global.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/global.sh b/global.sh
index 1276b098..f826d2ef 100755
--- a/global.sh
+++ b/global.sh
@@ -95,13 +95,13 @@ fi
 rm /tmp/pkg.json
 echo "creating jail config directory"
 # shellcheck disable=SC2154
-createmount "${1}" "${global_dataset_config}"
-createmount "${1}" "${global_dataset_config}"/"${1}" /config
+createmount "${1}" "${global_dataset_config}" || exit 1
+createmount "${1}" "${global_dataset_config}"/"${1}" /config || exit 1
 
 # Create and Mount portsnap
-createmount "${1}" "${global_dataset_config}"/portsnap
-createmount "${1}" "${global_dataset_config}"/portsnap/db /var/db/portsnap
-createmount "${1}" "${global_dataset_config}"/portsnap/ports /usr/ports
+createmount "${1}" "${global_dataset_config}"/portsnap || exit 1
+createmount "${1}" "${global_dataset_config}"/portsnap/db /var/db/portsnap || exit 1
+createmount "${1}" "${global_dataset_config}"/portsnap/ports /usr/ports || exit 1
 if [ "${!blueprintports}" == "true" ]
 then
 	echo "Mounting and fetching ports"
@@ -125,7 +125,7 @@ createmount() {
 	else
 		if [ ! -d "/mnt/$2" ]; then
 			echo "Dataset does not exist... Creating... $2"
-			zfs create "${2}"
+			zfs create "${2}" || exit 1
 		else
 			echo "Dataset already exists, skipping creation of $2"
 		fi
@@ -133,9 +133,9 @@ createmount() {
 		if [ -n "$1" ] && [ -n "$3" ]; then
 			iocage exec "${1}" mkdir -p "${3}"
 			if [ -n "${4}" ]; then
-				iocage fstab -a "${1}" /mnt/"${2}" "${3}" "${4}"
+				iocage fstab -a "${1}" /mnt/"${2}" "${3}" "${4}" || exit 1
 			else
-				iocage fstab -a "${1}" /mnt/"${2}" "${3}" nullfs rw 0 0
+				iocage fstab -a "${1}" /mnt/"${2}" "${3}" nullfs rw 0 0 || exit 1
 			fi
 		else
 			echo "No Jail Name or Mount target specified, not mounting dataset"

From 558e3be0c8deed2554f2de1968112dc408b37406 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 28 May 2020 15:01:21 +0200
Subject: [PATCH 131/147] Redo all the templates and remove the old once

---
 .github/ISSUE_TEMPLATE/bug_report.md          | 27 ++++++++++++
 .github/ISSUE_TEMPLATE/feature_request.md     | 20 +++++++++
 .github/PULL_REQUEST_TEMPLATE/bug_fix.md      | 40 ++++++++++++++++++
 .../general_improvement.md                    | 40 ++++++++++++++++++
 .../PULL_REQUEST_TEMPLATE/new_blueprint.md    | 41 +++++++++++++++++++
 docs/ISSUE_TEMPLATE.md                        | 13 ------
 docs/PULL_REQUEST_TEMPLATE.md                 | 16 --------
 7 files changed, 168 insertions(+), 29 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md
 create mode 100644 .github/PULL_REQUEST_TEMPLATE/bug_fix.md
 create mode 100644 .github/PULL_REQUEST_TEMPLATE/general_improvement.md
 create mode 100644 .github/PULL_REQUEST_TEMPLATE/new_blueprint.md
 delete mode 100644 docs/ISSUE_TEMPLATE.md
 delete mode 100644 docs/PULL_REQUEST_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000..71a89b41
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,27 @@
+---
+name: Bug report
+about: Create a report to help us improve JailMan
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 00000000..e74cb57f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: Feature
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/PULL_REQUEST_TEMPLATE/bug_fix.md b/.github/PULL_REQUEST_TEMPLATE/bug_fix.md
new file mode 100644
index 00000000..d9c6fc45
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/bug_fix.md
@@ -0,0 +1,40 @@
+---
+name: Bug Fix
+about: Submit a fix to help us improve JailMan
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Description**
+
+Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
+
+Fixes # (issue)
+
+**Type of change**
+
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] Refactor of current code
+- [ ] This change requires additional documentation update
+
+**How Has This Been Tested?**
+
+Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
+
+- [ ] Test A
+- [ ] Test B
+
+**Notes:**
+_Please enter any other relevant information here_
+
+**Checklist:**
+
+- [ ] My code follows the style guidelines of this project
+- [ ] I have performed a self-review of my own code
+- [ ] I have commented my code, particularly in hard-to-understand areas
+- [ ] I have made corresponding changes to the documentation
+- [ ] My changes generate no new warnings
+- [ ] I have added tests to this description that prove my fix is effective or that my feature works
+- [ ] Any new files are named using lowercase (to avoid issues on case sensitive file systems)
\ No newline at end of file
diff --git a/.github/PULL_REQUEST_TEMPLATE/general_improvement.md b/.github/PULL_REQUEST_TEMPLATE/general_improvement.md
new file mode 100644
index 00000000..e2af3b8e
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/general_improvement.md
@@ -0,0 +1,40 @@
+---
+name: General Improvement
+about: Submit a fix to help us improve JailMan
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Description**
+
+Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
+
+Fixes # (issue)
+
+**Type of change**
+
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] Refactor of current code
+- [ ] This change requires additional documentation update
+
+**How Has This Been Tested?**
+
+Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
+
+- [ ] Test A
+- [ ] Test B
+
+**Notes:**
+_Please enter any other relevant information here_
+
+**Checklist:**
+
+- [ ] My code follows the style guidelines of this project
+- [ ] I have performed a self-review of my own code
+- [ ] I have commented my code, particularly in hard-to-understand areas
+- [ ] I have made corresponding changes to the documentation
+- [ ] My changes generate no new warnings
+- [ ] I have added tests to this description that prove my fix is effective or that my feature works
+- [ ] Any new files are named using lowercase (to avoid issues on case sensitive file systems)
\ No newline at end of file
diff --git a/.github/PULL_REQUEST_TEMPLATE/new_blueprint.md b/.github/PULL_REQUEST_TEMPLATE/new_blueprint.md
new file mode 100644
index 00000000..1c264ab0
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/new_blueprint.md
@@ -0,0 +1,41 @@
+---
+name: New Blueprint
+about: Submit a new blueprint to help us expand JailMan
+title: ''
+labels: feature
+assignees: ''
+
+---
+
+**Description**
+
+Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
+
+Fixes # (issue)
+
+**Type of change**
+
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] Refactor of current code
+- [ ] This change requires additional documentation update
+
+**How Has This Been Tested?**
+
+Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
+
+- [ ] Test A
+- [ ] Test B
+
+**Notes:**
+_Please enter any other relevant information here_
+
+**Checklist:**
+
+- [ ] My code follows the style guidelines of this project
+- [ ] I have performed a self-review of my own code
+- [ ] I have commented my code, particularly in hard-to-understand areas
+- [ ] I have made corresponding changes to the documentation
+- [ ] My changes generate no new warnings
+- [ ] I have added tests to this description that prove my fix is effective or that my feature works
+- [ ] Any new files are named using lowercase (to avoid issues on case sensitive file systems)
+- [ ] I've added myself as a codeowner for the new blueprint in /docs/CODEOWNERS
\ No newline at end of file
diff --git a/docs/ISSUE_TEMPLATE.md b/docs/ISSUE_TEMPLATE.md
deleted file mode 100644
index 89fb703e..00000000
--- a/docs/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Issue Template
-
-## Description
-
-### Detailed Bug Report
-It helps if you include any relevant code / config (for describing how new features should work), images, gifs, or youtube videos!
-
-### Steps to Reproduce
-Please enter the steps to reproduce the bug or behaviour:  
-
-1.  
-2.  
-3.  
\ No newline at end of file
diff --git a/docs/PULL_REQUEST_TEMPLATE.md b/docs/PULL_REQUEST_TEMPLATE.md
deleted file mode 100644
index ed2f76f0..00000000
--- a/docs/PULL_REQUEST_TEMPLATE.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Pull Request Template
-
-### Purpose
-_Describe the problem the PR fixes or the feature it introduces_<br>
-_Don't forget to use "Fixes #issuenumber" to select issues and auto close them on merge_
-
-### Notes:
-_Please enter any other relevant information here_
-
-### Please make sure you have followed the self checks below before submitting a PR:
-
-- [ ] Code is sufficiently commented
-- [ ] Code is indented with tabs and not spaces
-- [ ] The PR does not bring up any new errors
-- [ ] The PR has been tested
-- [ ] Any new files are named using lowercase (to avoid issues on case sensitive file systems)

From 2e4ec58b7e4cf83ae58dbd7a078099289965fd22 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sun, 31 May 2020 22:32:44 +0200
Subject: [PATCH 132/147] Create SECURITY.md

---
 SECURITY.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 SECURITY.md

diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 00000000..31acc6da
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,17 @@
+# Security Policy
+
+## Supported Versions
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 1.2.x   | :white_check_mark: |
+| 1.1.x   | :x:                |
+| 1.0.x   | :x:                |
+
+## Reporting a Vulnerability
+
+If you find any security issue, please email the project maintainer.
+
+Currently the Project Maintainer is:
+[Ornias1993](https://github.com/Ornias1993)
+

From 9d074232921c582fbe4969ac0fda7f38a2cec870 Mon Sep 17 00:00:00 2001
From: colemamd <mdcoleman001@gmail.com>
Date: Fri, 12 Jun 2020 10:51:08 -0400
Subject: [PATCH 133/147] Fix Unifi DB creation in InfluxDB

---
 blueprints/unifi/install.sh |  8 ++++----
 blueprints/unifi/update.sh  | 41 ++++++++++++++++++++-----------------
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/blueprints/unifi/install.sh b/blueprints/unifi/install.sh
index 66e46d16..e1c90466 100755
--- a/blueprints/unifi/install.sh
+++ b/blueprints/unifi/install.sh
@@ -63,10 +63,7 @@ iocage exec "${1}" sysrc unifi_enable=YES
 iocage exec "${1}" service unifi start
 
 # shellcheck disable=SC2154
-if [[ ! "${!POLLER}" ]]; then
-  echo "Installation complete!"
-  echo "Unifi Controller is accessible at https://${JAIL_IP}:8443."
-else
+if [ "${!POLLER}" = true ]; then
   # Check if influxdb container exists, create unifi database if it does, error if it is not.
   echo "Checking if the database jail and database exist..."
   if [[ -d /mnt/"${global_dataset_iocage}"/jails/"${!DB_JAIL}" ]]; then
@@ -116,4 +113,7 @@ else
   echo "Unifi Controller is accessible at https://${JAIL_IP}:8443."
   echo "Please login to the Unifi Controller and add ${UP_USER} as a read-only user."
   echo "In Grafana, add Unifi-Poller as a data source."
+else
+  echo "Installation complete!"
+  echo "Unifi Controller is accessible at https://${JAIL_IP}:8443."
 fi
diff --git a/blueprints/unifi/update.sh b/blueprints/unifi/update.sh
index f40a1b24..5577ceb6 100755
--- a/blueprints/unifi/update.sh
+++ b/blueprints/unifi/update.sh
@@ -2,25 +2,28 @@
 # This file contains the update script for unifi
 # Unifi Controller is updated through pkg, Unifi-Poller is not. This script updates Unifi-Poller
 
-if [[ ! "${!POLLER}" ]]; then
-	echo "Skipping Unifi Poller for update, not installed"
+POLLER="jail_${1}_unifi_poller"
+
+# shellcheck disable=SC2154
+if [ "${!POLLER}" = true ]; then	
+  FILE_NAME=$(curl -s https://api.github.com/repos/unifi-poller/unifi-poller/releases/latest | jq -r ".assets[] | select(.name | contains(\"amd64.txz\")) | .name")
+  DOWNLOAD=$(curl -s https://api.github.com/repos/unifi-poller/unifi-poller/releases/latest | jq -r ".assets[] | select(.name | contains(\"amd64.txz\")) | .browser_download_url")
+
+  # Check to see if there is an update.
+  # shellcheck disable=SC2154
+  if [[ -f /mnt/"${global_dataset_config}"/"${1}"/"${FILE_NAME}" ]]; then
+    echo "Unifi-Poller is up to date."
+    exit 1
+  else
+    # Download and install the package
+    iocage exec "${1}" fetch -o /config "${DOWNLOAD}"
+    iocage exec "${1}" pkg install -qy /config/"${FILE_NAME}"
+
+    iocage exec "${1}" service unifi_poller restart
+  fi
 else
-	
-	FILE_NAME=$(curl -s https://api.github.com/repos/unifi-poller/unifi-poller/releases/latest | jq -r ".assets[] | select(.name | contains(\"amd64.txz\")) | .name")
-	DOWNLOAD=$(curl -s https://api.github.com/repos/unifi-poller/unifi-poller/releases/latest | jq -r ".assets[] | select(.name | contains(\"amd64.txz\")) | .browser_download_url")
-	
-	# Check to see if there is an update.
-	# shellcheck disable=SC2154
-	if [[ -f /mnt/"${global_dataset_config}"/"${1}"/"${FILE_NAME}" ]]; then
-		echo "Unifi-Poller is up to date."
-		exit 1
-	else
-		# Download and install the package
-		iocage exec "${1}" fetch -o /config "${DOWNLOAD}"
-		iocage exec "${1}" pkg install -qy /config/"${FILE_NAME}"
-		
-		iocage exec "${1}" service unifi_poller restart
-	fi
+  echo "Skipping Unifi Poller for update, not installed"
 fi
+
 iocage exec "${1}" service unifi restart
-echo "Update complete!"
\ No newline at end of file
+echo "Update complete!"

From 7bd99e2d39cc05943b8f67f85364b1d1a8a803fa Mon Sep 17 00:00:00 2001
From: colemamd <mdcoleman001@gmail.com>
Date: Thu, 18 Jun 2020 19:18:40 -0400
Subject: [PATCH 134/147] fix update cmd in jailman.sh

---
 jailman.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jailman.sh b/jailman.sh
index 1841bd53..f89a7dca 100755
--- a/jailman.sh
+++ b/jailman.sh
@@ -196,7 +196,7 @@ else
 		then
 			echo "Updating $jail"
 			iocage update "${jail}"
-			iocage exec "${jail}" "pkg update && pkg upgrade -y" && "${SCRIPT_DIR}"/jails/"${!blueprint}"/update.sh
+			iocage exec "${jail}" "pkg update && pkg upgrade -y" && "${SCRIPT_DIR}"/blueprints/"${!blueprint}"/update.sh "${jail}"
 			iocage restart "${jail}"
 			iocage start "${jail}"
 		else

From f01f321cfe3c323a9ab3a805ef0c3e3046b65ab5 Mon Sep 17 00:00:00 2001
From: colemamd <mdcoleman001@gmail.com>
Date: Thu, 18 Jun 2020 19:19:23 -0400
Subject: [PATCH 135/147] use string comparison

---
 blueprints/unifi/install.sh | 2 +-
 blueprints/unifi/update.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/blueprints/unifi/install.sh b/blueprints/unifi/install.sh
index e1c90466..e51f13ae 100755
--- a/blueprints/unifi/install.sh
+++ b/blueprints/unifi/install.sh
@@ -63,7 +63,7 @@ iocage exec "${1}" sysrc unifi_enable=YES
 iocage exec "${1}" service unifi start
 
 # shellcheck disable=SC2154
-if [ "${!POLLER}" = true ]; then
+if [ "${!POLLER}" == true ]; then
   # Check if influxdb container exists, create unifi database if it does, error if it is not.
   echo "Checking if the database jail and database exist..."
   if [[ -d /mnt/"${global_dataset_iocage}"/jails/"${!DB_JAIL}" ]]; then
diff --git a/blueprints/unifi/update.sh b/blueprints/unifi/update.sh
index 5577ceb6..424a7863 100755
--- a/blueprints/unifi/update.sh
+++ b/blueprints/unifi/update.sh
@@ -5,7 +5,7 @@
 POLLER="jail_${1}_unifi_poller"
 
 # shellcheck disable=SC2154
-if [ "${!POLLER}" = true ]; then	
+if [ "${!POLLER}" == true ]; then	
   FILE_NAME=$(curl -s https://api.github.com/repos/unifi-poller/unifi-poller/releases/latest | jq -r ".assets[] | select(.name | contains(\"amd64.txz\")) | .name")
   DOWNLOAD=$(curl -s https://api.github.com/repos/unifi-poller/unifi-poller/releases/latest | jq -r ".assets[] | select(.name | contains(\"amd64.txz\")) | .browser_download_url")
 

From d5f703e4b9c82ebda6d19ae66f7a8e6cb0a0e1b5 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sun, 12 Jul 2020 19:27:01 +0200
Subject: [PATCH 136/147] Additional MariaDB and PHPMyAdmin fixes

---
 blueprints/mariadb/includes/config.inc.php | 156 +++++++++++++++++++++
 blueprints/mariadb/includes/my-system.cnf  |  16 ---
 blueprints/mariadb/includes/my.cnf         |  24 +++-
 blueprints/mariadb/install.sh              |  28 ++--
 4 files changed, 195 insertions(+), 29 deletions(-)
 create mode 100644 blueprints/mariadb/includes/config.inc.php
 delete mode 100644 blueprints/mariadb/includes/my-system.cnf

diff --git a/blueprints/mariadb/includes/config.inc.php b/blueprints/mariadb/includes/config.inc.php
new file mode 100644
index 00000000..817f0f49
--- /dev/null
+++ b/blueprints/mariadb/includes/config.inc.php
@@ -0,0 +1,156 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * phpMyAdmin sample configuration, you can use it as base for
+ * manual configuration. For easier setup you can use setup/
+ *
+ * All directives are explained in documentation in the doc/ folder
+ * or at <https://docs.phpmyadmin.net/>.
+ *
+ * @package PhpMyAdmin
+ */
+declare(strict_types=1);
+
+/**
+ * This is needed for cookie based authentication to encrypt password in
+ * cookie. Needs to be 32 chars long.
+ */
+$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
+
+/**
+ * Servers configuration
+ */
+$i = 0;
+
+/**
+ * First server
+ */
+$i++;
+/* Authentication type */
+/*$cfg['Servers'][$i]['auth_type'] = 'cookie';*/
+/* Server parameters */
+$cfg['Servers'][$i]['host'] = 'localhost';
+$cfg['Servers'][$i]['compress'] = false;
+$cfg['Servers'][$i]['AllowNoPassword'] = false;
+$cfg['Servers'][$i]['socket'] = '/config/mysql.sock';
+$cfg['Servers'][$i]['connect_type'] = 'socket';
+/**
+ * phpMyAdmin configuration storage settings.
+ */
+
+/* User used to manipulate with storage */
+// $cfg['Servers'][$i]['controlhost'] = '';
+// $cfg['Servers'][$i]['controlport'] = '';
+// $cfg['Servers'][$i]['controluser'] = 'pma';
+// $cfg['Servers'][$i]['controlpass'] = 'pmapass';
+
+/* Storage database and tables */
+// $cfg['Servers'][$i]['pmadb'] = 'phpmyadmin';
+// $cfg['Servers'][$i]['bookmarktable'] = 'pma__bookmark';
+// $cfg['Servers'][$i]['relation'] = 'pma__relation';
+// $cfg['Servers'][$i]['table_info'] = 'pma__table_info';
+// $cfg['Servers'][$i]['table_coords'] = 'pma__table_coords';
+// $cfg['Servers'][$i]['pdf_pages'] = 'pma__pdf_pages';
+// $cfg['Servers'][$i]['column_info'] = 'pma__column_info';
+// $cfg['Servers'][$i]['history'] = 'pma__history';
+// $cfg['Servers'][$i]['table_uiprefs'] = 'pma__table_uiprefs';
+// $cfg['Servers'][$i]['tracking'] = 'pma__tracking';
+// $cfg['Servers'][$i]['userconfig'] = 'pma__userconfig';
+// $cfg['Servers'][$i]['recent'] = 'pma__recent';
+// $cfg['Servers'][$i]['favorite'] = 'pma__favorite';
+// $cfg['Servers'][$i]['users'] = 'pma__users';
+// $cfg['Servers'][$i]['usergroups'] = 'pma__usergroups';
+// $cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding';
+// $cfg['Servers'][$i]['savedsearches'] = 'pma__savedsearches';
+// $cfg['Servers'][$i]['central_columns'] = 'pma__central_columns';
+// $cfg['Servers'][$i]['designer_settings'] = 'pma__designer_settings';
+// $cfg['Servers'][$i]['export_templates'] = 'pma__export_templates';
+
+/**
+ * End of servers configuration
+ */
+
+/**
+ * Directories for saving/loading files from server
+ */
+$cfg['UploadDir'] = '';
+$cfg['SaveDir'] = '';
+
+/**
+ * Whether to display icons or text or both icons and text in table row
+ * action segment. Value can be either of 'icons', 'text' or 'both'.
+ * default = 'both'
+ */
+//$cfg['RowActionType'] = 'icons';
+
+/**
+ * Defines whether a user should be displayed a "show all (records)"
+ * button in browse mode or not.
+ * default = false
+ */
+//$cfg['ShowAll'] = true;
+
+/**
+ * Number of rows displayed when browsing a result set. If the result
+ * set contains more rows, "Previous" and "Next".
+ * Possible values: 25, 50, 100, 250, 500
+ * default = 25
+ */
+//$cfg['MaxRows'] = 50;
+
+/**
+ * Disallow editing of binary fields
+ * valid values are:
+ *   false    allow editing
+ *   'blob'   allow editing except for BLOB fields
+ *   'noblob' disallow editing except for BLOB fields
+ *   'all'    disallow editing
+ * default = 'blob'
+ */
+//$cfg['ProtectBinary'] = false;
+
+/**
+ * Default language to use, if not browser-defined or user-defined
+ * (you find all languages in the locale folder)
+ * uncomment the desired line:
+ * default = 'en'
+ */
+//$cfg['DefaultLang'] = 'en';
+//$cfg['DefaultLang'] = 'de';
+
+/**
+ * How many columns should be used for table display of a database?
+ * (a value larger than 1 results in some information being hidden)
+ * default = 1
+ */
+//$cfg['PropertiesNumColumns'] = 2;
+
+/**
+ * Set to true if you want DB-based query history.If false, this utilizes
+ * JS-routines to display query history (lost by window close)
+ *
+ * This requires configuration storage enabled, see above.
+ * default = false
+ */
+//$cfg['QueryHistoryDB'] = true;
+
+/**
+ * When using DB-based query history, how many entries should be kept?
+ * default = 25
+ */
+//$cfg['QueryHistoryMax'] = 100;
+
+/**
+ * Whether or not to query the user before sending the error report to
+ * the phpMyAdmin team when a JavaScript error occurs
+ *
+ * Available options
+ * ('ask' | 'always' | 'never')
+ * default = 'ask'
+ */
+//$cfg['SendErrorReports'] = 'always';
+
+/**
+ * You can find more configuration options in the documentation
+ * in the doc/ folder or at <https://docs.phpmyadmin.net/>.
+ */
diff --git a/blueprints/mariadb/includes/my-system.cnf b/blueprints/mariadb/includes/my-system.cnf
deleted file mode 100644
index b7eca26d..00000000
--- a/blueprints/mariadb/includes/my-system.cnf
+++ /dev/null
@@ -1,16 +0,0 @@
-[mysqld]
-innodb_file_per_table=1
-transaction_isolation = READ-COMMITTED
-binlog_format = ROW
-
-symbolic-links=0
-innodb_doublewrite = 0
-innodb_checksum_algorithm = none
-innodb_file_per_table=1
-
-innodb_buffer_pool_size = 1G
-innodb_log_buffer_size  = 8M
-innodb_open_files       = 400
-innodb_io_capacity      = 400
-innodb_flush_method     = O_DIRECT
-innodb_io_capacity      = 4000
diff --git a/blueprints/mariadb/includes/my.cnf b/blueprints/mariadb/includes/my.cnf
index 77b7660a..9545f512 100644
--- a/blueprints/mariadb/includes/my.cnf
+++ b/blueprints/mariadb/includes/my.cnf
@@ -1,3 +1,25 @@
-# MySQL client config file
+# MySQL config file
+[mysqld]
+datadir=/config/db
+socket=/config/mysql.sock
+log_error=/config/mysql.err
+innodb_file_per_table=1
+transaction_isolation = READ-COMMITTED
+binlog_format = ROW
+
+symbolic-links=0
+innodb_doublewrite = 0
+innodb_checksum_algorithm = none
+innodb_file_per_table=1
+
+innodb_buffer_pool_size = 1G
+innodb_log_buffer_size  = 8M
+innodb_open_files       = 400
+innodb_io_capacity      = 400
+innodb_flush_method     = O_DIRECT
+innodb_io_capacity      = 4000
+
 [client]
 password=mypassword
+port=3306
+socket=/config/mysql.sock
diff --git a/blueprints/mariadb/install.sh b/blueprints/mariadb/install.sh
index d7d52499..397829a3 100755
--- a/blueprints/mariadb/install.sh
+++ b/blueprints/mariadb/install.sh
@@ -35,24 +35,33 @@ if [ "$(ls -A "/mnt/${global_dataset_config}/${1}/db")" ]; then
 fi
 
 # Mount database dataset and set zfs preferences
-iocage exec "${1}" service mysql-server stop
-iocage exec "${1}" rm -Rf /var/db/mysql
-createmount "${1}" "${global_dataset_config}"/"${1}"/db /var/db/mysql
+iocage exec "${1}" rm -Rf /usr/local/etc/mysql/my.cnf
+createmount "${1}" "${global_dataset_config}"/"${1}"/db /config/db
 zfs set recordsize=16K "${global_dataset_config}"/"${1}"/db
 zfs set primarycache=metadata "${global_dataset_config}"/"${1}"/db
 
-iocage exec "${1}" chown -R 88:88 /var/db/mysql
+iocage exec "${1}" "pw groupadd -n mysql -g 88"
+iocage exec "${1}" "pw useradd -n mysql -u 88 -d /nonexistent -s /usr/sbin/nologin -g mysql"
+
+iocage exec "${1}" chown -R mysql:mysql /config
+
+iocage exec "${1}" sysrc mysql_optfile=/config/my.cnf
+iocage exec "${1}" sysrc mysql_dbdir=/config/db
+iocage exec "${1}" sysrc mysql_pidfile=/config/mysql.pid
+iocage exec "${1}" sysrc mysql_enable="YES"
 
 # Install includes fstab
 iocage exec "${1}" mkdir -p /mnt/includes
 iocage fstab -a "${1}" "${INCLUDES_PATH}" /mnt/includes nullfs rw 0 0
 
-iocage exec "${1}" mkdir -p /usr/local/www/phpmyadmin
-iocage exec "${1}" chown -R www:www /usr/local/www/phpmyadmin
+iocage exec "${1}" cp -f /mnt/includes/my.cnf /config/my.cnf
+iocage exec "${1}" cp -f /mnt/includes/config.inc.php /usr/local/www/phpMyAdmin/config.inc.php
+iocage exec "${1}" sed -i '' "s|mypassword|${!DB_ROOT_PASSWORD}|" /config/my.cnf
+iocage exec "${1}" ln -s /config/my.cnf /usr/local/etc/mysql/my.cnf
 
 #####
 # 
-# Install mariadb, Caddy and PhpMyAdmin
+# Install Caddy and PhpMyAdmin
 #
 #####
 
@@ -63,8 +72,6 @@ then
 	exit 1
 fi
 
-iocage exec "${1}" sysrc mysql_enable="YES"
-
 # Copy and edit pre-written config files
 echo "Copying Caddyfile for no SSL"
 iocage exec "${1}" cp -f /mnt/includes/caddy.rc /usr/local/etc/rc.d/caddy
@@ -86,7 +93,6 @@ if [ "${REINSTALL}" == "true" ]; then
 else
 	
 	# Secure database, set root password, create Nextcloud DB, user, and password
-	iocage exec "${1}" cp -f /mnt/includes/my-system.cnf /var/db/mysql/my.cnf
 	iocage exec "${1}" mysql -u root -e "DELETE FROM mysql.user WHERE User='';"
 	iocage exec "${1}" mysql -u root -e "DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1');"
 	iocage exec "${1}" mysql -u root -e "DROP DATABASE IF EXISTS test;"
@@ -94,8 +100,6 @@ else
 	iocage exec "${1}" mysqladmin --user=root password "${!DB_ROOT_PASSWORD}"
 	iocage exec "${1}" mysqladmin reload
 fi
-iocage exec "${1}" cp -f /mnt/includes/my.cnf /root/.my.cnf
-iocage exec "${1}" sed -i '' "s|mypassword|${!DB_ROOT_PASSWORD}|" /root/.my.cnf
 
 # Save passwords for later reference
 iocage exec "${1}" echo "MariaDB root password is ${!DB_ROOT_PASSWORD}" > /root/"${1}"_db_password.txt

From e89c4440e5654255361a3d7d25b0b75cb632b5b1 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Mon, 13 Jul 2020 01:10:02 +0200
Subject: [PATCH 137/147] Delete test.md

---
 docs/test.md | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 docs/test.md

diff --git a/docs/test.md b/docs/test.md
deleted file mode 100644
index e440e5c8..00000000
--- a/docs/test.md
+++ /dev/null
@@ -1 +0,0 @@
-3
\ No newline at end of file

From f2b2fcac5537e6c13e1890e46a6c34baf388e696 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Mon, 13 Jul 2020 01:13:47 +0200
Subject: [PATCH 138/147] Update security.md to reflect TrueNAS version

---
 SECURITY.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/SECURITY.md b/SECURITY.md
index 31acc6da..3ba5b5e5 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -2,11 +2,12 @@
 
 ## Supported Versions
 
-| Version | Supported          |
-| ------- | ------------------ |
-| 1.2.x   | :white_check_mark: |
-| 1.1.x   | :x:                |
-| 1.0.x   | :x:                |
+| Version | TrueNAS version | Supported with updates          |
+| ------- | ------- |------------------ |
+| 1.3.0   | 12.0 |  NOT RELEASED YET |
+| 1.2.x   | 11.3U2-3 |  :white_check_mark: |
+| 1.1.x   | 11.3U1-2 |  :x:                |
+| 1.0.x   | 11.3U1  | :x:                |
 
 ## Reporting a Vulnerability
 

From d793671646d99b167eb5ad4b40e05b7436089376 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Mon, 13 Jul 2020 01:17:48 +0200
Subject: [PATCH 139/147] Some documentation structure changes - Move all
 LICENSE files to root in accordance with github guidelines - Move other
 github-only docs to .github instead of wiki (docs) folder

---
 {docs => .github}/CODEOWNERS        | 0
 {docs => .github}/Readme.md         | 0
 SECURITY.md => .github/SECURITY.md  | 0
 docs/LICENSE.BSD2 => LICENSE.BSD2   | 0
 docs/LICENSE.GPLV2 => LICENSE.GPLV2 | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename {docs => .github}/CODEOWNERS (100%)
 rename {docs => .github}/Readme.md (100%)
 rename SECURITY.md => .github/SECURITY.md (100%)
 rename docs/LICENSE.BSD2 => LICENSE.BSD2 (100%)
 rename docs/LICENSE.GPLV2 => LICENSE.GPLV2 (100%)

diff --git a/docs/CODEOWNERS b/.github/CODEOWNERS
similarity index 100%
rename from docs/CODEOWNERS
rename to .github/CODEOWNERS
diff --git a/docs/Readme.md b/.github/Readme.md
similarity index 100%
rename from docs/Readme.md
rename to .github/Readme.md
diff --git a/SECURITY.md b/.github/SECURITY.md
similarity index 100%
rename from SECURITY.md
rename to .github/SECURITY.md
diff --git a/docs/LICENSE.BSD2 b/LICENSE.BSD2
similarity index 100%
rename from docs/LICENSE.BSD2
rename to LICENSE.BSD2
diff --git a/docs/LICENSE.GPLV2 b/LICENSE.GPLV2
similarity index 100%
rename from docs/LICENSE.GPLV2
rename to LICENSE.GPLV2

From 53a3eaa742b0a03104115d928d98ed807550f7b6 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Mon, 13 Jul 2020 16:08:26 +0200
Subject: [PATCH 140/147] Fix and Update Nextcloud

- Harden Redis install
- Update Nextcloud to 19 (Fixes #193 )
- Update PHP to PHP74 (Fixes #193 )
- Fix nextcloud Admin password not presented/set correctly
- Remove PHP-Hash (included in base PHP now) (Fixes #193 )
- Remove PHP-WDDX (not available anymore for PHP74) (Fixes #193 )
---
 blueprints/nextcloud/config.yml          |  2 +-
 blueprints/nextcloud/includes/redis.conf |  4 ++--
 blueprints/nextcloud/install.sh          | 13 +++++++------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/blueprints/nextcloud/config.yml b/blueprints/nextcloud/config.yml
index edbf9d25..a6f3f67b 100644
--- a/blueprints/nextcloud/config.yml
+++ b/blueprints/nextcloud/config.yml
@@ -1,3 +1,3 @@
 blueprint:
   nextcloud:
-    pkgs:   nano sudo redis php73-ctype gnupg php73-dom php73-gd php73-iconv php73-json php73-mbstring php73-posix php73-simplexml php73-xmlreader php73-xmlwriter php73-zip php73-zlib php73-hash php73-xml php73 php73-pecl-redis php73-session php73-wddx php73-xsl php73-filter php73-pecl-APCu php73-curl php73-fileinfo php73-bz2 php73-intl php73-openssl php73-ldap php73-ftp php73-imap php73-exif php73-gmp php73-pecl-memcache php73-pecl-imagick php73-pecl-smbclient perl5 p5-Locale-gettext help2man texinfo m4 autoconf php73-opcache php73-pcntl php73-bcmath php73-pecl-APCu
\ No newline at end of file
+    pkgs:   nano sudo redis php74-ctype gnupg php74-dom php74-gd php74-iconv php74-json php74-mbstring php74-posix php74-simplexml php74-xmlreader php74-xmlwriter php74-zip php74-zlib php74-xml php74 php74-pecl-redis php74-session php74-xsl php74-filter php74-pecl-APCu php74-curl php74-fileinfo php74-bz2 php74-intl php74-openssl php74-ldap php74-ftp php74-imap php74-exif php74-gmp php74-pecl-memcache php74-pecl-imagick php74-pecl-smbclient perl5 p5-Locale-gettext help2man texinfo m4 autoconf php74-opcache php74-pcntl php74-bcmath php74-pecl-APCu
\ No newline at end of file
diff --git a/blueprints/nextcloud/includes/redis.conf b/blueprints/nextcloud/includes/redis.conf
index ae47f742..5df02308 100644
--- a/blueprints/nextcloud/includes/redis.conf
+++ b/blueprints/nextcloud/includes/redis.conf
@@ -98,8 +98,8 @@ tcp-backlog 511
 # incoming connections. There is no default, so Redis will not listen
 # on a unix socket when not specified.
 #
-unixsocket /tmp/redis.sock
-unixsocketperm 777
+unixsocket /var/run/redis/redis.sock
+unixsocketperm 770
 
 # Close the connection after a client is idle for N seconds (0 to disable)
 timeout 0
diff --git a/blueprints/nextcloud/install.sh b/blueprints/nextcloud/install.sh
index d704d839..3d3612c2 100755
--- a/blueprints/nextcloud/install.sh
+++ b/blueprints/nextcloud/install.sh
@@ -50,7 +50,7 @@ if [ -z "${JAIL_IP}" ]; then
   exit 1
 fi
 
-if [ -z "${ADMIN_PASSWORD}" ]; then
+if [ -z "${!ADMIN_PASSWORD}" ]; then
   echo 'Configuration error: The Nextcloud jail requires a admin_password'
   echo 'Please reinstall using a fixed IP adress'
   exit 1
@@ -130,7 +130,7 @@ iocage exec "${1}" chmod -R 770 /config/files
 #####
 
 if [ "${DB_TYPE}" = "mariadb" ]; then
-  iocage exec "${1}" pkg install -qy mariadb103-client php73-pdo_mysql php73-mysqli
+  iocage exec "${1}" pkg install -qy mariadb104-client php74-pdo_mysql php74-mysqli
 fi
 
 fetch -o /tmp https://getcaddy.com
@@ -150,7 +150,7 @@ iocage exec "${1}" sysrc php_fpm_enable="YES"
 #
 #####
 
-FILE="latest-18.tar.bz2"
+FILE="latest-19.tar.bz2"
 if ! iocage exec "${1}" fetch -o /tmp https://download.nextcloud.com/server/releases/"${FILE}" https://download.nextcloud.com/server/releases/"${FILE}".asc https://nextcloud.com/nextcloud.asc
 then
 	echo "Failed to download Nextcloud"
@@ -165,6 +165,7 @@ then
 fi
 iocage exec "${1}" tar xjf /tmp/"${FILE}" -C /usr/local/www/
 iocage exec "${1}" chown -R www:www /usr/local/www/nextcloud/
+iocage exec "${1}" pw usermod www -G redis
 
 
 # Generate and install self-signed cert, if necessary
@@ -231,7 +232,7 @@ else
 	# Save passwords for later reference
 	iocage exec "${1}" echo "${DB_NAME} root password is ${DB_ROOT_PASSWORD}" > /root/"${1}"_db_password.txt
 	iocage exec "${1}" echo "Nextcloud database password is ${!DB_PASSWORD}" >> /root/"${1}"_db_password.txt
-	iocage exec "${1}" echo "Nextcloud Administrator password is ${ADMIN_PASSWORD}" >> /root/"${1}"_db_password.txt
+	iocage exec "${1}" echo "Nextcloud Administrator password is ${!ADMIN_PASSWORD}" >> /root/"${1}"_db_password.txt
 	
 	# CLI installation and configuration of Nextcloud
 	if [ "${DB_TYPE}" = "mariadb" ]; then
@@ -246,7 +247,7 @@ else
 	iocage exec "${1}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set loglevel --value="2"'
 	iocage exec "${1}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set logrotate_size --value="104847600"'
 	iocage exec "${1}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set memcache.local --value="\OC\Memcache\APCu"'
-	iocage exec "${1}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set redis host --value="/tmp/redis.sock"'
+	iocage exec "${1}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set redis host --value="/var/run/redis/redis.sock"'
 	iocage exec "${1}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set redis port --value=0 --type=integer'
 	iocage exec "${1}" su -m www -c 'php /usr/local/www/nextcloud/occ config:system:set memcache.locking --value="\OC\Memcache\Redis"'
 	iocage exec "${1}" su -m www -c "php /usr/local/www/nextcloud/occ config:system:set overwritehost --value=\"${!HOST_NAME}\""
@@ -287,7 +288,7 @@ if [ "${REINSTALL}" == "true" ]; then
 	echo "You did a reinstall, please use your old database and account credentials"
 else
 
-	echo "Default user is admin, password is ${ADMIN_PASSWORD}"
+	echo "Default user is admin, password is ${!ADMIN_PASSWORD}"
 	echo ""
 
 	echo "Database Information"

From 1f9ff88dc6c3899dfe9a435d615d6e3d804c4066 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Mon, 13 Jul 2020 23:58:20 +0200
Subject: [PATCH 141/147] Update tautulli deps to python3

---
 blueprints/tautulli/config.yml | 2 +-
 blueprints/tautulli/install.sh | 1 +
 blueprints/tautulli/update.sh  | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/blueprints/tautulli/config.yml b/blueprints/tautulli/config.yml
index 3c6a9a2d..9acd5c2b 100644
--- a/blueprints/tautulli/config.yml
+++ b/blueprints/tautulli/config.yml
@@ -1,3 +1,3 @@
 blueprint:
   tautulli:
-    pkgs: python2 py27-sqlite3 py27-openssl git
\ No newline at end of file
+    pkgs: python37 py37-setuptools py37-sqlite3 py37-openssl py37-pycryptodomex python3 git
\ No newline at end of file
diff --git a/blueprints/tautulli/install.sh b/blueprints/tautulli/install.sh
index c87ec954..d0c81373 100755
--- a/blueprints/tautulli/install.sh
+++ b/blueprints/tautulli/install.sh
@@ -1,6 +1,7 @@
 #!/usr/local/bin/bash
 # This file contains the install script for Tautulli
 
+iocage exec "$1" ln -s /usr/local/bin/python3 /usr/local/bin/python
 iocage exec "$1" git clone https://github.com/Tautulli/Tautulli.git /usr/local/share/Tautulli
 iocage exec "$1" "pw user add tautulli -c tautulli -u 109 -d /nonexistent -s /usr/bin/nologin"
 iocage exec "$1" chown -R tautulli:tautulli /usr/local/share/Tautulli /config
diff --git a/blueprints/tautulli/update.sh b/blueprints/tautulli/update.sh
index 500aa181..a24393bf 100755
--- a/blueprints/tautulli/update.sh
+++ b/blueprints/tautulli/update.sh
@@ -2,6 +2,7 @@
 # This file contains the update script for Tautulli
 
 iocage exec "$1" service tautulli stop
+iocage exec "$1" ln -s /usr/local/bin/python3 /usr/local/bin/python
 # Tautulli is updated through pkg, this is mostly just a placeholder
 iocage exec "$1" chown -R tautulli:tautulli /usr/local/share/Tautulli /config
 iocage exec "$1" cp /usr/local/share/Tautulli/init-scripts/init.freenas /usr/local/etc/rc.d/tautulli

From 0c81f15c0a02e64fce1fb54a070a71ed379704e3 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Tue, 14 Jul 2020 14:00:24 +0200
Subject: [PATCH 142/147] Fix broken Lidarr installer

---
 blueprints/lidarr/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blueprints/lidarr/install.sh b/blueprints/lidarr/install.sh
index ef8b0d54..4fdaec1f 100755
--- a/blueprints/lidarr/install.sh
+++ b/blueprints/lidarr/install.sh
@@ -13,7 +13,7 @@ createmount "$1" "${global_dataset_media}"/music /mnt/music
 
 
 iocage exec "$1" "fetch https://github.com/lidarr/Lidarr/releases/download/v0.7.1.1381/Lidarr.master.0.7.1.1381.linux.tar.gz -o /usr/local/share"
-iocage exec "$1" "tar -xzvf Lidarr.master.0.7.1.1381.linux.tar.gz -C /usr/local/share"
+iocage exec "$1" "tar -xzvf /usr/local/share/Lidarr.master.0.7.1.1381.linux.tar.gz -C /usr/local/share"
 iocage exec "$1" "rm /usr/local/share/Lidarr.master.0.7.1.1381.linux.tar.gz"
 iocage exec "$1" "pw user add lidarr -c lidarr -u 353 -d /nonexistent -s /usr/bin/nologin"
 iocage exec "$1" chown -R lidarr:lidarr /usr/local/share/Lidarr /config

From a05ceb5637ba98e067fc083bc0afad9df6ee5cad Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 16 Jul 2020 01:01:49 +0200
Subject: [PATCH 143/147] Add a code of conduct

Kept it pretty basic. Removed all possible controversial stuff.
---
 docs/CODE_OF_CONDUCT.md | 71 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 docs/CODE_OF_CONDUCT.md

diff --git a/docs/CODE_OF_CONDUCT.md b/docs/CODE_OF_CONDUCT.md
new file mode 100644
index 00000000..3dcfef28
--- /dev/null
+++ b/docs/CODE_OF_CONDUCT.md
@@ -0,0 +1,71 @@
+# Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender, level of experience, 
+education, socio-economic status, nationality, personal appearance, race, 
+religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexual imagery and unwelcome sexual advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at jailman@schouten-lebbing.nl. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq

From 210df14ff36a57e402b6b66e272b60a34f5ce6f8 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Mon, 20 Jul 2020 15:26:18 +0200
Subject: [PATCH 144/147] Create CNAME

---
 CNAME | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 CNAME

diff --git a/CNAME b/CNAME
new file mode 100644
index 00000000..62bcfa8c
--- /dev/null
+++ b/CNAME
@@ -0,0 +1 @@
+wiki.jailmanager.org

From f47fe6b85c2228366773707378546027e512e840 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 23 Jul 2020 11:36:48 +0200
Subject: [PATCH 145/147] add warning about Nextcloud being broken

---
 .github/Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/Readme.md b/.github/Readme.md
index 96882269..b99354fc 100644
--- a/.github/Readme.md
+++ b/.github/Readme.md
@@ -75,7 +75,7 @@ Basic means: The same setup as a FreeNAS plugin would've, DHCP on bridge0.
 
 - organizr
 - py-kms
-- nextcloud
+- nextcloud (currently broken, fix ready for 1.3.0)
 - bitwarden
 - unifi controller
 

From 1d32ed34c1d14442b411dc1ea514731eef2ab298 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sat, 13 Feb 2021 20:35:50 +0100
Subject: [PATCH 146/147] Update Readme.md

---
 .github/Readme.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/Readme.md b/.github/Readme.md
index b99354fc..a93035b3 100644
--- a/.github/Readme.md
+++ b/.github/Readme.md
@@ -3,6 +3,9 @@
 
 ### JailMan is a collection of shell scripts designed to make it easier to install all sorts of iocage Jails on FreeNAS.
 
+## Important:
+### Jailman as a project has stopped development in favor of [TrueCharts](https://github.com/truecharts/truecharts) for TrueNAS SCALE.
+
 ---
 
 [![GitHub last commit](https://img.shields.io/github/last-commit/jailmanager/jailman/dev.svg)](https://github.com/jailmanager/jailman/commits/dev) [![GitHub Release](https://img.shields.io/github/release/jailmanager/jailman.svg)](https://github.com/jailmanager/jailman/releases/latest) [![License: GPL v2](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](https://github.com/jailmanager/jailman/blob/master/docs/LICENSE.GPLV2) [![License](https://img.shields.io/badge/License-BSD%202--Clause-orange.svg)](https://github.com/jailmanager/jailman/blob/master/docs/LICENSE.BSD2)

From 92fa99d689982b63e47dd4741844a2940ab47727 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Thu, 16 Mar 2023 09:54:20 +0100
Subject: [PATCH 147/147] jailman move

---
 {.github => jailman/.github}/CODEOWNERS                           | 0
 {.github => jailman/.github}/FUNDING.yml                          | 0
 {.github => jailman/.github}/ISSUE_TEMPLATE/bug_report.md         | 0
 {.github => jailman/.github}/ISSUE_TEMPLATE/feature_request.md    | 0
 {.github => jailman/.github}/PULL_REQUEST_TEMPLATE/bug_fix.md     | 0
 .../.github}/PULL_REQUEST_TEMPLATE/general_improvement.md         | 0
 .../.github}/PULL_REQUEST_TEMPLATE/new_blueprint.md               | 0
 {.github => jailman/.github}/Readme.md                            | 0
 {.github => jailman/.github}/SECURITY.md                          | 0
 {.github => jailman/.github}/workflows/filecheck.yml              | 0
 {.github => jailman/.github}/workflows/shellcheck.yml             | 0
 {.github => jailman/.github}/workflows/wiki.yml                   | 0
 .gitignore => jailman/.gitignore                                  | 0
 .shellcheckrc => jailman/.shellcheckrc                            | 0
 CNAME => jailman/CNAME                                            | 0
 LICENSE => jailman/LICENSE                                        | 0
 LICENSE.BSD2 => jailman/LICENSE.BSD2                              | 0
 LICENSE.GPLV2 => jailman/LICENSE.GPLV2                            | 0
 {blueprints => jailman/blueprints}/bitwarden/config.yml           | 0
 .../blueprints}/bitwarden/includes/bitwarden.rc                   | 0
 .../blueprints}/bitwarden/includes/bitwarden.rc.conf              | 0
 {blueprints => jailman/blueprints}/bitwarden/install.sh           | 0
 {blueprints => jailman/blueprints}/bitwarden/readme.md            | 0
 {blueprints => jailman/blueprints}/bitwarden/update.sh            | 0
 {blueprints => jailman/blueprints}/influxdb/config.yml            | 0
 {blueprints => jailman/blueprints}/influxdb/includes/influxd.conf | 0
 {blueprints => jailman/blueprints}/influxdb/install.sh            | 0
 {blueprints => jailman/blueprints}/influxdb/readme.md             | 0
 {blueprints => jailman/blueprints}/influxdb/update.sh             | 0
 {blueprints => jailman/blueprints}/jackett/config.yml             | 0
 {blueprints => jailman/blueprints}/jackett/includes/jackett.rc    | 0
 {blueprints => jailman/blueprints}/jackett/install.sh             | 0
 {blueprints => jailman/blueprints}/jackett/readme.md              | 0
 {blueprints => jailman/blueprints}/jackett/update.sh              | 0
 {blueprints => jailman/blueprints}/kms/config.yml                 | 0
 .../blueprints}/kms/includes/Activate_Office_2019_Pro.bat         | 0
 .../blueprints}/kms/includes/Activate_Windows_10_Pro.bat          | 0
 .../kms/includes/Activate_Windows_Server_2019_Standard.bat        | 0
 .../blueprints}/kms/includes/Office-2019-Pro-VLK-Config.xml       | 0
 {blueprints => jailman/blueprints}/kms/includes/Readme.md         | 0
 .../blueprints}/kms/includes/Setup_Office_2019_Pro.txt            | 0
 {blueprints => jailman/blueprints}/kms/includes/py_kms.rc         | 0
 {blueprints => jailman/blueprints}/kms/install.sh                 | 0
 {blueprints => jailman/blueprints}/kms/readme.md                  | 0
 {blueprints => jailman/blueprints}/kms/update.sh                  | 0
 {blueprints => jailman/blueprints}/lidarr/config.yml              | 0
 {blueprints => jailman/blueprints}/lidarr/includes/lidarr.rc      | 0
 {blueprints => jailman/blueprints}/lidarr/install.sh              | 0
 {blueprints => jailman/blueprints}/lidarr/readme.md               | 0
 {blueprints => jailman/blueprints}/lidarr/update.sh               | 0
 {blueprints => jailman/blueprints}/mariadb/config.yml             | 0
 {blueprints => jailman/blueprints}/mariadb/includes/Caddyfile     | 0
 {blueprints => jailman/blueprints}/mariadb/includes/caddy.rc      | 0
 .../blueprints}/mariadb/includes/config.inc.php                   | 0
 {blueprints => jailman/blueprints}/mariadb/includes/my.cnf        | 0
 {blueprints => jailman/blueprints}/mariadb/install.sh             | 0
 {blueprints => jailman/blueprints}/mariadb/readme.md              | 0
 {blueprints => jailman/blueprints}/mariadb/update.sh              | 0
 {blueprints => jailman/blueprints}/nextcloud/LICENSE              | 0
 {blueprints => jailman/blueprints}/nextcloud/config.yml           | 0
 {blueprints => jailman/blueprints}/nextcloud/includes/Caddyfile   | 0
 .../blueprints}/nextcloud/includes/Caddyfile-nossl                | 0
 .../blueprints}/nextcloud/includes/Caddyfile-selfsigned           | 0
 {blueprints => jailman/blueprints}/nextcloud/includes/caddy.rc    | 0
 .../blueprints}/nextcloud/includes/my-system.cnf                  | 0
 {blueprints => jailman/blueprints}/nextcloud/includes/my.cnf      | 0
 {blueprints => jailman/blueprints}/nextcloud/includes/pgpass      | 0
 {blueprints => jailman/blueprints}/nextcloud/includes/php.ini     | 0
 {blueprints => jailman/blueprints}/nextcloud/includes/redis.conf  | 0
 .../blueprints}/nextcloud/includes/remove-staging.sh              | 0
 {blueprints => jailman/blueprints}/nextcloud/includes/www-crontab | 0
 {blueprints => jailman/blueprints}/nextcloud/includes/www.conf    | 0
 {blueprints => jailman/blueprints}/nextcloud/install.sh           | 0
 {blueprints => jailman/blueprints}/nextcloud/readme.md            | 0
 {blueprints => jailman/blueprints}/nextcloud/update.sh            | 0
 {blueprints => jailman/blueprints}/organizr/config.yml            | 0
 .../blueprints}/organizr/includes/custom/organizr.conf            | 0
 .../blueprints}/organizr/includes/custom/phpblock.conf            | 0
 {blueprints => jailman/blueprints}/organizr/includes/nginx.conf   | 0
 {blueprints => jailman/blueprints}/organizr/install.sh            | 0
 {blueprints => jailman/blueprints}/organizr/readme.md             | 0
 {blueprints => jailman/blueprints}/organizr/update.sh             | 0
 {blueprints => jailman/blueprints}/plex/config.yml                | 0
 {blueprints => jailman/blueprints}/plex/includes/FreeBSD.conf     | 0
 {blueprints => jailman/blueprints}/plex/install.sh                | 0
 {blueprints => jailman/blueprints}/plex/readme.md                 | 0
 {blueprints => jailman/blueprints}/plex/update.sh                 | 0
 {blueprints => jailman/blueprints}/radarr/config.yml              | 0
 {blueprints => jailman/blueprints}/radarr/includes/radarr.rc      | 0
 {blueprints => jailman/blueprints}/radarr/install.sh              | 0
 {blueprints => jailman/blueprints}/radarr/readme.md               | 0
 {blueprints => jailman/blueprints}/radarr/update.sh               | 0
 {blueprints => jailman/blueprints}/sonarr/config.yml              | 0
 {blueprints => jailman/blueprints}/sonarr/includes/sonarr.rc      | 0
 {blueprints => jailman/blueprints}/sonarr/install.sh              | 0
 {blueprints => jailman/blueprints}/sonarr/readme.md               | 0
 {blueprints => jailman/blueprints}/sonarr/update.sh               | 0
 {blueprints => jailman/blueprints}/tautulli/config.yml            | 0
 {blueprints => jailman/blueprints}/tautulli/install.sh            | 0
 {blueprints => jailman/blueprints}/tautulli/readme.md             | 0
 {blueprints => jailman/blueprints}/tautulli/update.sh             | 0
 {blueprints => jailman/blueprints}/transmission/config.yml        | 0
 {blueprints => jailman/blueprints}/transmission/install.sh        | 0
 {blueprints => jailman/blueprints}/transmission/readme.md         | 0
 {blueprints => jailman/blueprints}/transmission/update.sh         | 0
 {blueprints => jailman/blueprints}/unifi/config.yml               | 0
 {blueprints => jailman/blueprints}/unifi/includes/mongodb.conf    | 0
 {blueprints => jailman/blueprints}/unifi/includes/rc/mongod.rc    | 0
 {blueprints => jailman/blueprints}/unifi/includes/rc/unifi.rc     | 0
 .../blueprints}/unifi/includes/rc/unifi_poller.rc                 | 0
 {blueprints => jailman/blueprints}/unifi/includes/up.conf         | 0
 {blueprints => jailman/blueprints}/unifi/install.sh               | 0
 {blueprints => jailman/blueprints}/unifi/readme.md                | 0
 {blueprints => jailman/blueprints}/unifi/update.sh                | 0
 config.yml.example => jailman/config.yml.example                  | 0
 {docs => jailman/docs}/CODE_OF_CONDUCT.md                         | 0
 {docs => jailman/docs}/CONTRIBUTING.md                            | 0
 {docs => jailman/docs}/blueprints/General                         | 0
 {docs => jailman/docs}/config options.md                          | 0
 {docs => jailman/docs}/index.md                                   | 0
 {docs => jailman/docs}/migration/v1.1.x to v1.2.x.md              | 0
 global.sh => jailman/global.sh                                    | 0
 jailman.sh => jailman/jailman.sh                                  | 0
 mkdocs.yml => jailman/mkdocs.yml                                  | 0
 124 files changed, 0 insertions(+), 0 deletions(-)
 rename {.github => jailman/.github}/CODEOWNERS (100%)
 rename {.github => jailman/.github}/FUNDING.yml (100%)
 rename {.github => jailman/.github}/ISSUE_TEMPLATE/bug_report.md (100%)
 rename {.github => jailman/.github}/ISSUE_TEMPLATE/feature_request.md (100%)
 rename {.github => jailman/.github}/PULL_REQUEST_TEMPLATE/bug_fix.md (100%)
 rename {.github => jailman/.github}/PULL_REQUEST_TEMPLATE/general_improvement.md (100%)
 rename {.github => jailman/.github}/PULL_REQUEST_TEMPLATE/new_blueprint.md (100%)
 rename {.github => jailman/.github}/Readme.md (100%)
 rename {.github => jailman/.github}/SECURITY.md (100%)
 rename {.github => jailman/.github}/workflows/filecheck.yml (100%)
 rename {.github => jailman/.github}/workflows/shellcheck.yml (100%)
 rename {.github => jailman/.github}/workflows/wiki.yml (100%)
 rename .gitignore => jailman/.gitignore (100%)
 rename .shellcheckrc => jailman/.shellcheckrc (100%)
 rename CNAME => jailman/CNAME (100%)
 rename LICENSE => jailman/LICENSE (100%)
 rename LICENSE.BSD2 => jailman/LICENSE.BSD2 (100%)
 rename LICENSE.GPLV2 => jailman/LICENSE.GPLV2 (100%)
 rename {blueprints => jailman/blueprints}/bitwarden/config.yml (100%)
 rename {blueprints => jailman/blueprints}/bitwarden/includes/bitwarden.rc (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/bitwarden/includes/bitwarden.rc.conf (100%)
 rename {blueprints => jailman/blueprints}/bitwarden/install.sh (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/bitwarden/readme.md (100%)
 rename {blueprints => jailman/blueprints}/bitwarden/update.sh (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/influxdb/config.yml (100%)
 rename {blueprints => jailman/blueprints}/influxdb/includes/influxd.conf (100%)
 rename {blueprints => jailman/blueprints}/influxdb/install.sh (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/influxdb/readme.md (100%)
 rename {blueprints => jailman/blueprints}/influxdb/update.sh (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/jackett/config.yml (100%)
 rename {blueprints => jailman/blueprints}/jackett/includes/jackett.rc (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/jackett/install.sh (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/jackett/readme.md (100%)
 rename {blueprints => jailman/blueprints}/jackett/update.sh (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/kms/config.yml (100%)
 rename {blueprints => jailman/blueprints}/kms/includes/Activate_Office_2019_Pro.bat (100%)
 rename {blueprints => jailman/blueprints}/kms/includes/Activate_Windows_10_Pro.bat (100%)
 rename {blueprints => jailman/blueprints}/kms/includes/Activate_Windows_Server_2019_Standard.bat (100%)
 rename {blueprints => jailman/blueprints}/kms/includes/Office-2019-Pro-VLK-Config.xml (100%)
 rename {blueprints => jailman/blueprints}/kms/includes/Readme.md (100%)
 rename {blueprints => jailman/blueprints}/kms/includes/Setup_Office_2019_Pro.txt (100%)
 rename {blueprints => jailman/blueprints}/kms/includes/py_kms.rc (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/kms/install.sh (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/kms/readme.md (100%)
 rename {blueprints => jailman/blueprints}/kms/update.sh (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/lidarr/config.yml (100%)
 rename {blueprints => jailman/blueprints}/lidarr/includes/lidarr.rc (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/lidarr/install.sh (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/lidarr/readme.md (100%)
 rename {blueprints => jailman/blueprints}/lidarr/update.sh (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/mariadb/config.yml (100%)
 rename {blueprints => jailman/blueprints}/mariadb/includes/Caddyfile (100%)
 rename {blueprints => jailman/blueprints}/mariadb/includes/caddy.rc (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/mariadb/includes/config.inc.php (100%)
 rename {blueprints => jailman/blueprints}/mariadb/includes/my.cnf (100%)
 rename {blueprints => jailman/blueprints}/mariadb/install.sh (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/mariadb/readme.md (100%)
 rename {blueprints => jailman/blueprints}/mariadb/update.sh (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/nextcloud/LICENSE (100%)
 rename {blueprints => jailman/blueprints}/nextcloud/config.yml (100%)
 rename {blueprints => jailman/blueprints}/nextcloud/includes/Caddyfile (100%)
 rename {blueprints => jailman/blueprints}/nextcloud/includes/Caddyfile-nossl (100%)
 rename {blueprints => jailman/blueprints}/nextcloud/includes/Caddyfile-selfsigned (100%)
 rename {blueprints => jailman/blueprints}/nextcloud/includes/caddy.rc (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/nextcloud/includes/my-system.cnf (100%)
 rename {blueprints => jailman/blueprints}/nextcloud/includes/my.cnf (100%)
 rename {blueprints => jailman/blueprints}/nextcloud/includes/pgpass (100%)
 rename {blueprints => jailman/blueprints}/nextcloud/includes/php.ini (100%)
 rename {blueprints => jailman/blueprints}/nextcloud/includes/redis.conf (100%)
 rename {blueprints => jailman/blueprints}/nextcloud/includes/remove-staging.sh (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/nextcloud/includes/www-crontab (100%)
 rename {blueprints => jailman/blueprints}/nextcloud/includes/www.conf (100%)
 rename {blueprints => jailman/blueprints}/nextcloud/install.sh (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/nextcloud/readme.md (100%)
 rename {blueprints => jailman/blueprints}/nextcloud/update.sh (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/organizr/config.yml (100%)
 rename {blueprints => jailman/blueprints}/organizr/includes/custom/organizr.conf (100%)
 rename {blueprints => jailman/blueprints}/organizr/includes/custom/phpblock.conf (100%)
 rename {blueprints => jailman/blueprints}/organizr/includes/nginx.conf (100%)
 rename {blueprints => jailman/blueprints}/organizr/install.sh (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/organizr/readme.md (100%)
 rename {blueprints => jailman/blueprints}/organizr/update.sh (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/plex/config.yml (100%)
 rename {blueprints => jailman/blueprints}/plex/includes/FreeBSD.conf (100%)
 rename {blueprints => jailman/blueprints}/plex/install.sh (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/plex/readme.md (100%)
 rename {blueprints => jailman/blueprints}/plex/update.sh (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/radarr/config.yml (100%)
 rename {blueprints => jailman/blueprints}/radarr/includes/radarr.rc (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/radarr/install.sh (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/radarr/readme.md (100%)
 rename {blueprints => jailman/blueprints}/radarr/update.sh (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/sonarr/config.yml (100%)
 rename {blueprints => jailman/blueprints}/sonarr/includes/sonarr.rc (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/sonarr/install.sh (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/sonarr/readme.md (100%)
 rename {blueprints => jailman/blueprints}/sonarr/update.sh (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/tautulli/config.yml (100%)
 rename {blueprints => jailman/blueprints}/tautulli/install.sh (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/tautulli/readme.md (100%)
 rename {blueprints => jailman/blueprints}/tautulli/update.sh (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/transmission/config.yml (100%)
 rename {blueprints => jailman/blueprints}/transmission/install.sh (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/transmission/readme.md (100%)
 rename {blueprints => jailman/blueprints}/transmission/update.sh (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/unifi/config.yml (100%)
 rename {blueprints => jailman/blueprints}/unifi/includes/mongodb.conf (100%)
 rename {blueprints => jailman/blueprints}/unifi/includes/rc/mongod.rc (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/unifi/includes/rc/unifi.rc (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/unifi/includes/rc/unifi_poller.rc (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/unifi/includes/up.conf (100%)
 rename {blueprints => jailman/blueprints}/unifi/install.sh (100%)
 mode change 100755 => 100644
 rename {blueprints => jailman/blueprints}/unifi/readme.md (100%)
 rename {blueprints => jailman/blueprints}/unifi/update.sh (100%)
 mode change 100755 => 100644
 rename config.yml.example => jailman/config.yml.example (100%)
 rename {docs => jailman/docs}/CODE_OF_CONDUCT.md (100%)
 rename {docs => jailman/docs}/CONTRIBUTING.md (100%)
 rename {docs => jailman/docs}/blueprints/General (100%)
 rename {docs => jailman/docs}/config options.md (100%)
 rename {docs => jailman/docs}/index.md (100%)
 rename {docs => jailman/docs}/migration/v1.1.x to v1.2.x.md (100%)
 rename global.sh => jailman/global.sh (100%)
 mode change 100755 => 100644
 rename jailman.sh => jailman/jailman.sh (100%)
 mode change 100755 => 100644
 rename mkdocs.yml => jailman/mkdocs.yml (100%)

diff --git a/.github/CODEOWNERS b/jailman/.github/CODEOWNERS
similarity index 100%
rename from .github/CODEOWNERS
rename to jailman/.github/CODEOWNERS
diff --git a/.github/FUNDING.yml b/jailman/.github/FUNDING.yml
similarity index 100%
rename from .github/FUNDING.yml
rename to jailman/.github/FUNDING.yml
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/jailman/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/bug_report.md
rename to jailman/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/jailman/.github/ISSUE_TEMPLATE/feature_request.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/feature_request.md
rename to jailman/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/.github/PULL_REQUEST_TEMPLATE/bug_fix.md b/jailman/.github/PULL_REQUEST_TEMPLATE/bug_fix.md
similarity index 100%
rename from .github/PULL_REQUEST_TEMPLATE/bug_fix.md
rename to jailman/.github/PULL_REQUEST_TEMPLATE/bug_fix.md
diff --git a/.github/PULL_REQUEST_TEMPLATE/general_improvement.md b/jailman/.github/PULL_REQUEST_TEMPLATE/general_improvement.md
similarity index 100%
rename from .github/PULL_REQUEST_TEMPLATE/general_improvement.md
rename to jailman/.github/PULL_REQUEST_TEMPLATE/general_improvement.md
diff --git a/.github/PULL_REQUEST_TEMPLATE/new_blueprint.md b/jailman/.github/PULL_REQUEST_TEMPLATE/new_blueprint.md
similarity index 100%
rename from .github/PULL_REQUEST_TEMPLATE/new_blueprint.md
rename to jailman/.github/PULL_REQUEST_TEMPLATE/new_blueprint.md
diff --git a/.github/Readme.md b/jailman/.github/Readme.md
similarity index 100%
rename from .github/Readme.md
rename to jailman/.github/Readme.md
diff --git a/.github/SECURITY.md b/jailman/.github/SECURITY.md
similarity index 100%
rename from .github/SECURITY.md
rename to jailman/.github/SECURITY.md
diff --git a/.github/workflows/filecheck.yml b/jailman/.github/workflows/filecheck.yml
similarity index 100%
rename from .github/workflows/filecheck.yml
rename to jailman/.github/workflows/filecheck.yml
diff --git a/.github/workflows/shellcheck.yml b/jailman/.github/workflows/shellcheck.yml
similarity index 100%
rename from .github/workflows/shellcheck.yml
rename to jailman/.github/workflows/shellcheck.yml
diff --git a/.github/workflows/wiki.yml b/jailman/.github/workflows/wiki.yml
similarity index 100%
rename from .github/workflows/wiki.yml
rename to jailman/.github/workflows/wiki.yml
diff --git a/.gitignore b/jailman/.gitignore
similarity index 100%
rename from .gitignore
rename to jailman/.gitignore
diff --git a/.shellcheckrc b/jailman/.shellcheckrc
similarity index 100%
rename from .shellcheckrc
rename to jailman/.shellcheckrc
diff --git a/CNAME b/jailman/CNAME
similarity index 100%
rename from CNAME
rename to jailman/CNAME
diff --git a/LICENSE b/jailman/LICENSE
similarity index 100%
rename from LICENSE
rename to jailman/LICENSE
diff --git a/LICENSE.BSD2 b/jailman/LICENSE.BSD2
similarity index 100%
rename from LICENSE.BSD2
rename to jailman/LICENSE.BSD2
diff --git a/LICENSE.GPLV2 b/jailman/LICENSE.GPLV2
similarity index 100%
rename from LICENSE.GPLV2
rename to jailman/LICENSE.GPLV2
diff --git a/blueprints/bitwarden/config.yml b/jailman/blueprints/bitwarden/config.yml
similarity index 100%
rename from blueprints/bitwarden/config.yml
rename to jailman/blueprints/bitwarden/config.yml
diff --git a/blueprints/bitwarden/includes/bitwarden.rc b/jailman/blueprints/bitwarden/includes/bitwarden.rc
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/bitwarden/includes/bitwarden.rc
rename to jailman/blueprints/bitwarden/includes/bitwarden.rc
diff --git a/blueprints/bitwarden/includes/bitwarden.rc.conf b/jailman/blueprints/bitwarden/includes/bitwarden.rc.conf
similarity index 100%
rename from blueprints/bitwarden/includes/bitwarden.rc.conf
rename to jailman/blueprints/bitwarden/includes/bitwarden.rc.conf
diff --git a/blueprints/bitwarden/install.sh b/jailman/blueprints/bitwarden/install.sh
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/bitwarden/install.sh
rename to jailman/blueprints/bitwarden/install.sh
diff --git a/blueprints/bitwarden/readme.md b/jailman/blueprints/bitwarden/readme.md
similarity index 100%
rename from blueprints/bitwarden/readme.md
rename to jailman/blueprints/bitwarden/readme.md
diff --git a/blueprints/bitwarden/update.sh b/jailman/blueprints/bitwarden/update.sh
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/bitwarden/update.sh
rename to jailman/blueprints/bitwarden/update.sh
diff --git a/blueprints/influxdb/config.yml b/jailman/blueprints/influxdb/config.yml
similarity index 100%
rename from blueprints/influxdb/config.yml
rename to jailman/blueprints/influxdb/config.yml
diff --git a/blueprints/influxdb/includes/influxd.conf b/jailman/blueprints/influxdb/includes/influxd.conf
similarity index 100%
rename from blueprints/influxdb/includes/influxd.conf
rename to jailman/blueprints/influxdb/includes/influxd.conf
diff --git a/blueprints/influxdb/install.sh b/jailman/blueprints/influxdb/install.sh
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/influxdb/install.sh
rename to jailman/blueprints/influxdb/install.sh
diff --git a/blueprints/influxdb/readme.md b/jailman/blueprints/influxdb/readme.md
similarity index 100%
rename from blueprints/influxdb/readme.md
rename to jailman/blueprints/influxdb/readme.md
diff --git a/blueprints/influxdb/update.sh b/jailman/blueprints/influxdb/update.sh
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/influxdb/update.sh
rename to jailman/blueprints/influxdb/update.sh
diff --git a/blueprints/jackett/config.yml b/jailman/blueprints/jackett/config.yml
similarity index 100%
rename from blueprints/jackett/config.yml
rename to jailman/blueprints/jackett/config.yml
diff --git a/blueprints/jackett/includes/jackett.rc b/jailman/blueprints/jackett/includes/jackett.rc
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/jackett/includes/jackett.rc
rename to jailman/blueprints/jackett/includes/jackett.rc
diff --git a/blueprints/jackett/install.sh b/jailman/blueprints/jackett/install.sh
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/jackett/install.sh
rename to jailman/blueprints/jackett/install.sh
diff --git a/blueprints/jackett/readme.md b/jailman/blueprints/jackett/readme.md
similarity index 100%
rename from blueprints/jackett/readme.md
rename to jailman/blueprints/jackett/readme.md
diff --git a/blueprints/jackett/update.sh b/jailman/blueprints/jackett/update.sh
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/jackett/update.sh
rename to jailman/blueprints/jackett/update.sh
diff --git a/blueprints/kms/config.yml b/jailman/blueprints/kms/config.yml
similarity index 100%
rename from blueprints/kms/config.yml
rename to jailman/blueprints/kms/config.yml
diff --git a/blueprints/kms/includes/Activate_Office_2019_Pro.bat b/jailman/blueprints/kms/includes/Activate_Office_2019_Pro.bat
similarity index 100%
rename from blueprints/kms/includes/Activate_Office_2019_Pro.bat
rename to jailman/blueprints/kms/includes/Activate_Office_2019_Pro.bat
diff --git a/blueprints/kms/includes/Activate_Windows_10_Pro.bat b/jailman/blueprints/kms/includes/Activate_Windows_10_Pro.bat
similarity index 100%
rename from blueprints/kms/includes/Activate_Windows_10_Pro.bat
rename to jailman/blueprints/kms/includes/Activate_Windows_10_Pro.bat
diff --git a/blueprints/kms/includes/Activate_Windows_Server_2019_Standard.bat b/jailman/blueprints/kms/includes/Activate_Windows_Server_2019_Standard.bat
similarity index 100%
rename from blueprints/kms/includes/Activate_Windows_Server_2019_Standard.bat
rename to jailman/blueprints/kms/includes/Activate_Windows_Server_2019_Standard.bat
diff --git a/blueprints/kms/includes/Office-2019-Pro-VLK-Config.xml b/jailman/blueprints/kms/includes/Office-2019-Pro-VLK-Config.xml
similarity index 100%
rename from blueprints/kms/includes/Office-2019-Pro-VLK-Config.xml
rename to jailman/blueprints/kms/includes/Office-2019-Pro-VLK-Config.xml
diff --git a/blueprints/kms/includes/Readme.md b/jailman/blueprints/kms/includes/Readme.md
similarity index 100%
rename from blueprints/kms/includes/Readme.md
rename to jailman/blueprints/kms/includes/Readme.md
diff --git a/blueprints/kms/includes/Setup_Office_2019_Pro.txt b/jailman/blueprints/kms/includes/Setup_Office_2019_Pro.txt
similarity index 100%
rename from blueprints/kms/includes/Setup_Office_2019_Pro.txt
rename to jailman/blueprints/kms/includes/Setup_Office_2019_Pro.txt
diff --git a/blueprints/kms/includes/py_kms.rc b/jailman/blueprints/kms/includes/py_kms.rc
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/kms/includes/py_kms.rc
rename to jailman/blueprints/kms/includes/py_kms.rc
diff --git a/blueprints/kms/install.sh b/jailman/blueprints/kms/install.sh
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/kms/install.sh
rename to jailman/blueprints/kms/install.sh
diff --git a/blueprints/kms/readme.md b/jailman/blueprints/kms/readme.md
similarity index 100%
rename from blueprints/kms/readme.md
rename to jailman/blueprints/kms/readme.md
diff --git a/blueprints/kms/update.sh b/jailman/blueprints/kms/update.sh
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/kms/update.sh
rename to jailman/blueprints/kms/update.sh
diff --git a/blueprints/lidarr/config.yml b/jailman/blueprints/lidarr/config.yml
similarity index 100%
rename from blueprints/lidarr/config.yml
rename to jailman/blueprints/lidarr/config.yml
diff --git a/blueprints/lidarr/includes/lidarr.rc b/jailman/blueprints/lidarr/includes/lidarr.rc
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/lidarr/includes/lidarr.rc
rename to jailman/blueprints/lidarr/includes/lidarr.rc
diff --git a/blueprints/lidarr/install.sh b/jailman/blueprints/lidarr/install.sh
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/lidarr/install.sh
rename to jailman/blueprints/lidarr/install.sh
diff --git a/blueprints/lidarr/readme.md b/jailman/blueprints/lidarr/readme.md
similarity index 100%
rename from blueprints/lidarr/readme.md
rename to jailman/blueprints/lidarr/readme.md
diff --git a/blueprints/lidarr/update.sh b/jailman/blueprints/lidarr/update.sh
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/lidarr/update.sh
rename to jailman/blueprints/lidarr/update.sh
diff --git a/blueprints/mariadb/config.yml b/jailman/blueprints/mariadb/config.yml
similarity index 100%
rename from blueprints/mariadb/config.yml
rename to jailman/blueprints/mariadb/config.yml
diff --git a/blueprints/mariadb/includes/Caddyfile b/jailman/blueprints/mariadb/includes/Caddyfile
similarity index 100%
rename from blueprints/mariadb/includes/Caddyfile
rename to jailman/blueprints/mariadb/includes/Caddyfile
diff --git a/blueprints/mariadb/includes/caddy.rc b/jailman/blueprints/mariadb/includes/caddy.rc
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/mariadb/includes/caddy.rc
rename to jailman/blueprints/mariadb/includes/caddy.rc
diff --git a/blueprints/mariadb/includes/config.inc.php b/jailman/blueprints/mariadb/includes/config.inc.php
similarity index 100%
rename from blueprints/mariadb/includes/config.inc.php
rename to jailman/blueprints/mariadb/includes/config.inc.php
diff --git a/blueprints/mariadb/includes/my.cnf b/jailman/blueprints/mariadb/includes/my.cnf
similarity index 100%
rename from blueprints/mariadb/includes/my.cnf
rename to jailman/blueprints/mariadb/includes/my.cnf
diff --git a/blueprints/mariadb/install.sh b/jailman/blueprints/mariadb/install.sh
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/mariadb/install.sh
rename to jailman/blueprints/mariadb/install.sh
diff --git a/blueprints/mariadb/readme.md b/jailman/blueprints/mariadb/readme.md
similarity index 100%
rename from blueprints/mariadb/readme.md
rename to jailman/blueprints/mariadb/readme.md
diff --git a/blueprints/mariadb/update.sh b/jailman/blueprints/mariadb/update.sh
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/mariadb/update.sh
rename to jailman/blueprints/mariadb/update.sh
diff --git a/blueprints/nextcloud/LICENSE b/jailman/blueprints/nextcloud/LICENSE
similarity index 100%
rename from blueprints/nextcloud/LICENSE
rename to jailman/blueprints/nextcloud/LICENSE
diff --git a/blueprints/nextcloud/config.yml b/jailman/blueprints/nextcloud/config.yml
similarity index 100%
rename from blueprints/nextcloud/config.yml
rename to jailman/blueprints/nextcloud/config.yml
diff --git a/blueprints/nextcloud/includes/Caddyfile b/jailman/blueprints/nextcloud/includes/Caddyfile
similarity index 100%
rename from blueprints/nextcloud/includes/Caddyfile
rename to jailman/blueprints/nextcloud/includes/Caddyfile
diff --git a/blueprints/nextcloud/includes/Caddyfile-nossl b/jailman/blueprints/nextcloud/includes/Caddyfile-nossl
similarity index 100%
rename from blueprints/nextcloud/includes/Caddyfile-nossl
rename to jailman/blueprints/nextcloud/includes/Caddyfile-nossl
diff --git a/blueprints/nextcloud/includes/Caddyfile-selfsigned b/jailman/blueprints/nextcloud/includes/Caddyfile-selfsigned
similarity index 100%
rename from blueprints/nextcloud/includes/Caddyfile-selfsigned
rename to jailman/blueprints/nextcloud/includes/Caddyfile-selfsigned
diff --git a/blueprints/nextcloud/includes/caddy.rc b/jailman/blueprints/nextcloud/includes/caddy.rc
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/nextcloud/includes/caddy.rc
rename to jailman/blueprints/nextcloud/includes/caddy.rc
diff --git a/blueprints/nextcloud/includes/my-system.cnf b/jailman/blueprints/nextcloud/includes/my-system.cnf
similarity index 100%
rename from blueprints/nextcloud/includes/my-system.cnf
rename to jailman/blueprints/nextcloud/includes/my-system.cnf
diff --git a/blueprints/nextcloud/includes/my.cnf b/jailman/blueprints/nextcloud/includes/my.cnf
similarity index 100%
rename from blueprints/nextcloud/includes/my.cnf
rename to jailman/blueprints/nextcloud/includes/my.cnf
diff --git a/blueprints/nextcloud/includes/pgpass b/jailman/blueprints/nextcloud/includes/pgpass
similarity index 100%
rename from blueprints/nextcloud/includes/pgpass
rename to jailman/blueprints/nextcloud/includes/pgpass
diff --git a/blueprints/nextcloud/includes/php.ini b/jailman/blueprints/nextcloud/includes/php.ini
similarity index 100%
rename from blueprints/nextcloud/includes/php.ini
rename to jailman/blueprints/nextcloud/includes/php.ini
diff --git a/blueprints/nextcloud/includes/redis.conf b/jailman/blueprints/nextcloud/includes/redis.conf
similarity index 100%
rename from blueprints/nextcloud/includes/redis.conf
rename to jailman/blueprints/nextcloud/includes/redis.conf
diff --git a/blueprints/nextcloud/includes/remove-staging.sh b/jailman/blueprints/nextcloud/includes/remove-staging.sh
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/nextcloud/includes/remove-staging.sh
rename to jailman/blueprints/nextcloud/includes/remove-staging.sh
diff --git a/blueprints/nextcloud/includes/www-crontab b/jailman/blueprints/nextcloud/includes/www-crontab
similarity index 100%
rename from blueprints/nextcloud/includes/www-crontab
rename to jailman/blueprints/nextcloud/includes/www-crontab
diff --git a/blueprints/nextcloud/includes/www.conf b/jailman/blueprints/nextcloud/includes/www.conf
similarity index 100%
rename from blueprints/nextcloud/includes/www.conf
rename to jailman/blueprints/nextcloud/includes/www.conf
diff --git a/blueprints/nextcloud/install.sh b/jailman/blueprints/nextcloud/install.sh
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/nextcloud/install.sh
rename to jailman/blueprints/nextcloud/install.sh
diff --git a/blueprints/nextcloud/readme.md b/jailman/blueprints/nextcloud/readme.md
similarity index 100%
rename from blueprints/nextcloud/readme.md
rename to jailman/blueprints/nextcloud/readme.md
diff --git a/blueprints/nextcloud/update.sh b/jailman/blueprints/nextcloud/update.sh
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/nextcloud/update.sh
rename to jailman/blueprints/nextcloud/update.sh
diff --git a/blueprints/organizr/config.yml b/jailman/blueprints/organizr/config.yml
similarity index 100%
rename from blueprints/organizr/config.yml
rename to jailman/blueprints/organizr/config.yml
diff --git a/blueprints/organizr/includes/custom/organizr.conf b/jailman/blueprints/organizr/includes/custom/organizr.conf
similarity index 100%
rename from blueprints/organizr/includes/custom/organizr.conf
rename to jailman/blueprints/organizr/includes/custom/organizr.conf
diff --git a/blueprints/organizr/includes/custom/phpblock.conf b/jailman/blueprints/organizr/includes/custom/phpblock.conf
similarity index 100%
rename from blueprints/organizr/includes/custom/phpblock.conf
rename to jailman/blueprints/organizr/includes/custom/phpblock.conf
diff --git a/blueprints/organizr/includes/nginx.conf b/jailman/blueprints/organizr/includes/nginx.conf
similarity index 100%
rename from blueprints/organizr/includes/nginx.conf
rename to jailman/blueprints/organizr/includes/nginx.conf
diff --git a/blueprints/organizr/install.sh b/jailman/blueprints/organizr/install.sh
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/organizr/install.sh
rename to jailman/blueprints/organizr/install.sh
diff --git a/blueprints/organizr/readme.md b/jailman/blueprints/organizr/readme.md
similarity index 100%
rename from blueprints/organizr/readme.md
rename to jailman/blueprints/organizr/readme.md
diff --git a/blueprints/organizr/update.sh b/jailman/blueprints/organizr/update.sh
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/organizr/update.sh
rename to jailman/blueprints/organizr/update.sh
diff --git a/blueprints/plex/config.yml b/jailman/blueprints/plex/config.yml
similarity index 100%
rename from blueprints/plex/config.yml
rename to jailman/blueprints/plex/config.yml
diff --git a/blueprints/plex/includes/FreeBSD.conf b/jailman/blueprints/plex/includes/FreeBSD.conf
similarity index 100%
rename from blueprints/plex/includes/FreeBSD.conf
rename to jailman/blueprints/plex/includes/FreeBSD.conf
diff --git a/blueprints/plex/install.sh b/jailman/blueprints/plex/install.sh
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/plex/install.sh
rename to jailman/blueprints/plex/install.sh
diff --git a/blueprints/plex/readme.md b/jailman/blueprints/plex/readme.md
similarity index 100%
rename from blueprints/plex/readme.md
rename to jailman/blueprints/plex/readme.md
diff --git a/blueprints/plex/update.sh b/jailman/blueprints/plex/update.sh
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/plex/update.sh
rename to jailman/blueprints/plex/update.sh
diff --git a/blueprints/radarr/config.yml b/jailman/blueprints/radarr/config.yml
similarity index 100%
rename from blueprints/radarr/config.yml
rename to jailman/blueprints/radarr/config.yml
diff --git a/blueprints/radarr/includes/radarr.rc b/jailman/blueprints/radarr/includes/radarr.rc
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/radarr/includes/radarr.rc
rename to jailman/blueprints/radarr/includes/radarr.rc
diff --git a/blueprints/radarr/install.sh b/jailman/blueprints/radarr/install.sh
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/radarr/install.sh
rename to jailman/blueprints/radarr/install.sh
diff --git a/blueprints/radarr/readme.md b/jailman/blueprints/radarr/readme.md
similarity index 100%
rename from blueprints/radarr/readme.md
rename to jailman/blueprints/radarr/readme.md
diff --git a/blueprints/radarr/update.sh b/jailman/blueprints/radarr/update.sh
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/radarr/update.sh
rename to jailman/blueprints/radarr/update.sh
diff --git a/blueprints/sonarr/config.yml b/jailman/blueprints/sonarr/config.yml
similarity index 100%
rename from blueprints/sonarr/config.yml
rename to jailman/blueprints/sonarr/config.yml
diff --git a/blueprints/sonarr/includes/sonarr.rc b/jailman/blueprints/sonarr/includes/sonarr.rc
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/sonarr/includes/sonarr.rc
rename to jailman/blueprints/sonarr/includes/sonarr.rc
diff --git a/blueprints/sonarr/install.sh b/jailman/blueprints/sonarr/install.sh
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/sonarr/install.sh
rename to jailman/blueprints/sonarr/install.sh
diff --git a/blueprints/sonarr/readme.md b/jailman/blueprints/sonarr/readme.md
similarity index 100%
rename from blueprints/sonarr/readme.md
rename to jailman/blueprints/sonarr/readme.md
diff --git a/blueprints/sonarr/update.sh b/jailman/blueprints/sonarr/update.sh
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/sonarr/update.sh
rename to jailman/blueprints/sonarr/update.sh
diff --git a/blueprints/tautulli/config.yml b/jailman/blueprints/tautulli/config.yml
similarity index 100%
rename from blueprints/tautulli/config.yml
rename to jailman/blueprints/tautulli/config.yml
diff --git a/blueprints/tautulli/install.sh b/jailman/blueprints/tautulli/install.sh
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/tautulli/install.sh
rename to jailman/blueprints/tautulli/install.sh
diff --git a/blueprints/tautulli/readme.md b/jailman/blueprints/tautulli/readme.md
similarity index 100%
rename from blueprints/tautulli/readme.md
rename to jailman/blueprints/tautulli/readme.md
diff --git a/blueprints/tautulli/update.sh b/jailman/blueprints/tautulli/update.sh
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/tautulli/update.sh
rename to jailman/blueprints/tautulli/update.sh
diff --git a/blueprints/transmission/config.yml b/jailman/blueprints/transmission/config.yml
similarity index 100%
rename from blueprints/transmission/config.yml
rename to jailman/blueprints/transmission/config.yml
diff --git a/blueprints/transmission/install.sh b/jailman/blueprints/transmission/install.sh
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/transmission/install.sh
rename to jailman/blueprints/transmission/install.sh
diff --git a/blueprints/transmission/readme.md b/jailman/blueprints/transmission/readme.md
similarity index 100%
rename from blueprints/transmission/readme.md
rename to jailman/blueprints/transmission/readme.md
diff --git a/blueprints/transmission/update.sh b/jailman/blueprints/transmission/update.sh
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/transmission/update.sh
rename to jailman/blueprints/transmission/update.sh
diff --git a/blueprints/unifi/config.yml b/jailman/blueprints/unifi/config.yml
similarity index 100%
rename from blueprints/unifi/config.yml
rename to jailman/blueprints/unifi/config.yml
diff --git a/blueprints/unifi/includes/mongodb.conf b/jailman/blueprints/unifi/includes/mongodb.conf
similarity index 100%
rename from blueprints/unifi/includes/mongodb.conf
rename to jailman/blueprints/unifi/includes/mongodb.conf
diff --git a/blueprints/unifi/includes/rc/mongod.rc b/jailman/blueprints/unifi/includes/rc/mongod.rc
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/unifi/includes/rc/mongod.rc
rename to jailman/blueprints/unifi/includes/rc/mongod.rc
diff --git a/blueprints/unifi/includes/rc/unifi.rc b/jailman/blueprints/unifi/includes/rc/unifi.rc
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/unifi/includes/rc/unifi.rc
rename to jailman/blueprints/unifi/includes/rc/unifi.rc
diff --git a/blueprints/unifi/includes/rc/unifi_poller.rc b/jailman/blueprints/unifi/includes/rc/unifi_poller.rc
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/unifi/includes/rc/unifi_poller.rc
rename to jailman/blueprints/unifi/includes/rc/unifi_poller.rc
diff --git a/blueprints/unifi/includes/up.conf b/jailman/blueprints/unifi/includes/up.conf
similarity index 100%
rename from blueprints/unifi/includes/up.conf
rename to jailman/blueprints/unifi/includes/up.conf
diff --git a/blueprints/unifi/install.sh b/jailman/blueprints/unifi/install.sh
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/unifi/install.sh
rename to jailman/blueprints/unifi/install.sh
diff --git a/blueprints/unifi/readme.md b/jailman/blueprints/unifi/readme.md
similarity index 100%
rename from blueprints/unifi/readme.md
rename to jailman/blueprints/unifi/readme.md
diff --git a/blueprints/unifi/update.sh b/jailman/blueprints/unifi/update.sh
old mode 100755
new mode 100644
similarity index 100%
rename from blueprints/unifi/update.sh
rename to jailman/blueprints/unifi/update.sh
diff --git a/config.yml.example b/jailman/config.yml.example
similarity index 100%
rename from config.yml.example
rename to jailman/config.yml.example
diff --git a/docs/CODE_OF_CONDUCT.md b/jailman/docs/CODE_OF_CONDUCT.md
similarity index 100%
rename from docs/CODE_OF_CONDUCT.md
rename to jailman/docs/CODE_OF_CONDUCT.md
diff --git a/docs/CONTRIBUTING.md b/jailman/docs/CONTRIBUTING.md
similarity index 100%
rename from docs/CONTRIBUTING.md
rename to jailman/docs/CONTRIBUTING.md
diff --git a/docs/blueprints/General b/jailman/docs/blueprints/General
similarity index 100%
rename from docs/blueprints/General
rename to jailman/docs/blueprints/General
diff --git a/docs/config options.md b/jailman/docs/config options.md
similarity index 100%
rename from docs/config options.md
rename to jailman/docs/config options.md
diff --git a/docs/index.md b/jailman/docs/index.md
similarity index 100%
rename from docs/index.md
rename to jailman/docs/index.md
diff --git a/docs/migration/v1.1.x to v1.2.x.md b/jailman/docs/migration/v1.1.x to v1.2.x.md
similarity index 100%
rename from docs/migration/v1.1.x to v1.2.x.md
rename to jailman/docs/migration/v1.1.x to v1.2.x.md
diff --git a/global.sh b/jailman/global.sh
old mode 100755
new mode 100644
similarity index 100%
rename from global.sh
rename to jailman/global.sh
diff --git a/jailman.sh b/jailman/jailman.sh
old mode 100755
new mode 100644
similarity index 100%
rename from jailman.sh
rename to jailman/jailman.sh
diff --git a/mkdocs.yml b/jailman/mkdocs.yml
similarity index 100%
rename from mkdocs.yml
rename to jailman/mkdocs.yml