diff --git a/Makefile b/Makefile index 117c3c7..53391b0 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ SHELL = umask 002; exec /bin/sh FILES = events.ics events.atom news.atom index.html stats.html \ favicon.ico default.css csclub.der csclub.pem robots.txt -SUBDIRS = about events office news services media buttons logos flash library eduroam +SUBDIRS = about events office news services media buttons logos flash library include common.mk diff --git a/eduroam/Makefile b/eduroam/Makefile deleted file mode 100644 index b968f95..0000000 --- a/eduroam/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -FILES = install README wpasupplicant_0.7.3-0ubuntu1_amd64.deb \ - wpasupplicant_0.7.3-0ubuntu1_i386.deb -RELDIR = eduroam/ -include ../common.mk diff --git a/eduroam/README b/eduroam/README deleted file mode 100644 index 4792b7b..0000000 --- a/eduroam/README +++ /dev/null @@ -1,13 +0,0 @@ -To fix eduroam: - -1. Install appropriate wpasupplicant-0.7.3 package. -2. sudo killall -TERM wpa_supplicant -3. sudo service network-manager restart -3. Eduroam will now work with proper settings: - Security: WPA & WPA2 Enterprise - Authentication: PEAP - No CA certificate (or globalsign's root CA, to satisfy OCD) - PEAP version: Automatic - Inner auth: MSCHAPv2 - -Or, just run ./install. diff --git a/eduroam/install b/eduroam/install deleted file mode 100755 index 9fa082e..0000000 --- a/eduroam/install +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -####################################################### -# Install script for replacement wpasupplicant packages -# Marc Burns (m4burns@uwaterloo.ca) -####################################################### - -# Select package for architecture. -pkg="wpasupplicant_0.7.3-0ubuntu1_`dpkg --print-architecture`.deb" - -# Install replacement wpa_supplicant. -sudo dpkg -i ./$pkg - -# Kill all instances of wpa_supplicant and restart NetworkManager. -sudo killall -TERM wpa_supplicant -sudo service network-manager restart diff --git a/eduroam/wpasupplicant_0.7.3-0ubuntu1_amd64.deb b/eduroam/wpasupplicant_0.7.3-0ubuntu1_amd64.deb deleted file mode 100644 index 060354f..0000000 Binary files a/eduroam/wpasupplicant_0.7.3-0ubuntu1_amd64.deb and /dev/null differ diff --git a/eduroam/wpasupplicant_0.7.3-0ubuntu1_i386.deb b/eduroam/wpasupplicant_0.7.3-0ubuntu1_i386.deb deleted file mode 100644 index fb6a556..0000000 Binary files a/eduroam/wpasupplicant_0.7.3-0ubuntu1_i386.deb and /dev/null differ