chaos/NTP-Timeturner
1
0
Fork 0
mirror of https://github.com/cjfranko/NTP-Timeturner.git synced 2025-11-08 10:22:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update to pull nodogsplash and configure

Browse source
This commit is contained in:
Chris Frankland-Wright 2025-08-30 21:37:25 +01:00
parent baf674edd8
commit dad5c2d06a
1 changed files with 20 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

51
setup.sh
View file

@ -49,9 +49,9 @@ fi
echo "Installing common build dependencies..." echo "Installing common build dependencies..."
if [ "$PKG_MANAGER" == "apt" ]; then if [ "$PKG_MANAGER" == "apt" ]; then
sudo apt update sudo apt update
sudo apt install -y build-essential libudev-dev pkg-config curl sudo apt install -y build-essential libudev-dev pkg-config curl wget
elif [ "$PKG_MANAGER" == "dnf" ]; then elif [ "$PKG_MANAGER" == "dnf" ]; then
sudo dnf install -y gcc make perl-devel libudev-devel pkg-config curl sudo dnf install -y gcc make perl-devel libudev-devel pkg-config curl wget
elif [ "$PKG_MANAGER" == "pacman" ]; then elif [ "$PKG_MANAGER" == "pacman" ]; then
sudo pacman -Sy --noconfirm base-devel libudev pkg-config curl sudo pacman -Sy --noconfirm base-devel libudev pkg-config curl
fi fi
@ -121,35 +121,22 @@ echo "NTPD removed (if present). Chrony, NMTUI, and Adjtimex installed and confi
echo "📡 Installing and configuring WiFi hotspot and captive portal..." echo "📡 Installing and configuring WiFi hotspot and captive portal..."
if [ "$PKG_MANAGER" == "apt" ]; then if [ "$PKG_MANAGER" == "apt" ]; then
# Install dependencies, but handle nodogsplash separately # Install dependencies for hotspot and for building nodogsplash
sudo apt install -y hostapd dnsmasq sudo apt install -y hostapd dnsmasq git libmicrohttpd-dev
# Check architecture echo "Building and installing nodogsplash from source..."
ARCH=$(dpkg --print-architecture) # Create a temporary directory for the build
if [ "$ARCH" == "armhf" ]; then BUILD_DIR=$(mktemp -d)
NDS_DEB_URL="https://github.com/nodogsplash/nodogsplash/releases/download/v6.0.0/nodogsplash_6.0.0-1_armhf.deb" git clone https://github.com/nodogsplash/nodogsplash.git "$BUILD_DIR"
elif [ "$ARCH" == "arm64" ]; then
NDS_DEB_URL="https://github.com/nodogsplash/nodogsplash/releases/download/v6.0.0/nodogsplash_6.0.0-1_arm64.deb"
else
echo "Unsupported architecture for nodogsplash deb: $ARCH. Please install manually."
exit 1
fi
echo "Downloading nodogsplash for $ARCH..." cd "$BUILD_DIR"
curl -L "$NDS_DEB_URL" -o /tmp/nodogsplash.deb make
sudo make install
# Verify that the downloaded file is a debian package # Clean up the build directory
if ! dpkg-deb -I /tmp/nodogsplash.deb >/dev/null 2>&1; then cd ..
echo "❌ Error: Downloaded file is not a valid Debian package. Please check the URL and your connection." sudo rm -rf "$BUILD_DIR"
rm /tmp/nodogsplash.deb echo "✅ nodogsplash installed successfully."
exit 1
fi
echo "Installing nodogsplash..."
sudo dpkg -i /tmp/nodogsplash.deb
# Install any missing dependencies for nodogsplash
sudo apt-get install -f -y
rm /tmp/nodogsplash.deb
sudo systemctl unmask hostapd sudo systemctl unmask hostapd
sudo systemctl enable hostapd sudo systemctl enable hostapd
@ -209,10 +196,12 @@ echo "Configuring nodogsplash..."
sudo tee /etc/nodogsplash/nodogsplash.conf > /dev/null <<EOF sudo tee /etc/nodogsplash/nodogsplash.conf > /dev/null <<EOF
GatewayInterface wlan0 GatewayInterface wlan0
GatewayAddress 10.0.252.1 GatewayAddress 10.0.252.1
MaxClients 50 MaxClients 250
ClientIdleTimeout 3600 ClientIdleTimeout 480
FirewallRuleSet preauthenticated-users { FirewallRuleSet preauthenticated-users {
FirewallRule allow tcp port 80 FirewallRule allow tcp port 80
FirewallRule allow tcp port 53
FirewallRule allow udp port 53
} }
RedirectURL http://10.0.252.1/static/index.html RedirectURL http://10.0.252.1/static/index.html
EOF EOF
@ -241,7 +230,7 @@ echo "✅ Directory $INSTALL_DIR created."
# 3. Install binary and static web files # 3. Install binary and static web files
echo "🚀 Installing timeturner binary and web assets..." echo "🚀 Installing timeturner binary and web assets..."
sudo cp target/release/ntp_timeturner $INSTALL_DIR/timeturner sudo cp target/release/ntp_tim_turner $INSTALL_DIR/timeturner
# The static directory contains the web UI files # The static directory contains the web UI files
sudo cp -r static $INSTALL_DIR/ sudo cp -r static $INSTALL_DIR/
sudo ln -sf $INSTALL_DIR/timeturner $BIN_DIR/timeturner sudo ln -sf $INSTALL_DIR/timeturner $BIN_DIR/timeturner