scale-catalog/global.sh

139 lines
3.9 KiB
Bash
Raw Normal View History

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 20:32:55 +00:00
#!/usr/local/bin/bash
# shellcheck disable=SC1003
# yml Parser function
# Based on https://gist.github.com/pkuczynski/8665367
#
# This function is very picky and complex. Ignore with shellcheck for now.
# shellcheck disable=SC2086,SC2155
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 20:32:55 +00:00
parse_yaml() {
local prefix=${2}
local s='[[:space:]]*' w='[a-zA-Z0-9_]*' fs=$(echo @|tr @ '\034')
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 20:32:55 +00:00
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 '{
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 20:32:55 +00:00
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() {
2020-05-24 21:00:59 +00:00
git remote add upstream https://github.com/jailmanager/jailman.git > /dev/null 2>&1
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 20:32:55 +00:00
echo "checking for updates using Branch: $1"
2020-05-24 21:00:59 +00:00
git fetch upstream
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 20:32:55 +00:00
git update-index -q --refresh
2020-05-24 21:00:59 +00:00
CHANGED=$(git diff --name-only "$1")
if [ -n "$CHANGED" ];
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 20:32:55 +00:00
then
echo "script requires update"
git reset --hard
git checkout "${1}"
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 20:32:55 +00:00
git pull
2020-04-06 21:40:09 +00:00
echo "script updated, please restart the script manually"
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 20:32:55 +00:00
exit 1
else
echo "script up-to-date"
fi
}
jailcreate() {
echo "Checking config..."
[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 15:45:13 +00:00
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
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
[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 15:45:13 +00:00
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
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
[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 15:45:13 +00:00
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
[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 15:45:13 +00:00
echo "Failed to create jail"
exit 1
fi
[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 15:45:13 +00:00
fi
[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 15:45:13 +00:00
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"
iocage exec "${1}" "if [ -z /usr/ports ]; then portsnap fetch extract; else portsnap auto; fi"
[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 15:45:13 +00:00
else
echo "Ports not enabled for blueprint, skipping"
fi
echo "Jail creation completed for ${1}"
}
# $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