diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 0e1c8046..100522cc 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -342,6 +342,9 @@ setStaticIPv4() { ${SUDO} echo "ONBOOT=yes" >> ${IFCFG_FILE} ${SUDO} echo "IPADDR=$IPADDR" >> ${IFCFG_FILE} ${SUDO} echo "PREFIX=$CIDR" >> ${IFCFG_FILE} + ${SUDO} echo "GATEWAY=$IPv4gw" >> ${IFCFG_FILE} + ${SUDO} echo "DNS1=$piholeDNS1" >> ${IFCFG_FILE} + ${SUDO} echo "DNS2=$piholeDNS2" >> ${IFCFG_FILE} ${SUDO} echo "USERCTL=no" >> ${IFCFG_FILE} ${SUDO} ip addr replace dev "$piholeInterface" "$IPv4addr" if [ -x "$(command -v nmcli)" ];then @@ -851,9 +854,9 @@ configureSelinux() { printf "::: Enabling httpd server side includes (SSI).. " ${SUDO} setsebool -P httpd_ssi_exec on if [ $? -eq 0 ]; then - echo -n "Success\n" + echo -n "Success" fi - printf ":::\tCompiling Pi-Hole SELinux policy..\n" + printf "\n:::\tCompiling Pi-Hole SELinux policy..\n" ${SUDO} checkmodule -M -m -o /etc/pihole/pihole.mod /etc/.pihole/advanced/selinux/pihole.te ${SUDO} semodule_package -o /etc/pihole/pihole.pp -m /etc/pihole/pihole.mod ${SUDO} semodule -i /etc/pihole/pihole.pp diff --git a/gravity.sh b/gravity.sh index acf7c76f..ca2ef57d 100755 --- a/gravity.sh +++ b/gravity.sh @@ -246,7 +246,13 @@ function gravity_unique() { function gravity_hostFormat() { # Format domain list as "192.168.x.x domain.com" echo "::: Formatting domains into a HOSTS file..." - hostname=$(