scip/jaildk
1
0
Fork 0
mirror of https://codeberg.org/scip/jaildk.git synced 2025-12-17 04:31:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9 from Culsu/dev

Browse Source 
Some convenience functions
This commit is contained in:
T.v.Dein
2020-11-30 16:13:31 +01:00
committed by GitHub
parent 90b462b46a fd005a5404
commit b5cc5842f5
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@@ -52,12 +52,12 @@ Refer to [jail(8)](https://www.freebsd.org/cgi/man.cgi?query=jail&sektion=8) for
Next add the following lines to your `/etc/rc.conf`: Next add the following lines to your `/etc/rc.conf`:
``` ```
ifconfig_em0_alias0="inet 144.76.67.168/32" ifconfig_em0_alias0="inet 172.16.1.1/32"
jail_enable="YES" jail_enable="YES"
``` ```
You may need to replace the interface name `em0` with the one in use on your system. You may need to replace the interface name `em0` with the one in use on your system.
You might need to restart the interface to apply the alias: `/etc/rc.d/netif restart`.
### Create the jail ### Create the jail
``` ```
@@ -197,7 +197,7 @@ fcgiwrap is running as pid 37682.
### Login into the running jail for administration ### Login into the running jail for administration
``` ```
# jaildk jlogin myjail # jaildk login myjail
``` ```
You can use this to login into a database or execute commands inside the jail. You can use this to login into a database or execute commands inside the jail.

11
jaildk Normal file → Executable file
View File

@@ -751,6 +751,7 @@ jaildk_clone() {
echo echo
else else
. $j/etc/$src/jail.conf . $j/etc/$src/jail.conf
jail=$new
bold "To mount the build chroot of the new jail, execute:" bold "To mount the build chroot of the new jail, execute:"
echo "jaildk build $new start $base $newversion" echo "jaildk build $new start $base $newversion"
fi fi
@@ -763,6 +764,9 @@ Create a new jail from template."
jaildk_create() { jaildk_create() {
jail=$1 jail=$1
# $jail gets overwritten in jaildk_clone or some subcall to .template :-( ...
newjail=$jail
src=.template src=.template
if test -z "$jail"; then if test -z "$jail"; then
@@ -774,8 +778,13 @@ jaildk_create() {
newversion=`date +%Y%m%d` newversion=`date +%Y%m%d`
mkdir -p $j/etc/$jail mkdir -p $j/etc/$jail
jaildk_clone -s $src -d $jail -o $srcversion -n $newversion jaildk_clone -s $src -d $jail -o $srcversion -n $newversion
# some perl magic to extract the hostname (if any) from /etc/jail.conf - and write it into the jails rc.conf
jailhostname=$(cat /etc/jail.conf | tr -d '\t\r\n ' | perl -ne '$_ =~ /.*'"$newjail"'(\{(?:\{.*\}|[^{])*\})|\w+/; print $1;' | grep -oE 'hostname=[^;]+' | cut -d= -f2)
[ -n "$jailhostname" ] && sed -iE 's/^hostname.*$/hostname="'"$jailhostname"'"/' $j/etc/$newjail/local-etc-$newversion/rc.conf
} }
remove() { remove() {