diff --git a/config/head b/config/head new file mode 100644 index 0000000..471ca1b --- /dev/null +++ b/config/head @@ -0,0 +1 @@ +nameserver 127.3.2.1 diff --git a/config/rt_tables b/config/rt_tables deleted file mode 100644 index 4d9087d..0000000 --- a/config/rt_tables +++ /dev/null @@ -1,12 +0,0 @@ -# -# reserved values -# -2 lokinet -255 local -254 main -253 default -0 unspec -# -# local -# -#1 inr.ruhep diff --git a/installers/common.sh b/installers/common.sh index 8e45602..89fb6d7 100755 --- a/installers/common.sh +++ b/installers/common.sh @@ -196,14 +196,14 @@ function default_configuration() { sudo mv $webroot_dir/config/hostapd.conf /etc/hostapd/hostapd.conf || install_error "Unable to move hostapd configuration file" sudo mv $webroot_dir/config/dnsmasq.conf /etc/dnsmasq.conf || install_error "Unable to move dnsmasq configuration file" sudo mv $webroot_dir/config/dhcpcd.conf /etc/dhcpcd.conf || install_error "Unable to move dhcpcd configuration file" - sudo mv $webroot_dir/config/rt_tables /etc/iproute2/ || install_error "Unable to move dhcpcd configuration file" + sudo mv $webroot_dir/config/head /etc/resolvconf/resolvconf.d/ || install_error "Unable to move resolvconf head file" + sudo resolvconf -u || install_error "Unable to update resolv.conf" # LokiPAP Batch file relocation and permissions in user loki-network directory sudo mv $webroot_dir/config/lokilaunch.sh $HOME/loki-network/ || install error "Unable to move, install Lokinet first" sudo chmod 755 $HOME/loki-network/lokilaunch.sh - # sudo chown $raspap_user:$raspap_user lokilaunch.sh # Generate required lines for Rasp AP to place into rc.local file. # #RASPAP is for removal script @@ -212,7 +212,6 @@ function default_configuration() { 'iptables -t nat -A POSTROUTING -s 10.3.141.0\/24 -o lokitun0 -j MASQUERADE #RASPAP' 'iptables -t nat -A POSTROUTING -j MASQUERADE #RASPAP' 'sudo \/home\/pi\/loki-network\/.\/lokilaunch.sh start #RASPAP' - # 'sudo \/home\/pi\/loki-network\/.\/lokilaunch.sh connect #RASPAP' ) diff --git a/installers/raspbian.sh b/installers/raspbian.sh index 944e037..759c0c5 100755 --- a/installers/raspbian.sh +++ b/installers/raspbian.sh @@ -9,7 +9,7 @@ function update_system_packages() { function install_dependencies() { install_log "Installing required packages" - sudo apt-get install lighttpd $php_package git hostapd dnsmasq vnstat || install_error "Unable to install dependencies" + sudo apt-get install lighttpd $php_package git hostapd dnsmasq vnstat resolvconf || install_error "Unable to install dependencies" } install_raspap