Merge branch 'master' of ssh://gitlab.com/hacklab01/pivilion

etc/apache2/sites-available/000-default.conf

@@ -0,0 +1,31 @@
+<VirtualHost *:80>
+	# 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/gen
+
+	# 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

@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash
 
 echo "Checking for required packages and installing if missing"
 if [ $(dpkg-query -W -f='${Status}' apache2 2>/dev/null | grep -c "ok installed") -eq 0 ];
@@ -9,9 +9,9 @@ fi
 echo "Configuring components..."
 sudo cp -f /home/pi/pivilion/config/hostapd.hotspot /etc/hostapd/hostapd.conf
 sudo cp -f /home/pi/pivilion/config/dnsmasq.hotspot /etc/dnsmasq.conf
-sudo cp -rf /home/pi/pivilion/config/html /var/www/
+sudo cp -rT /home/pi/pivilion/config/html /var/www/html/pivilion/gen
 sudo chown -R www-data:www-data /var/www/html
-sudo chown root:www-data /var/www/html/.htaccess
+sudo chown root:www-data /var/www/html/pivilion/gen/.htaccess
 sudo cp -f /home/pi/pivilion/config/rc.hotspot /etc/rc.local
 sudo cp -f /home/pi/pivilion/config/override.hotspot /etc/apache2/conf-available/override.conf
 sudo a2enconf override

usr/local/bin/onion

@@ -8,9 +8,9 @@ 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`"
+sudo rm /var/www/html/pivilion/gen/.htaccess
+sudo echo "The next time you reboot, your Pi will start in onion mode"!
+sudo echo "Your onion domain is `cat /home/pi/pivilion/torname`"
 sudo bash -c 'echo "onion" > /home/pi/pivilion/mode'