julian/scale-catalog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Automatically detect mountpoint for iocage (#80)

Browse Source 
* 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
This commit is contained in:
Kjeld Schouten-Lebbing 2020-04-25 19:47:11 +02:00 committed by kjeld Schouten-Lebbing
parent dc6eb4a4b7
commit 759da942d2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.yml.example
View File

@ -3,8 +3,6 @@ global:
dataset: dataset:
# dataset for internal jail config files # dataset for internal jail config files
config: tank/apps config: tank/apps
# Iocage root dataset
iocage: tank/iocage
# Media library dataset # Media library dataset
media: tank/media media: tank/media
# Parent downloads dataset # Parent downloads dataset

3
jailman.sh
View File

@ -84,6 +84,9 @@ while getopts ":i:r:u:d:g:h" opt
esac esac
done 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 # Parse the Config YAML
for configpath in ${SCRIPT_DIR}/jails/*/config.yml; do ! eval $(parse_yaml ${configpath}); done for configpath in ${SCRIPT_DIR}/jails/*/config.yml; do ! eval $(parse_yaml ${configpath}); done
eval $(parse_yaml config.yml) eval $(parse_yaml config.yml)