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

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

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/