replaced vpn keepalive

by reconnecting for every cronjob

Author: JM-Lemmi

grades-docker/Dockerfile

@@ -11,7 +11,7 @@ RUN pip install git+https://github.com/TINF21CS1/python-campusnet@dev
 COPY grades.sh /app/grades.sh
 RUN chmod 777 /app/grades.sh; chmod +x /app/grades.sh
 RUN crontab -l /cron
-RUN echo "0 7-23 * * * /bin/sh /app/grades.sh\n0/5 * * * * ping -c 4 www.google.com" >> /cron
+RUN echo "0 7-23 * * * /bin/sh /app/grades.sh" >> /cron
 RUN crontab /cron
 RUN rm /cron
 

grades-docker/entrypoint.sh

@@ -6,8 +6,6 @@ if [[ -z "${NOTIFY_RECIPIENT}" ]]; then
   NOTIFY_RECIPIENT="${USERNAME}"
 fi
 
-echo $PASSWORD | openconnect -b --user=$VPNUSERNAME --authgroup=$AUTHGROUP --passwd-on-stdin $HOST
-echo "$(date +"%b %d %H:%M:%S") $HOSTNAME entrypoint.sh[$$]: Started openconnect."
 echo -e "root=${USERNAME}\nmailhub=studgate.dhbw-mannheim.de:25\nrewriteDomain=student.dhbw-mannheim.de\nhostname=campusnet.docker.local\nAuthUser=${USERNAME}\nAuthPass=${PASSWORD}\nAuthMethod=LOGIN\nFromLineOverride=yes" > /etc/ssmtp/ssmtp.conf
 echo -e "root:${USERNAME}:studgate.dhbw-mannheim.de:25" > /etc/ssmtp/revaliases
 echo "$(date +"%b %d %H:%M:%S") $HOSTNAME entrypoint.sh[$$]: Updated ssmtp configuration."

grades-docker/grades.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
+
+echo $PASSWORD | openconnect -b --user=$VPNUSERNAME --authgroup=$AUTHGROUP --passwd-on-stdin $HOST
+echo "$(date +"%b %d %H:%M:%S") $HOSTNAME grades.sh[$$]: Started openconnect in background."
 
 python3 -m campusnet $USERNAME $PASSWORD -o table > /tmp/grades.txt
 if [ ! -s grades.txt ]; then
@@ -12,4 +15,7 @@ if [ -s /tmp/diff.txt ]; then
 else
     echo "$(date +"%b %d %H:%M:%S") $HOSTNAME grades.sh[$$]: No changes detected."
 fi
-mv /tmp/grades.txt grades.tx
+mv /tmp/grades.txt grades.txt
+
+/usr/bin/killall openconnect
+echo "$(date +"%b %d %H:%M:%S") $HOSTNAME grades.sh[$$]: Killed openconnect."