Commit Graph
100 Commits
Author SHA1 Message Date
Kjeld Schouten-Lebbing 2e6d9c608c Merge pull request #167 from jailmanager/Ornias1993-patch-1
Create SECURITY.md
2020-05-31 22:35:40 +02:00
Kjeld Schouten-Lebbing 2e4ec58b7e Create SECURITY.md 2020-05-31 22:32:44 +02:00
Kjeld Schouten-Lebbing c1d3b66cb7 Merge pull request #153 from Ornias1993/template_oerhaul
Redo all the templates and remove the old once
2020-05-28 15:06:05 +02:00
kjeld Schouten-Lebbing 558e3be0c8 Redo all the templates and remove the old once 2020-05-28 15:01:21 +02:00
Kjeld Schouten-Lebbing 05c58b6e6e Merge pull request #137 from Ornias1993/poller_update_fix
Don't try to update unifi poller if it isn't installed
2020-05-27 11:05:12 +02:00
Kjeld Schouten-Lebbing e04047de82 Merge pull request #136 from Ornias1993/dataset_error_exit
exit on dataset creation/mount errors
2020-05-27 11:04:57 +02:00
Kjeld Schouten-Lebbing 8f5edba81e Merge pull request #130 from Ornias1993/update_cleanup
Update all the things/blueprints
2020-05-27 11:04:26 +02:00
kjeld Schouten-Lebbing 1dd70ad508 exit on dataset creation/mount errors
Fixes #107 (and other issues)
2020-05-26 23:46:35 +02:00
kjeld Schouten-Lebbing 8cb1af316e 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
2020-05-26 22:26:08 +02:00
Kjeld Schouten-Lebbing 7de49f4297 Make sure mariadb could save persistant (#135)
* Make sure mariadb could save persistant
Fixes #134

* Trigger checks
2020-05-26 17:40:55 +02:00
kjeld Schouten-Lebbing f434cd6125 Don't try to update unifi poller if it isn't installed
Fixes #111
2020-05-26 16:12:21 +02:00
Kjeld Schouten-Lebbing e8acdbc16f Update filecheck.yml 2020-05-26 16:11:37 +02:00
Kjeld Schouten-Lebbing a23c4840e2 Update shellcheck.yml 2020-05-26 16:11:18 +02:00
kjeld Schouten-Lebbing 67318354eb Correct datavase typo 2020-05-26 15:23:41 +02:00
Kjeld Schouten-Lebbing c35208061c Make auto-update git aware (#133)
* Make auto-update git aware
Fixes #106

* Some slight tweaking and bug-fixing
2020-05-26 15:20:44 +02:00
kjeld Schouten-Lebbing 80c0580707 set right repo 2020-05-26 01:28:43 +02:00
kjeld Schouten-Lebbing cdd5127ce6 fix accidentel removed update function and set to dev 2020-05-26 01:10:19 +02:00
Kjeld Schouten-Lebbing b82a02e359 globaly disable shellcheck SC2154 because it isn't compatible with this repo. (#126) 2020-05-25 23:56:14 +02:00
Kjeld Schouten-Lebbing 9348c3a968 add code owners (#123) 2020-05-25 23:56:14 +02:00
kjeld Schouten-Lebbing 0b43d76338 reset to dev branch 2020-05-25 23:56:14 +02:00
Kjeld Schouten-Lebbing dd31b4d094 Merge pull request #119 from Ornias1993/fix_master
devnull all the things, we do our own messages
2020-05-24 23:17:42 +02:00
Kjeld Schouten-Lebbing 4249bd74d9 Merge branch 'master' into fix_master 2020-05-24 23:16:59 +02:00
kjeld Schouten-Lebbing 13be3ca313 dont /dev/null variable, oops 2020-05-24 23:12:31 +02:00
kjeld Schouten-Lebbing 4512edff0d devnull all the things, we do our own messages 2020-05-24 23:11:33 +02:00
Kjeld Schouten-Lebbing 676f32b1ce Merge pull request #118 from Ornias1993/fix_master
Emergency master fix due to move
2020-05-24 23:07:54 +02:00
kjeld Schouten-Lebbing 1b662fdff5 remove cirrus ci 2020-05-24 23:04:35 +02:00
kjeld Schouten-Lebbing 61af3c2e7d change readme references 2020-05-24 23:01:54 +02:00
kjeld Schouten-Lebbing 9483212dba gitfix 2020-05-24 23:00:59 +02:00
Kjeld Schouten-Lebbing 29c0e13eb7 Add placeholder .cirrus.yml 2020-05-24 10:39:39 +02:00
kjeld Schouten-Lebbing 153e0a97fa remove old jail docs 2020-05-22 19:30:57 +02:00
Kjeld Schouten-Lebbing 762cb452f1 test different cp 2020-05-22 19:30:39 +02:00
Kjeld Schouten-Lebbing d4ee43bab6 Add blueprints folder for docs 2020-05-22 19:24:04 +02:00
Kjeld Schouten-Lebbing 0fadea4bef master fix 2020-05-17 14:07:22 +02:00
Kjeld Schouten-Lebbing 6ebb1dd45b Merge pull request #44 from Ornias1993/dev
v1.2.0
2020-05-17 14:04:35 +02:00
kjeld Schouten-Lebbing 9b4bedfa48 Add migration documentation 2020-05-17 14:00:36 +02:00
Kjeld Schouten-Lebbing f6766b3fa2 Fix bitwarden indent 2020-05-08 00:26:51 +02:00
Kjeld Schouten-Lebbing 36e2df80de Add update to readme 2020-05-08 00:26:20 +02:00
kjeld Schouten-Lebbing 137a25595d plex typo fix 2020-05-05 15:05:44 +02:00
kjeld Schouten-Lebbing 17714136c9 set branch to dev 2020-05-05 14:57:15 +02:00
Kjeld Schouten-Lebbing dbfbd489fa [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
2020-05-02 17:45:13 +02:00
Kjeld Schouten-Lebbing 616eb2a432 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.
2020-04-29 16:57:15 +02:00
Kjeld Schouten-Lebbing 8659f2c252 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
2020-04-26 17:56:13 +02:00
Kjeld Schouten-Lebbing 2c75cfe0ea 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
2020-04-26 16:00:47 +02:00
Kjeld Schouten-Lebbing c32ea280da Linter cleanup (#84)
* Fix all Scriptcheck errors on current dev code

* clean recent plex changes
2020-04-26 14:54:00 +02:00
Kjeld Schouten-Lebbing 46d1487191 Add plex transcoding ramdisk creation (#79) 2020-04-26 14:54:00 +02:00
Kjeld Schouten-Lebbing 759da942d2 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
2020-04-26 14:54:00 +02:00
Kjeld Schouten-Lebbing dc6eb4a4b7 Update shellcheck.yml 2020-04-26 14:54:00 +02:00
Kjeld Schouten-Lebbing f0437b87c8 add plex user to video group to enable future hardware encoding jail side. (#78) 2020-04-26 14:53:59 +02:00
Kjeld Schouten-Lebbing d877424c8c Rename plexpass to beta and document the beta flag (#77)
* Rename plexpass to beta and document the beta flag (Fixes: #54)

* Comment cleanup
2020-04-26 14:53:59 +02:00
Kjeld Schouten-Lebbing a60518e02e Update nextcloud (#81)
* Implement freenas-iocage-nextcloud#105

* Implement freenas-iocage-nextcloud#106
2020-04-26 14:53:59 +02:00
Kjeld Schouten-Lebbing 5119ba5120 - Adds documentation for config.yml options (fixes: #70) (#76)
- Describes the dataset structure, included auto-generated datasets (fixes: #68)
2020-04-26 14:53:59 +02:00
Kjeld Schouten-Lebbing 52509f9912 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
2020-04-26 14:53:59 +02:00
Kjeld Schouten-Lebbing 11b66e9711 fix persistence, update readme 2020-04-26 14:53:59 +02:00
Kjeld Schouten-Lebbing b24a7c153a 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
2020-04-26 14:53:59 +02:00
kjeld Schouten-Lebbing 839abbe8ff Add restart warning after update 2020-04-26 14:53:59 +02:00
kjeld Schouten-Lebbing 77f1589701 Add right packages to example config for *arr 2020-04-26 14:53:59 +02:00
kjeld Schouten-Lebbing 8721fcb278 placeholder, dev wipe 2020-04-26 14:53:59 +02:00
Kjeld Schouten-Lebbing ad7f0813a3 delete wiki generation action
This is going to be replaced in 1.2
2020-04-26 14:38:31 +02:00
Kjeld Schouten-Lebbing d5f613617e Create shellcheck.yml 2020-04-25 16:30:14 +02:00
Kjeld Schouten-Lebbing 057df4bad8 Merge pull request #47 from disconn3ct/organizr-fixup
Organizr: missing echo, fixes #46
2020-04-06 13:56:47 +02:00
Kjeld Schouten-Lebbing a0660b0377 Add bitwarden to readme 2020-03-14 00:06:09 +01:00
Kjeld Schouten-Lebbing cd5adfd94b 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
2020-03-13 23:59:05 +01:00
Kjeld Schouten-Lebbing b54921f97e Final update to Home.md to prepare for dev merge 2020-03-12 13:31:57 +01:00
Kjeld Schouten-Lebbing 904f6eb5cf Update and rename test.md to Home.md 2020-03-12 13:30:18 +01:00
Kjeld Schouten-Lebbing 31423fac52 Create test.md 2020-03-12 12:01:16 +01:00
Kjeld Schouten-Lebbing 63bc1cb9ee Update FUNDING.yml 2020-03-10 22:24:17 +01:00
Kjeld Schouten-Lebbing c2fb804281 fixed some mistakes 2020-03-08 12:16:48 +01:00
Kjeld Schouten-Lebbing 35302bf90a Update readme tutorial
As requested by Debug78 on the FreeNAS forum (PM) some more more thorough instructions
2020-03-07 17:39:37 +01:00
kjeld Schouten-Lebbing 30f01cf4d6 Emergency bug fix in config example 2020-03-07 14:10:39 +01:00
Kjeld Schouten-Lebbing 4d8755c9ee Create FUNDING.yml 2020-03-07 11:33:20 +01:00
Kjeld Schouten-Lebbing 4c09ea840c 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
2020-03-06 21:32:55 +01:00
kjeld Schouten-Lebbing d129808e2a bug fix 2020-03-03 00:38:07 +01:00
kjeld Schouten-Lebbing bbc8ea9add make executable 2020-03-02 23:51:33 +01:00
kjeld Schouten-Lebbing fbe7ce58ab initial ombi setup 2020-03-02 23:50:12 +01:00
kjeld Schouten-Lebbing 65bd3805c9 Fixing paths and eval bug 2020-03-01 14:15:09 +01:00
kjeld Schouten-Lebbing 0821f9b9b7 replace wrong product key 2020-02-29 20:14:47 +01:00
kjeld Schouten-Lebbing e5a1130fb2 Add script for Server 2019 Standard 2020-02-29 20:05:04 +01:00
kjeld Schouten-Lebbing d3d95566dc add readme 2020-02-29 19:45:37 +01:00
kjeld Schouten-Lebbing 32a4071350 Add activation guide/data 2020-02-29 19:39:37 +01:00
kjeld Schouten-Lebbing 731d687935 Add windows 10 setup 2020-02-29 17:55:38 +01:00
kjeld Schouten-Lebbing ab76445c11 fix bug 2020-02-29 17:36:12 +01:00
kjeld Schouten-Lebbing 46c1c90d27 make executable 2020-02-29 17:27:50 +01:00
kjeld Schouten-Lebbing ba923083e9 - Cleaned organizr
- Added py-kms windows activation server
2020-02-29 17:26:27 +01:00
kjeld Schouten-Lebbing 813eafcfbd Add transmission 2020-02-28 21:33:40 +01:00
kjeld Schouten-Lebbing b419cbab7c make executable 2020-02-28 16:36:51 +01:00
kjeld Schouten-Lebbing 3cbec21bfc add transmission
fix lidar bugs
remove nzb shizzle
2020-02-28 16:21:57 +01:00
kjeld Schouten-Lebbing 0870c6c8ab all working except lidarr 2020-02-28 12:34:48 +01:00
kjeld Schouten-Lebbing 9510f1f5f7 man 2020-02-28 11:44:13 +01:00
kjeld Schouten-Lebbing c2211a7b52 less headers 2020-02-28 11:25:03 +01:00
kjeld Schouten-Lebbing c5d8d49214 Enable test jackett 2020-02-28 11:12:06 +01:00
kjeld Schouten-Lebbing afcb672ee9 unsec 2020-02-27 23:11:07 +01:00
kjeld Schouten-Lebbing dd11e48003 ok 2020-02-27 23:08:49 +01:00
kjeld Schouten-Lebbing f44d8c49ff rd 2020-02-27 23:02:09 +01:00
kjeld Schouten-Lebbing 5d7b460156 back 2020-02-27 22:56:51 +01:00
kjeld Schouten-Lebbing 69c1654e33 one more 2020-02-27 22:53:09 +01:00
kjeld Schouten-Lebbing 9de2461283 last 2020-02-27 22:51:16 +01:00
kjeld Schouten-Lebbing 71efd71cad from man 2020-02-27 22:43:48 +01:00
kjeld Schouten-Lebbing 7d83cce04e test3 2020-02-27 22:37:07 +01:00
kjeld Schouten-Lebbing f85ef5f6fb test 2020-02-27 22:29:58 +01:00
kjeld Schouten-Lebbing ce6fc7df71 test synthax change 2020-02-27 22:25:33 +01:00