This commit is contained in:
SkyperTHC 2023-03-24 08:21:47 +00:00
parent 0b23a4dbd2
commit d1fadfcbd2
No known key found for this signature in database
GPG Key ID: A9BD386DF9113CD6
5 changed files with 14 additions and 6 deletions

@ -33,7 +33,6 @@ services:
# NOTE: _MUST_ not run in host's pid space because we use 'pgrep' to find lg's encfsd pid.
environment:
- SF_REDIS_AUTH=${SF_REDIS_AUTH}
# - SF_REDIS_IP=${SF_REDIS_IP}
- SF_SEED=${SF_SEED}
- SF_DEBUG
command: ["/encfsd.sh"]

@ -524,6 +524,7 @@ RUN /pkg-install.sh DEVEL apt-get install -y --no-install-recommends \
RUN /pkg-install.sh LARGE apt-get install -y --no-install-recommends \
cron \
cups-client \
byobu \
fish \
sshuttle
RUN /pkg-install.sh HUGE apt-get install -y --no-install-recommends \

@ -40,8 +40,8 @@ tty -s && [[ -n $TERM ]] && [[ "$TERM" != dumb ]] && {
[[ ! -t 1 ]] && { command "$cmd" "$@"; return; }
command "$cmd" "$@" | /usr/bin/python3 /usr/bin/grcat "conf.${cmd##*/}"
[[ -n ${PIPESTATUS[0]} ]] && return ${PIPESTATUS[0]}
return ${pipestatus[1]}
[[ -n ${PIPESTATUS[0]} ]] && return ${PIPESTATUS[0]} # bash
return ${pipestatus[1]} # zsh
}
_grcset()

3
host/setup.sh Normal file → Executable file

@ -2,7 +2,8 @@
# Fixing vmbox permissions
chmod 755 /etc /usr /bin
chmod 755 /etc /usr /bin /bin/segfaultsh /bin/webshellsh
chmod 644 /etc/english.txt
echo -e "/bin/segfaultsh\n/bin/webshellsh" >>/etc/shells

@ -269,14 +269,15 @@ command -v snap >/dev/null && snap list --all | awk '/disabled/{print $1, $3}' |
snap remove "$pkg" --revision="$revision"
done
if grep "^#SystemMaxUse=$" /etc/systemd/journald.conf >/dev/null; then
sed -E -i 's/#(SystemMaxUse)=$/\1=10M/g' /etc/systemd/journald.conf
sed 's/#SystemMaxFileSize.*/SystemMaxFileSize=50M/' -i /etc/systemd/journald.conf
sed 's/#SystemMaxUse.*/SystemMaxUse=10M/' -i /etc/systemd/journald.conf
systemctl restart systemd-journald
fi
journalctl --vacuum-size=20M
journalctl --vacuum-time=10d
# NOTE: Only needed if source is mounted into vmbox (for testing)
[[ "$(stat -c %G /segfault 2>/dev/null)" = "vboxsf" ]] && usermod -a -G vboxsf "${SF_HOST_USER}"
[[ "$(stat -c %G /research/segfault 2>/dev/null)" == "vboxsf" ]] && usermod -a -G vboxsf "${SF_HOST_USER}"
# SNAPSHOT #3 (2022-07-22)
# exit
@ -286,6 +287,12 @@ init_config_run
### Create guest, encfs and other docker images.
[[ -z $SF_NO_INTERNET ]] && { cd "${SFI_SRCDIR}" && make || exit; }
# Only needed if installed via
[[ "$(stat -c %G /research/segfault 2>/dev/null)" == "vboxsf" ]] && {
chmod 644 "${SF_CONFDIR}/etc/redis/redis.conf"
chmod 755 "${SF_BASEDIR}/sfbin"
chmod 644 "${SF_BASEDIR}/sfbin/funcs*"
}
# SNAPSHOT #4 (2022-07-22)
# SNAPSHOT #4.1 (2022-07-23)
# exit