Changed jail creation to always create base jails (#57)

This commit is contained in:
Thorsten Behrens 2020-04-10 07:20:17 -04:00 committed by kjeld Schouten-Lebbing
parent b24a7c153a
commit 520597485a
5 changed files with 5 additions and 9 deletions

View File

@ -68,13 +68,13 @@ else
echo '{"pkgs":['${pkgs}']}' > /tmp/pkg.json echo '{"pkgs":['${pkgs}']}' > /tmp/pkg.json
if [ "${setdhcp}" == "on" ] if [ "${setdhcp}" == "on" ]
then 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 then
echo "Failed to create jail" echo "Failed to create jail"
exit 1 exit 1
fi fi
else 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 then
echo "Failed to create jail" echo "Failed to create jail"
exit 1 exit 1

View File

@ -1,7 +1,6 @@
#!/usr/local/bin/bash #!/usr/local/bin/bash
# This file contains the install script for jackett # 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 "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 "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 rm /usr/local/share/Jackett.Binaries.Mono.tar.gz

View File

@ -10,7 +10,6 @@ createmount lidarr ${global_dataset_media}
createmount lidarr ${global_dataset_media}/music /mnt/music 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 "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 "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 "rm /usr/local/share/Lidarr.develop.0.2.0.371.linux.tar.gz"

View File

@ -9,7 +9,6 @@ createmount radarr ${global_dataset_downloads}/complete /mnt/fetched
createmount radarr ${global_dataset_media} createmount radarr ${global_dataset_media}
createmount radarr ${global_dataset_media}/movies /mnt/movies 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 "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 "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 rm /usr/local/share/Radarr.develop.0.2.0.1480.linux.tar.gz

View File

@ -9,7 +9,6 @@ createmount sonarr ${global_dataset_downloads}/complete /mnt/fetched
createmount sonarr ${global_dataset_media} createmount sonarr ${global_dataset_media}
createmount sonarr ${global_dataset_media}/shows /mnt/shows 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 "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 "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 rm /usr/local/share/NzbDrone.master.tar.gz