mirror of
https://codeberg.org/scip/jaildk.git
synced 2025-12-19 21:51:02 +01:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e728efaff5 | |||
| b8fe0d4c11 | |||
|
|
eabec94945 | ||
| b5efc90d29 |
16
.github/assets/jail.conf
vendored
16
.github/assets/jail.conf
vendored
@@ -1,16 +0,0 @@
|
||||
* {
|
||||
exec.start = "/bin/sh /etc/rc";
|
||||
exec.stop = "/bin/sh /etc/rc.shutdown";
|
||||
allow.raw_sockets = "false";
|
||||
sysvmsg = "new";
|
||||
sysvsem = "new";
|
||||
sysvshm = "new";
|
||||
host.hostname = $name;
|
||||
path = "/jail/run/$name";
|
||||
exec.prestart = "/jail/bin/jaildk install $name start";
|
||||
exec.clean = "true";
|
||||
}
|
||||
|
||||
test {
|
||||
ip4.addr = "172.16.0.1";
|
||||
}
|
||||
52
.github/workflows/ci.yaml
vendored
52
.github/workflows/ci.yaml
vendored
@@ -1,52 +0,0 @@
|
||||
name: Test-Jaildk
|
||||
|
||||
on: [push]
|
||||
|
||||
jobs:
|
||||
test:
|
||||
runs-on: ubuntu-latest
|
||||
name: Test jaildk on FreeBSD
|
||||
steps:
|
||||
- name: checkout
|
||||
uses: actions/checkout@v4
|
||||
- name: Test in FreeBSD
|
||||
uses: vmactions/freebsd-vm@v1
|
||||
id: testjaildk
|
||||
with:
|
||||
release: "14.1"
|
||||
usesh: true
|
||||
prepare: |
|
||||
pkg install -y curl cpdup
|
||||
|
||||
run: |
|
||||
freebsd-version
|
||||
sysctl hw.model
|
||||
sysctl hw.ncpu
|
||||
sysctl hw.physmem
|
||||
sysctl hw.usermem
|
||||
ls -la
|
||||
ifconfig em0 172.16.0.1/32 alias
|
||||
ifconfig -a
|
||||
set -x -e
|
||||
sysrc jail_enable="YES"
|
||||
cp .github/assets/jail.conf /etc/
|
||||
|
||||
cp src/jaildk.sh jaildk
|
||||
sh jaildk setup /jail
|
||||
|
||||
fetch https://download.freebsd.org/ftp/releases/amd64/amd64/14.1-RELEASE/base.txz -o /jail/base/14.1-RELEASE-base.txz
|
||||
mkdir -p /jail/base/14.1-RELEASE
|
||||
tar -xf /jail/base/14.1-RELEASE-base.txz -C /jail/base/14.1-RELEASE --unlink
|
||||
|
||||
/jail/bin/jaildk create test
|
||||
ls -l /jail/etc/test
|
||||
/jail/bin/jaildk build test -m start
|
||||
df -h /jail/build/test/etc
|
||||
|
||||
echo 'sshd_enable="Yes"' > /jail/build/test/usr/local/etc/rc.conf
|
||||
chroot /jail/build/test /etc/rc.d/sshd keygen
|
||||
|
||||
/jail/bin/jaildk start test
|
||||
/jail/bin/jaildk status | grep -E "test|Jail"
|
||||
|
||||
|
||||
11
README.md
11
README.md
@@ -1,4 +1,9 @@
|
||||
[](https://github.com/tlinden/jaildk/actions)
|
||||
> [!CAUTION]
|
||||
> This software is now being maintained on [Codeberg](https://codeberg.org/scip/leo/).
|
||||
>
|
||||
> However, due to limitations with woodpecker FreeBSD support, CI test workflows are still being executed here.
|
||||
>
|
||||
> Devs: no need to push to codeberg and github, there's a mirror script running somewhere else.
|
||||
|
||||
## jaildk - a FreeBSD jail development kit v2.0.4
|
||||
|
||||
@@ -656,7 +661,7 @@ that's the best way for me to forget to do something.
|
||||
|
||||
In order to report a bug, unexpected behavior, feature requests
|
||||
or to submit a patch, please open an issue on github:
|
||||
https://github.com/TLINDEN/jaildk/issues.
|
||||
https://codeberg.org/scip/jaildk/issues.
|
||||
|
||||
## Copyright and license
|
||||
|
||||
@@ -670,5 +675,5 @@ F.Sass (Culsu)
|
||||
|
||||
## Project homepage
|
||||
|
||||
https://github.com/TLINDEN/jaildk
|
||||
https://codeberg.org/scip/jaildk
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
version=2.0.4
|
||||
version=2.0.5
|
||||
|
||||
# this will be completed during build. Don't touch it, just execute
|
||||
# make and use the resulting script!
|
||||
@@ -1532,7 +1532,7 @@ jaildk_login() {
|
||||
fi
|
||||
|
||||
jid=""
|
||||
jid=`jls | grep "$jail" | awk '{print $1}'`
|
||||
jid=$(jls -j "$jail" jid)
|
||||
|
||||
if test -z "$jid"; then
|
||||
echo "jail $jail doesn't run!"
|
||||
@@ -1781,7 +1781,7 @@ jaildk_update() {
|
||||
rcscript=update
|
||||
force=''
|
||||
|
||||
repo="https://github.com/TLINDEN/jaildk.git"
|
||||
repo="https://codeberg.org/scip/jaildk.git"
|
||||
mustberoot
|
||||
|
||||
OPTIND=1; while getopts "f" arg; do
|
||||
|
||||
Reference in New Issue
Block a user