Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-04 20:13:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/feature/path_change' into feature/DOReadme

Browse source 
# Conflicts:
#	README.md
This commit is contained in:
Dan Schaper 2016-11-09 12:31:31 -08:00
commit 2d5a26759a
7 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.idea/codeStyleSettings.xml
View file

@ -15,6 +15,9 @@
<option name="USE_RELATIVE_INDENTS" value="false" />
</value>
</option>
<MarkdownNavigatorCodeStyleSettings>
<option name="RIGHT_MARGIN" value="72" />
</MarkdownNavigatorCodeStyleSettings>
</value>
</option>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />

16
README.md
View file

@ -35,9 +35,21 @@ Digital Ocean helps with our infrastructure, but our developers are all voluntee
### `curl -sSL https://install.pi-hole.net | bash`
### Alternative Semi-Automated install
### Alternative Semi-Automated Install Methods
``` bash
Clone our repository and run the automated installer from your device.
```
git clone --depth 1 https://github.com/pi-hole/pi-hole.git Pi-hole
cd Pi-hole/automated_installer/
(Optionally nano|vi|vim|cat the basic-install.sh file to verify the actions it will take)
bash basic-install.sh
```
Or
If you wish to read over the script before running it, then after the [`wget`](https://linux.die.net/man/1/wget) command, run `nano basic-install.sh` to open the file in a text viewer.
```bash
wget -O basic-install.sh https://install.pi-hole.net
bash basic-install.sh
```

12
advanced/dphys-swapfile
View file

@ -1,12 +0,0 @@
# Pi-hole: A black hole for Internet advertisements
# (c) 2015, 2016 by Jacob Salmela
# Network-wide ad blocking via your Raspberry Pi
# http://pi-hole.net
# Swap file config
#
# Pi-hole is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
CONF_SWAPSIZE=500

2
automated install/basic-install.sh → automated_install/basic-install.sh Executable file → Normal file
View file

@ -690,7 +690,7 @@ installScripts() {
cd "${PI_HOLE_LOCAL_REPO}"
install -o "${USER}" -Dm755 -t /opt/pihole/ gravity.sh
install -o "${USER}" -Dm755 -t /opt/pihole/ ./advanced/Scripts/*.sh
install -o "${USER}" -Dm755 -t /opt/pihole/ ./automated\ install/uninstall.sh
install -o "${USER}" -Dm755 -t /opt/pihole/ ./automated_install/uninstall.sh
install -o "${USER}" -Dm755 -t /usr/local/bin/ pihole
install -Dm644 ./advanced/bash-completion/pihole /etc/bash_completion.d/pihole
echo " done."

0
automated install/uninstall.sh → automated_install/uninstall.sh Executable file → Normal file
View file

7
test/centos.Dockerfile
View file

@ -5,10 +5,11 @@ ENV SCRIPTDIR /opt/pihole
RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole
ADD . $GITDIR
RUN cp $GITDIR/advanced/Scripts/*.sh $GITDIR/gravity.sh $GITDIR/pihole $GITDIR/automated\ install/*.sh $SCRIPTDIR/
RUN cp $GITDIR/advanced/Scripts/*.sh \
$GITDIR/gravity.sh $GITDIR/pihole \
$GITDIR/automated_install/*.sh \
$SCRIPTDIR/
ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SCRIPTDIR
RUN true && \
chmod +x $SCRIPTDIR/*
#sed '/# Start the installer/Q' /opt/pihole/basic-install.sh > /opt/pihole/stub_basic-install.sh && \

7
test/debian.Dockerfile
View file

@ -5,11 +5,12 @@ ENV SCRIPTDIR /opt/pihole
RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole
ADD . $GITDIR
RUN cp $GITDIR/advanced/Scripts/*.sh $GITDIR/gravity.sh $GITDIR/pihole $GITDIR/automated\ install/*.sh $SCRIPTDIR/
RUN cp $GITDIR/advanced/Scripts/*.sh \
$GITDIR/gravity.sh $GITDIR/pihole \
$GITDIR/automated_install/*.sh \
$SCRIPTDIR/
ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SCRIPTDIR
RUN true && \
chmod +x $SCRIPTDIR/*
#sed '/# Start the installer/Q' /opt/pihole/basic-install.sh > /opt/pihole/stub_basic-install.sh && \