frodovdr/raspap-webgui
1
0
Fork 0
mirror of https://github.com/billz/raspap-webgui.git synced 2023-10-10 13:37:24 +02:00
Code Issues Releases Wiki Activity

Various small fixes

Browse Source 
* Append `.old` to old web directory instead of moving to `/tmp`
* Do not give the user a choice of install location
* Better detection of Debian version
* List username and password in Quick Start instructions
This commit is contained in:
Joe Haig 2017-01-27 09:21:53 +00:00
parent 265b6e5af0
commit bfb635636b
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -39,6 +39,8 @@ The installer will complete the steps in the manual installation (below) for you
After the reboot at the end of the installation the wireless network will be After the reboot at the end of the installation the wireless network will be
configured as an access point as follows: configured as an access point as follows:
* IP address: 10.3.141.1 * IP address: 10.3.141.1
* Username: admin
* Password: secret
* DHCP range: 10.3.141.50 to 10.3.141.255 * DHCP range: 10.3.141.50 to 10.3.141.255
* SSID: `raspi-webgui` * SSID: `raspi-webgui`
* Password: ChangeMe * Password: ChangeMe

24
installers/common.sh
View File

@ -1,13 +1,13 @@
raspap_dir="/etc/raspap" raspap_dir="/etc/raspap"
raspap_user="www-data" raspap_user="www-data"
version=`cat /etc/debian_version` version=`sed 's/\..*//' /etc/debian_version`
# Determine version and set default home location for lighttpd # Determine version and set default home location for lighttpd
if [ $version == "8.0" ]; then if [ $version -ge 8 ]; then
echo "Raspian verison is 8.0 Jessie" echo "Raspian verison is 8.0 or later"
webroot_dir="/var/www/html" webroot_dir="/var/www/html"
elif [ $version == "7.8" ]; then elif; then
echo "Raspian version is 7.8 Wheezy" echo "Raspian version is earlier than 8.0"
webroot_dir="/var/www" webroot_dir="/var/www"
fi fi
@ -27,11 +27,13 @@ function install_error() {
function config_installation() { function config_installation() {
install_log "Configure installation" install_log "Configure installation"
echo -n "Install directory [${raspap_dir}]: " # This causes confusion. For the moment fix the default.
read input #echo -n "Install directory [${raspap_dir}]: "
if [ ! -z "$input" ]; then #read input
raspap_dir="$input" #if [ ! -z "$input" ]; then
fi # raspap_dir="$input"
#fi
echo "Install directory: ${raspap_dir}"
echo -n "Complete installation with these values? [y/N]: " echo -n "Complete installation with these values? [y/N]: "
read answer read answer
@ -75,7 +77,7 @@ function create_raspap_directories() {
# Fetches latest files from github to webroot # Fetches latest files from github to webroot
function download_latest_files() { function download_latest_files() {
if [ -d "$webroot_dir" ]; then if [ -d "$webroot_dir" ]; then
sudo mv $webroot_dir /tmp/old_webroot || install_error "Unable to remove old webroot directory" sudo mv $webroot_dir $webroot.old || install_error "Unable to remove old webroot directory"
fi fi
install_log "Cloning latest files from github" install_log "Cloning latest files from github"