boot/wpa_supplicant.conf

@@ -0,0 +1,3 @@
+ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=netdev
+update_config=1
+country=BO

etc/apache2/ports.conf

@@ -1,16 +0,0 @@
-# If you just change the port or add more ports here, you will likely also
-# have to change the VirtualHost statement in
-# /etc/apache2/sites-enabled/000-default.conf
-
-Listen 80
-Listen 81
-
-<IfModule ssl_module>
-	Listen 443
-</IfModule>
-
-<IfModule mod_gnutls.c>
-	Listen 443
-</IfModule>
-
-# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

etc/apache2/sites-avaliable/000-upload.conf

@@ -1,31 +0,0 @@
-<VirtualHost *:81>
-	# The ServerName directive sets the request scheme, hostname and port that
-	# the server uses to identify itself. This is used when creating
-	# redirection URLs. In the context of virtual hosts, the ServerName
-	# specifies what hostname must appear in the request's Host: header to
-	# match this virtual host. For the default virtual host (this file) this
-	# value is not decisive as it is used as a last resort host regardless.
-	# However, you must set it for any further virtual host explicitly.
-	#ServerName www.example.com
-
-	ServerAdmin webmaster@localhost
-	DocumentRoot /var/www/html/pivilion
-
-	# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
-	# error, crit, alert, emerg.
-	# It is also possible to configure the loglevel for particular
-	# modules, e.g.
-	#LogLevel info ssl:warn
-
-	ErrorLog ${APACHE_LOG_DIR}/error.log
-	CustomLog ${APACHE_LOG_DIR}/access.log combined
-
-	# For most configuration files from conf-available/, which are
-	# enabled or disabled at a global level, it is possible to
-	# include a line for only one particular virtual host. For example the
-	# following line enables the CGI configuration for this host only
-	# after it has been globally disabled with "a2disconf".
-	#Include conf-available/serve-cgi-bin.conf
-</VirtualHost>
-
-# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

usr/local/bin/hotspot

@@ -12,8 +12,8 @@ sudo cp -f /home/pi/pivilion/config/dnsmasq.hotspot /etc/dnsmasq.conf
 sudo cp -rf /home/pi/pivilion/config/html /var/www/
 sudo chown -R www-data:www-data /var/www/html
 sudo chown root:www-data /var/www/html/.htaccess
-sudo cp -f /home/pi/pivilion/config/rc.hotspot /etc/rc.local
+sudo cp -f rc.hotspot /etc/rc.local
-sudo cp -f /home/pi/pivilion/config/override.hotspot /etc/apache2/conf-available/override.conf
+sudo cp -f override.hotspot /etc/apache2/conf-available/override.conf
 sudo a2enconf override
 sudo a2enmod rewrite
 

usr/local/bin/onion

@@ -7,7 +7,6 @@ sudo bash -c 'cat /home/pi/pivilion/config/interfaces.onion > /etc/network/inter
 sudo update-rc.d dnsmasq disable
 
 sudo bash -c 'cat /home/pi/pivilion/config/rc.local.onion > /etc/rc.local'
-sudo mv /etc/wpa_supplicant/wpa_supplicant.bak /etc/wpa_supplicant/wpa_supplicant.conf
 
 echo "The next time you reboot, your Pi will start in onion mode"!
 echo "Your onion domain is `cat /home/pi/pivilion/torname`"