Skip to content

Tweak commands #1352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PromoFaux merged 2 commits into from
May 28, 2023
Merged

Tweak commands #1352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69e55ac
Tweak commands
yubiuser May 11, 2023
28e9be0
Adjust arch detection
yubiuser May 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/s6/debian-root/etc/s6-overlay/s6-rc.d/cron/finish
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/command/with-contenv bash

s6-echo "Stopping cron"
killall -9 cron
killall --signal 9 cron
2 changes: 1 addition & 1 deletion src/s6/debian-root/etc/s6-overlay/s6-rc.d/lighttpd/finish
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
s6-echo "Stopping lighttpd"
service lighttpd-access-log stop
service lighttpd-error-log stop
killall -9 lighttpd
killall --signal 9 lighttpd
2 changes: 1 addition & 1 deletion src/s6/debian-root/etc/s6-overlay/s6-rc.d/pihole-FTL/finish
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/command/with-contenv bash

s6-echo "Stopping pihole-FTL"
killall -15 pihole-FTL
killall --signal 15 pihole-FTL
16 changes: 8 additions & 8 deletions src/s6/debian-root/usr/local/bin/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,13 @@ WEB_LOCAL_REPO=/var/www/html/admin
setupVars=/etc/pihole/setupVars.conf

detect_arch() {
DETECTED_ARCH=$(dpkg --print-architecture)
DETECTED_ARCH=$(arch)
S6_ARCH=$DETECTED_ARCH
case $DETECTED_ARCH in
amd64)
S6_ARCH="x86_64";;
armel)
S6_ARCH="armhf";;
armhf)
armv7l)
S6_ARCH="armhf";;
arm64)
S6_ARCH="aarch64";;
i386)
S6_ARCH="i686";;
esac
Expand Down Expand Up @@ -94,9 +90,13 @@ mv /etc/pihole/macvendor.db /macvendor.db


## Remove the default lighttpd unconfigured config:
rm /etc/lighttpd/conf-enabled/99-unconfigured.conf
if [ -f /etc/lighttpd/conf-enabled/99-unconfigured.conf ]; then
rm /etc/lighttpd/conf-enabled/99-unconfigured.conf
fi
## Remove the default lighttpd placeholder page for good measure
rm /var/www/html/index.lighttpd.html
if [ -f /var/www/html/index.lighttpd.html ]; then
rm /var/www/html/index.lighttpd.html
fi
## Remove redundant directories created by the installer to reduce docker image size
rm -rf /tmp/*

Expand Down