add healthcheck client website and sleep in install TLS cert in firefox

r4ulcl · Dec 21, 2024 · a3902be · a3902be
1 parent 3bf056e
commit a3902be
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -42,8 +42,9 @@ services:
     healthcheck:
       test:
         - CMD-SHELL
-        - /bin/bash -c '
-          if [ $(ps aux | grep wpa_wifichallenge_supplicant | grep -vE "grep|sudo|timeout" | grep -c wpa_wifichallenge_supplicant) -lt 17 ]; then exit 1; fi'
+        - ip netns exec ns-client /bin/bash -c '
+          curl -s http://localhost >/dev/null || exit 1;
+          if [ $(ps aux | grep wpa_wifichallenge_supplicant | grep -vE "grep|sudo|timeout" | grep -c wpa_wifichallenge_supplicant) -lt 17 ]; then exit 2; fi'
       interval: 5s
       timeout: 5s
       retries: 3

diff --git a/vagrant/install.sh b/vagrant/install.sh
@@ -242,6 +242,7 @@ sudo cp /var/WiFiChallengeLab-docker/certs/ca.crt /usr/local/share/ca-certificat
 
 # Configure firefox for TLS
 firefox &
+sleep 10
 CA_CERT_PATH="/var/WiFiChallengeLab-docker/certs/ca.crt"
 PROFILE_PATH="$HOME/.mozilla/firefox"
 PROFILE_DIR=$(ls $PROFILE_PATH | grep -E '\.default-release$')
@@ -272,7 +273,6 @@ gsettings set org.gnome.shell favorite-apps "$(gsettings get org.gnome.shell fav
 # Remove fstab info in VBox
 sudo sed -i "/$(echo 'media_WiFiChallenge /media/WiFiChallenge vboxsf uid=1000,gid=1000,_netdev 0 0' | sudo sed -e 's/[\/&]/\\&/g')/d" /etc/fstab
 
-firefox &
 EOF
 
 echo 'bash /etc/configureUser.sh' >> /home/vagrant/.bashrc