Mirrored_Repos/unifios-utilities
1
0
Fork 0
mirror of https://github.com/unifi-utilities/unifios-utilities.git synced 2024-08-30 18:32:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/unifi-utilities/unifios-utilities

Browse Source
This commit is contained in:
John Dorman 2023-02-18 19:31:34 -08:00
commit 06a26c92d9
5 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -90,7 +90,7 @@ Run Pi-hole on your UDM with podman.
Also contains custom image for Pi-hole with `cloudflared`. Also contains custom image for Pi-hole with `cloudflared`.
### PiHole with DoTe ### PiHole with DoTe
[![!Docker Pulls](https://img.shields.io/docker/pulls/boostchicken/pihole-dote.svg?color=green&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/u/boostchicken) [![!Docker Pulls](https://img.shields.io/docker/pulls/pombeirp/pihole-dote.svg?color=green&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/pombeirp/pihole-dote)
Designed by: <https://github.com/chrisstaite/DoTe/> Designed by: <https://github.com/chrisstaite/DoTe/>
@ -139,4 +139,4 @@ Working in the shell means that mistakes can happen. Deleted directories or pack
3. Release the reset button and power the unit. 3. Release the reset button and power the unit.
4. Again press the reset button for 15+ seconds. 4. Again press the reset button for 15+ seconds.
Thanks to user [cfallwell](https://github.com/cfallwell) for describing this fix [here](https://github.com/unifi-utilities/unifios-utilities/issues/428#issuecomment-1386212026). Thanks to user [cfallwell](https://github.com/cfallwell) for describing this fix [here](https://github.com/unifi-utilities/unifios-utilities/issues/428#issuecomment-1386212026).

2
att-ipv6/10-att-ipv6.sh
View File

@ -16,6 +16,8 @@ test -f "${confdir}/dhcpcd.conf" || {
: > "${confdir}/dhcpcd.conf.tmp" : > "${confdir}/dhcpcd.conf.tmp"
cat >> "${confdir}/dhcpcd.conf.tmp" <<EOF cat >> "${confdir}/dhcpcd.conf.tmp" <<EOF
allowinterfaces ${wan_iface} allowinterfaces ${wan_iface}
nodev
noup
ipv6only ipv6only
nooption domain_name_servers nooption domain_name_servers
nooption domain_name nooption domain_name

14
on-boot-script/README.md
View File

@ -48,11 +48,11 @@ This will also install CNI Plugins & CNI Bridge scripts. If you are using UDMSE/
unifi-os shell unifi-os shell
``` ```
2. Download [udm-boot_1.0.6_all.deb](packages/udm-boot_1.0.6_all.deb) and install it and go back to the UDM. The latest package will always be found at https://udm-boot.boostchicken.dev 2. Download [udm-boot_1.0.7_all.deb](packages/udm-boot_1.0.7_all.deb) and install it and go back to the UDM. The latest package will always be found at https://udm-boot.boostchicken.dev
```bash ```bash
curl -L [[https://udm-boot.boostchicken.dev](https://unifi.boostchicken.io/udm-boot_1.0.6_all.deb)](https://unifi.boostchicken.io/udm-boot_1.0.6_all.deb) -o udm-boot_1.0.6_all.deb curl -L https://unifi.boostchicken.io/udm-boot_1.0.7_all.deb -o udm-boot_1.0.7_all.deb
dpkg -i udm-boot_1.0.6_all.deb dpkg -i udm-boot_1.0.7_all.deb
systemctl enable udm-boot systemctl enable udm-boot
exit exit
``` ```
@ -66,6 +66,14 @@ This will also install CNI Plugins & CNI Bridge scripts. If you are using UDMSE/
## Version History ## Version History
### 1.0.7
* Support for Legacy and Current Firmware
### 1.0.6
* Fix timeouts
### 1.0.5 ### 1.0.5
* Remove on_boot.sh from UDM * Remove on_boot.sh from UDM

4
podman-install/on_boot.d/00-podman.sh
View File

@ -31,6 +31,10 @@ case "$(udm_model)" in
udmse|udmpro) udmse|udmpro)
DESIRED_ZIPFILE="$(udm_model)-podman-install.zip" DESIRED_ZIPFILE="$(udm_model)-podman-install.zip"
;; ;;
udm)
# base UDM works fine with udmpro podman version, but has issues with udmse variant
DESIRED_ZIPFILE="udmpro-podman-install.zip"
;;
*) *)
# shrug # shrug
# udmse-podman-install.zip seems to work fine on UDM 2.4.x # udmse-podman-install.zip seems to work fine on UDM 2.4.x

13
run-pihole/DoTE.Dockerfile
View File

@ -1,5 +1,10 @@
ARG VERSION=2023.01.10 ARG PIHOLE_DOCKER_TAG=2023.02.2
FROM pihole/pihole:${VERSION} FROM pihole/pihole:${PIHOLE_DOCKER_TAG}
ENV DEBIAN_FRONTEND="noninteractive"
ENV DOTE_OPTS="-s 127.0.0.1:5053" ENV DOTE_OPTS="-s 127.0.0.1:5053"
RUN echo -e "#!/bin/sh\ncurl -fsSLo /opt/dote https://github.com/chrisstaite/DoTe/releases/latest/download/dote_arm64\nchmod +x /opt/dote\n/opt/dote \\\$DOTE_OPTS -d\n" > /etc/cont-init.d/10-dote.sh RUN curl -fsSLo /opt/dote https://github.com/chrisstaite/DoTe/releases/latest/download/dote_arm64 && \
chmod +x /opt/dote && \
usermod -aG pihole www-data; \
mkdir -p /etc/cont-init.d && \
echo -e "#!/bin/sh\nchmod +x /opt/dote\n/opt/dote \$DOTE_OPTS -d\n" > /etc/cont-init.d/10-dote.sh && \
chmod +x /etc/cont-init.d/10-dote.sh