diff --git a/cattleshed/cattleshed.conf.in b/cattleshed/cattleshed.conf.in index 5554979..3e7da25 100644 --- a/cattleshed/cattleshed.conf.in +++ b/cattleshed/cattleshed.conf.in @@ -23,7 +23,7 @@ "@CATTLESHED_BINDIR@/cattlegrid", "--uids=10000:1000000000", "--rootdir=./jail", - "--mount=/bin,/etc,/lib,/lib64,/usr/bin,/usr/lib,/usr/include,/opt/wandbox,/usr/share", + "--mount=/bin,/etc,/lib,/lib64,/usr/bin,/usr/include,/usr/lib,/usr/lib64,/usr/libexec,/usr/sbin,/usr/share,/opt/wandbox", "--rwmount=/tmp=./jail/tmp,/home/jail=./store", "--devices=/dev/null,/dev/zero,/dev/full,/dev/random,/dev/urandom", "--chdir=/home/jail", @@ -52,7 +52,7 @@ "@CATTLESHED_BINDIR@/cattlegrid", "--uids=10000:1000000000", "--rootdir=./jail", - "--mount=/bin,/etc,/lib,/lib64,/usr/bin,/usr/lib,/usr/include,/opt/wandbox,/usr/share", + "--mount=/bin,/etc,/lib,/lib64,/usr/bin,/usr/include,/usr/lib,/usr/lib64,/usr/libexec,/usr/sbin,/usr/share,/opt/wandbox", "--rwmount=/tmp=./jail/tmp,/home/jail=./store", "--devices=/dev/null,/dev/zero,/dev/full,/dev/random,/dev/urandom", "--chdir=/home/jail", @@ -80,7 +80,7 @@ "@CATTLESHED_BINDIR@/cattlegrid", "--uids=10000:1000000000", "--rootdir=./jail", - "--mount=/bin,/etc,/lib,/lib64,/usr/bin,/usr/lib,/usr/include,/opt/wandbox,/usr/share", + "--mount=/bin,/etc,/lib,/lib64,/usr/bin,/usr/include,/usr/lib,/usr/lib64,/usr/libexec,/usr/sbin,/usr/share,/opt/wandbox", "--rwmount=/tmp=./jail/tmp,/home/jail=./store", "--devices=/dev/null,/dev/zero,/dev/full,/dev/random,/dev/urandom", "--chdir=/home/jail", @@ -92,63 +92,6 @@ "output-limit-kill":262144, "output-limit-warn":131072, }, - "melpon2-sbcl":{ - "jail-command":[ - "/usr/bin/env", - "HOME=/home/jail", - "/usr/bin/nice", - "@CATTLESHED_BINDIR@/prlimit", - "--core=0", - "--cpu=30", - "--data=1073741824", - "--fsize=5242880", - "--nofile=1024", - "--nproc=128", - "--", - "@CATTLESHED_BINDIR@/cattlegrid", - "--uids=10000:1000000000", - "--rootdir=./jail", - "--mount=/bin,/etc,/lib,/lib64,/usr/bin,/usr/lib,/usr/include,/opt/wandbox,/usr/share", - "--rwmount=/tmp=./jail/tmp,/home/jail=./store", - "--devices=/dev/null,/dev/zero,/dev/full,/dev/random,/dev/urandom", - "--chdir=/home/jail", - "--", - ], - "program-duration":60, - "compile-time-limit":60, - "kill-wait":5, - "output-limit-kill":262144, - "output-limit-warn":131072, - }, - "melpon2-dotnetcore":{ - "jail-command":[ - "/usr/bin/env", - "HOME=/home/jail", - "/usr/bin/nice", - "@CATTLESHED_BINDIR@/prlimit", - "--core=0", - "--cpu=30", - "--data=1073741824", - "--fsize=5242880", - "--nofile=1024", - "--nproc=128", - "--", - "@CATTLESHED_BINDIR@/cattlegrid", - "--uids=10000:1000000000", - "--rootdir=./jail", - "--mount=/bin,/etc,/lib,/lib64,/usr/bin,/usr/lib,/usr/include,/opt/wandbox,/usr/share", - "--rwmount=/tmp=./jail/tmp,/home/jail=./store", - "--devices=/dev/null,/dev/zero,/dev/full,/dev/random,/dev/urandom", - "--chdir=/home/jail", - "--kill", - "--", - ], - "program-duration":60, - "compile-time-limit":60, - "kill-wait":5, - "output-limit-kill":262144, - "output-limit-warn":131072, - }, "melpon2-julia":{ "jail-command":[ "/usr/bin/env", @@ -166,7 +109,7 @@ "@CATTLESHED_BINDIR@/cattlegrid", "--uids=10000:1000000000", "--rootdir=./jail", - "--mount=/bin,/etc,/lib,/lib64,/usr/bin,/usr/lib,/usr/include,/opt/wandbox,/usr/share", + "--mount=/bin,/etc,/lib,/lib64,/usr/bin,/usr/include,/usr/lib,/usr/lib64,/usr/libexec,/usr/sbin,/usr/share,/opt/wandbox", "--rwmount=/home/jail=./store", "--devices=/dev/null,/dev/zero,/dev/full,/dev/random,/dev/urandom", "--chdir=/home/jail", @@ -195,7 +138,7 @@ "@CATTLESHED_BINDIR@/cattlegrid", "--uids=10000:1000000000", "--rootdir=./jail", - "--mount=/bin,/etc,/lib,/lib64,/usr/bin,/usr/lib,/usr/include,/usr/share", + "--mount=/bin,/etc,/lib,/lib64,/usr/bin,/usr/include,/usr/lib,/usr/lib64,/usr/libexec,/usr/sbin,/usr/share,/opt/wandbox", "--rwmount=/tmp=./jail/tmp,/home/jail=./store", "--devices=/dev/null,/dev/zero,/dev/full,/dev/random,/dev/urandom", "--chdir=/home/jail",