tyler.durden
/
pi-hole
mirror of https://github.com/pi-hole/pi-hole.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hawson memory reductions

This commit is contained in:
Dan Schaper 2015-11-05 18:22:17 -08:00
parent 23eece9443
commit 8e21488542
1 changed files with 11 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
gravity.sh
View File

@ -44,31 +44,6 @@ else
sudo mkdir $piholeDir sudo mkdir $piholeDir
fi fi
# Add additional swap to prevent the "Error fork: unable to allocate memory" message: https://github.com/jacobsalmela/pi-hole/issues/37
function createSwapFile()
#########################
{
echo "** Creating more swap space to accomodate large solar masses..."
sudo dphys-swapfile swapoff
sudo curl -s -o /etc/dphys-swapfile https://raw.githubusercontent.com/jacobsalmela/pi-hole/master/advanced/dphys-swapfile
sudo dphys-swapfile setup
sudo dphys-swapfile swapon
}
if [[ -f /etc/dphys-swapfile ]];then
swapSize=$(cat /etc/dphys-swapfile | grep -m1 CONF_SWAPSIZE | cut -d'=' -f2)
if [[ $swapSize != 500 ]];then
mv /etc/dphys-swapfile /etc/dphys-swapfile.orig
echo "** Current swap size is $swapSize"
createSwapFile
else
:
fi
else
echo "** No swap file found. Creating one..."
createSwapFile
fi
# Loop through domain list. Download each one and remove commented lines (lines beginning with '# 'or '/') and blank lines # Loop through domain list. Download each one and remove commented lines (lines beginning with '# 'or '/') and blank lines
for ((i = 0; i < "${#sources[@]}"; i++)) for ((i = 0; i < "${#sources[@]}"; i++))
do do
@ -100,22 +75,22 @@ do
esac esac
# tmp file, so we don't have to store the (long!) lists in RAM # tmp file, so we don't have to store the (long!) lists in RAM
tmpfile=`mktemp` patternBuffer=`mktemp`
timeCheck="" heisenbergCompensator=""
if [ -r $saveLocation ]; then if [ -r $saveLocation ]; then
timeCheck="-z $saveLocation" heisenbergCompensator="-z $saveLocation"
fi fi
CMD="$cmd -s $timeCheck -A '$agent' $url > $tmpfile" CMD="$cmd -s $heisenbergCompensator -A '$agent' $url > $patternBuffer"
echo "running [$CMD]" echo "** Engaging pattern transference..."
$cmd -s $timeCheck -A "$agent" $url > $tmpfile $cmd -s $heisenbergCompensator -A "$agent" $url > $patternBuffer
if [[ -s "$tmpfile" ]];then if [[ -s "$patternBuffer" ]];then
# Remove comments and print only the domain name # Remove comments and print only the domain name
# Most of the lists downloaded are already in hosts file format but the spacing/formating is not contigious # Most of the lists downloaded are already in hosts file format but the spacing/formating is not contigious
# This helps with that and makes it easier to read # This helps with that and makes it easier to read
# It also helps with debugging so each stage of the script can be researched more in depth # It also helps with debugging so each stage of the script can be researched more in depth
awk '($1 !~ /^#/) { if (NF>1) {print $2} else {print $1}}' $tmpfile | \ awk '($1 !~ /^#/) { if (NF>1) {print $2} else {print $1}}' $patternBuffer | \
sed -nr -e 's/\.{2,}/./g' -e '/\./p' > $saveLocation sed -nr -e 's/\.{2,}/./g' -e '/\./p' > $saveLocation
echo "Done." echo "Done."
else else
@ -123,7 +98,7 @@ do
fi fi
# cleanup # cleanup
rm -f $tmpfile rm -f $patternBuffer
done done
# Find all files with the .domains extension and compile them into one file and remove CRs # Find all files with the .domains extension and compile them into one file and remove CRs
@ -141,7 +116,7 @@ fi
function gravity_advanced() { function gravity_advanced() {
numberOf=$(wc -l $origin/$andLight) numberOf=$(wc -l $origin/$andLight)
echo "** $numberOf domains being pulled in by gravity..." echo "** $numberOf $origin/$andLight domains being pulled in by gravity..."
# Remove carriage returns and preceding whitespace # Remove carriage returns and preceding whitespace
# not really needed anymore? # not really needed anymore?
@ -166,7 +141,7 @@ if [[ -r $whitelist ]];then
# Remove whitelist entries # Remove whitelist entries
numberOf=$(cat $whitelist | sed '/^\s*$/d' | wc -l) numberOf=$(cat $whitelist | sed '/^\s*$/d' | wc -l)
plural=; [[ "$numberOf" != "1" ]] && plural=s plural=; [[ "$numberOf" != "1" ]] && plural=s
echo "** Whitelisting $numberOf domain${plural}..." echo "** Whitelisting $numberOf $whitelist domain${plural}..."
# Append a "$" to the end, prepend a "^" to the beginning, and # Append a "$" to the end, prepend a "^" to the beginning, and
# replace "." with "\." of each line to turn each entry into a # replace "." with "\." of each line to turn each entry into a