From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 19 Aug 2008 03:39:34 +0000 (+0200)
Subject: Changend default encryption to wpa2 in wlanap.cgi
X-Git-Tag: v2.3-beta3~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=91197a3ff4d40bef846cebf27d6fbcd0b93898fe;p=people%2Fstevee%2Fipfire-2.x.git

Changend default encryption to wpa2 in wlanap.cgi
Add "hostapd.conf" because cgi doesnt create it
---

diff --git a/config/rootfiles/packages/hostapd b/config/rootfiles/packages/hostapd
index 931cb6e5a8..231a6ce1a0 100644
--- a/config/rootfiles/packages/hostapd
+++ b/config/rootfiles/packages/hostapd
@@ -1,6 +1,7 @@
 srv/web/ipfire/cgi-bin/wlanap.cgi
 var/ipfire/menu.d/EX-wlanap.menu
 var/ipfire/wlanap/settings
+var/ipfire/wlanap/hostapd.conf
 etc/hostapd.conf
 etc/init.d/hostapd
 usr/bin/hostapd
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 404809a4dd..6a313c8f77 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -207,7 +207,6 @@
 * nasm-0.98.39
 * ncftp-3.2.1-src
 * ncurses-5.5
-* neon-0.25.5
 * net-tools-1.60
 * netpbm-10.26.46
 * newt-0.51.6
@@ -265,10 +264,8 @@
 * spandsp-0.0.4pre15
 * squashfs3.2-r2
 * squid-2.7.STABLE3
-* squid-graph-3.2
 * squidGuard-1.3
 * squidclamav-3.5
-* subversion-1.4.4
 * sudo-1.6.8p12
 * sysfsutils-1.3.0
 * sysklogd-1.4.1
diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index fb613de564..18f01678bf 100644
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -59,7 +59,7 @@ $wlanapsettings{'APMODE'} = 'on';
 $wlanapsettings{'INTERFACE'} = $netsettings{'BLUE_DEV'};
 $wlanapsettings{'SSID'} = 'IPFire';
 $wlanapsettings{'HIDESSID'} = 'off';
-$wlanapsettings{'ENC'} = 'wpa';               # none / wpa1 /wpa2
+$wlanapsettings{'ENC'} = 'wpa2';               # none / wpa1 /wpa2
 $wlanapsettings{'TXPOWER'} = 'auto';
 $wlanapsettings{'CHAN'} = '05';
 $wlanapsettings{'PWD'} = 'IPFire-2.x';
@@ -74,7 +74,7 @@ $cgiparams{'ACTION'} = '';
 $cgiparams{'APMODE'} = 'on';
 $cgiparams{'SSID'} = 'IPFire';
 $cgiparams{'HIDESSID'} = 'off';
-$cgiparams{'ENC'} = 'wpa';               # none / wep / wpa / wep+wpa
+$cgiparams{'ENC'} = 'wpa2';               # none / wep / wpa / wep+wpa
 $cgiparams{'TXPOWER'} = 'auto';
 $cgiparams{'CHAN'} = '05';
 $cgiparams{'PWD'} = 'IPFire-2.x';
@@ -105,7 +105,7 @@ if ( $cgiparams{'ACTION'} eq "$Lang::tr{'save'}" ){
 		&WriteConfig();
 		&WriteConfig_hostapd();
 
-		system("/usr/local/bin/wlanapctrl restart >/dev/null 2>&1")
+		system("/usr/local/bin/wlanapctrl restart >/dev/null 2>&1");
 	}
 }elsif ( $cgiparams{'ACTION'} eq 'Start' ){
 	system("/usr/local/bin/wlanapctrl start >/dev/null 2>&1");
diff --git a/lfs/hostapd b/lfs/hostapd
index bd87ec2676..a46786687f 100644
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -84,7 +84,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	install -v -m 644 $(DIR_SRC)/config/backup/includes/hostapd /var/ipfire/backup/addons/includes/hostapd
 	mkdir -p /var/ipfire/wlanap
 	touch /var/ipfire/wlanap/settings
-	chown nobody:nobody /var/ipfire/wlanap/settings
-	chmod 644 /var/ipfire/wlanap/settings
+	cp -vrf $(DIR_SRC)/config/hostapd/hostapd.conf /var/ipfire/wlanap/etc/hostapd.conf
+	chown nobody:nobody /var/ipfire/wlanap/*
+	chmod 644 /var/ipfire/wlanap/*
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)