frodovdr/raspap-webgui
1
0
Fork 0
mirror of https://github.com/billz/raspap-webgui.git synced 2025-03-01 10:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into bridge-mode

Browse Source
This commit is contained in:
Bill Zimmerman
2020-03-10 00:05:46 +01:00
committed by GitHub
parent 9800b23e4d 20a540236a
commit 8bda81adcb
18 changed files with 528 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
installers/common.sh
View File

@@ -8,6 +8,7 @@ raspap_dir="/etc/raspap"
raspap_user="www-data"
webroot_dir="/var/www/html"
version=`sed 's/\..*//' /etc/debian_version`
git_source_url="https://github.com/$repo" # $repo from install.raspap.com
# Determine Raspbian version, set default home location for lighttpd and
# php package to install
@@ -108,6 +109,13 @@ function create_hostapd_scripts() {
sudo chmod 750 "$raspap_dir/hostapd/"*.sh || install_error "Unable to change file permissions"
}
# Generate dnsmasq logfile
function create_dnsmasq_log() {
install_log "Creating dnsmasq logfile"
sudo touch /tmp/dnsmasq.log || install_error "Unable to create logfile /tmp/dnsmasq.log"
sudo chown dnsmasq:"$raspap_user" /tmp/dnsmasq.log || install_error "Unable to change file ownership"
}
# Generate lighttpd service control scripts
function create_lighttpd_scripts() {
install_log "Creating lighttpd control scripts"
@@ -169,8 +177,8 @@ function download_latest_files() {
fi
install_log "Cloning latest files from github"
# git clone --depth 1 https://github.com/billz/raspap-webgui /tmp/raspap-webgui || install_error "Unable to download files from github"
git clone --single-branch --branch bridge-mode --depth 1 https://github.com/Taikuh/raspap-webgui /tmp/raspap-webgui || install_error "Unable to download files from github"
git clone --single-branch $branch --depth 1 $git_source_url /tmp/raspap-webgui || install_error "Unable to download files from github"
sudo mv /tmp/raspap-webgui $webroot_dir || install_error "Unable to move raspap-webgui to web root"
}
@@ -256,6 +264,8 @@ function default_configuration() {
'echo 1 > \/proc\/sys\/net\/ipv4\/ip_forward #RASPAP'
'iptables -t nat -A POSTROUTING -j MASQUERADE #RASPAP'
'iptables -t nat -A POSTROUTING -s 192.168.50.0\/24 ! -d 192.168.50.0\/24 -j MASQUERADE #RASPAP'
'chown dnsmasq:www-data \/tmp\/dnsmasq.log #RASPAP'
'chown root:www-data \/tmp\/hostapd.log #RASPAP'
)
for line in "${lines[@]}"; do
@@ -451,6 +461,7 @@ function install_raspap() {
download_latest_files
change_file_ownership
create_hostapd_scripts
create_dnsmasq_log
create_lighttpd_scripts
move_config_file
default_configuration

4
installers/raspbian.sh
View File

@@ -24,9 +24,9 @@
# Depending on options passed to the installer, ONE of the following
# additional shell scripts will be downloaded and sourced:
#
# https://raw.githubusercontent.com/billz/raspap-webgui/installers/common.sh
# https://raw.githubusercontent.com/billz/raspap-webgui/master/installers/common.sh
# - or -
# https://raw.githubusercontent.com/billz/raspap-webgui/installers/mkcert.sh
# https://raw.githubusercontent.com/billz/raspap-webgui/master/installers/mkcert.sh
# Set defaults
repo="billz/raspap-webgui"