diff --git a/build.sh b/build.sh index 6fbe244..6835e49 100644 --- a/build.sh +++ b/build.sh @@ -1,20 +1,20 @@ -#!/usr/bin/env bash - -# for dependencies -# apt install -t build-essential libncurses-dev bison flex libssl-dev libelf-dev - -echo "[+] Starting build script..." -mkdir target/overlay/var/www/html -echo "[+] Cloning buildroot" -git clone https://github.com/buildroot/buildroot.git target -echo "[+] Building the keygen" - -echo "[+] Adding customization files" -cp -R buildroot/* target/buildroot # copy buildroot configs -cp -R conf/* target/ovarlay # copy target system config files -cp -R webpanel/* target/overlay/var/www/html # copy the webpanel -cp -R update/* target/ovarlay #copy the update script and certificate -echo "[+] Building the image" -N=`grep -c '^processor' /proc/cpuinfo` -cd target/buildroot -make -j$N +#!/usr/bin/env bash + +# for dependencies +# apt install -t build-essential libncurses-dev bison flex libssl-dev libelf-dev + +echo "[+] Starting build script..." +mkdir target/overlay/var/www/html +echo "[+] Cloning buildroot" +git clone https://github.com/buildroot/buildroot.git target +echo "[+] Building the keygen" + +echo "[+] Adding customization files" +cp -R buildroot/* target/buildroot # copy buildroot configs +cp -R conf/* target/ovarlay # copy target system config files +cp -R webpanel/* target/overlay/var/www/html # copy the webpanel +cp -R update/* target/ovarlay #copy the update script and certificate +echo "[+] Building the image" +N=`grep -c '^processor' /proc/cpuinfo` +cd target/buildroot +make -j$N diff --git a/conf/etc/init.d/S90hostapd b/conf/etc/init.d/S90hostapd index 2e2a8a7..b71a7e6 100644 --- a/conf/etc/init.d/S90hostapd +++ b/conf/etc/init.d/S90hostapd @@ -1,23 +1,23 @@ -#!/bin/sh - -case "$1" in - start) - printf "Starting hostapd: " - start-stop-daemon -S -x /usr/sbin/hostapd -- -B /etc/hostapd.conf - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - stop) - printf "Stopping hostapd: " - start-stop-daemon -K -q -x /usr/sbin/hostapd - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - restart|reload) - $0 stop - $0 start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - +#!/bin/sh + +case "$1" in + start) + printf "Starting hostapd: " + start-stop-daemon -S -x /usr/sbin/hostapd -- -B /etc/hostapd.conf + [ $? = 0 ] && echo "OK" || echo "FAIL" + ;; + stop) + printf "Stopping hostapd: " + start-stop-daemon -K -q -x /usr/sbin/hostapd + [ $? = 0 ] && echo "OK" || echo "FAIL" + ;; + restart|reload) + $0 stop + $0 start + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 +esac + exit 0 \ No newline at end of file diff --git a/conf/etc/network/interfaces b/conf/etc/network/interfaces index e7fb4d5..2ca6aeb 100644 --- a/conf/etc/network/interfaces +++ b/conf/etc/network/interfaces @@ -1,5 +1,5 @@ -# /etc/network/interfaces -auto wlan0 -iface wlan0 inet static - address 192.168.77.1 +# /etc/network/interfaces +auto wlan0 +iface wlan0 inet static + address 192.168.77.1 netmask 255.255.255.0 \ No newline at end of file diff --git a/conf/etc/nginx/nginx.conf b/conf/etc/nginx/nginx.conf index f94524e..2746c07 100644 --- a/conf/etc/nginx/nginx.conf +++ b/conf/etc/nginx/nginx.conf @@ -1,33 +1,33 @@ -user www-data; -worker_processes 4; - -events { - worker_connections 1024; -} - -http { - - include mime.types; - default_type application/octet-stream; - sendfile on; - keepalive_timeout 65; - - server { - listen 80; - server_name localhost; - - location / { - root /var/www/html; - index index.html index.php; - } - - location ~ \.php$ { - fastcgi_pass unix:/var/run/php-fpm.sock; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME /var/www/html$fastcgi_script_name; - include fastcgi_params; - } - - } - +user www-data; +worker_processes 4; + +events { + worker_connections 1024; +} + +http { + + include mime.types; + default_type application/octet-stream; + sendfile on; + keepalive_timeout 65; + + server { + listen 80; + server_name localhost; + + location / { + root /var/www/html; + index index.html index.php; + } + + location ~ \.php$ { + fastcgi_pass unix:/var/run/php-fpm.sock; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME /var/www/html$fastcgi_script_name; + include fastcgi_params; + } + + } + } \ No newline at end of file diff --git a/conf/hostapd.conf b/conf/hostapd.conf index 09030d0..e7bbed2 100644 --- a/conf/hostapd.conf +++ b/conf/hostapd.conf @@ -1,12 +1,12 @@ -interface=wlan0 -hw_mode=g -channel=1 -wmm_enabled=1 - -ssid=Challenge-A2D0 -auth_algs=1 -wpa=2 -wpa_key_mgmt=WPA-PSK -rsn_pairwise=CCMP -wpa_passphrase=somepassword +interface=wlan0 +hw_mode=g +channel=1 +wmm_enabled=1 + +ssid=Challenge-A2D0 +auth_algs=1 +wpa=2 +wpa_key_mgmt=WPA-PSK +rsn_pairwise=CCMP +wpa_passphrase=somepassword ht_capab=[LDPC][HT40+][SHORT-GI-20][SHORT-GI-40][TX-STBC][RX-STBC1][MAX-AMSDU-7935][DSSS_CCK-40] \ No newline at end of file diff --git a/documents/documento_tecnico.odt b/documents/documento_tecnico.odt index 38970e3..f7caa22 100644 Binary files a/documents/documento_tecnico.odt and b/documents/documento_tecnico.odt differ diff --git a/documents/presentazione.odt b/documents/presentazione.odt index 09e2dbe..ab385a5 100644 Binary files a/documents/presentazione.odt and b/documents/presentazione.odt differ diff --git a/documents/preventivo.ods b/documents/preventivo.ods index 1b1d7ef..8ed6a45 100644 Binary files a/documents/preventivo.ods and b/documents/preventivo.ods differ diff --git a/webpanel/includes/config.php b/webpanel/includes/config.php index 14a0972..c6c2e4a 100644 --- a/webpanel/includes/config.php +++ b/webpanel/includes/config.php @@ -1,7 +1,7 @@ -'); - +'); + ?> \ No newline at end of file diff --git a/webpanel/includes/header.php b/webpanel/includes/header.php index d55fb85..72751f1 100644 --- a/webpanel/includes/header.php +++ b/webpanel/includes/header.php @@ -1,11 +1,11 @@ - - -
- - - -