tuto3: various fixes to help students

This commit is contained in:
nemunaire 2021-02-04 09:42:10 +01:00
commit 7a72afc81d
6 changed files with 68 additions and 7 deletions

View file

@ -19,7 +19,8 @@ RUN echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/so
udev \
vim.tiny \
wireguard-tools \
&& rm -rf /var/lib/apt/lists/*
&& rm -rf /var/lib/apt/lists/* \
&& rm -rf /etc/ssh/ssh_host_*_key*
RUN rm -rf /etc/init.d/ && \
mkdir /overlay && \

View file

@ -19,6 +19,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
tcpdump \
udev \
vim.tiny \
&& rm -rf /var/lib/apt/lists/*
&& rm -rf /var/lib/apt/lists/* \
&& rm -rf /etc/ssh/ssh_host_*_key*
COPY sshd_config /etc/ssh/sshd_config

View file

@ -8,7 +8,8 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
python-apt \
systemd-sysv \
vim.tiny \
&& rm -rf /var/lib/apt/lists/*
&& rm -rf /var/lib/apt/lists/* \
&& rm -rf /etc/ssh/ssh_host_*_key*
COPY gai.conf /etc/gai.conf
COPY sshd_config /etc/ssh/sshd_config

View file

@ -12,7 +12,7 @@ cmdline() {
[ -f "/var/lib/adlin/wireguard/adlin.token" ] && WGTOKEN=$(cat /var/lib/adlin/wireguard/adlin.token)
[ -z "${WGTOKEN}" ] && WGTOKEN=$(cmdline adlin.token)
[ -z "${WGTOKEN}" ] && {
echo -n "You didn't define your token to connect the network. Please copy it into /var/lib/adlin/wireguard/adlin.token and reboot."
echo "You didn't define your token to connect the network. Please run here `join-p0m` and then reboot."
exit 1
}
[ -f "/var/lib/adlin/wireguard/adlin.conf" ] && WGPRVKEY=$(sed 's/^.*PrivateKey *= *//p;d' /var/lib/adlin/wireguard/adlin.conf)