mirror of
https://gitea.com/mcereda/oam.git
synced 2026-02-08 21:34:25 +00:00
chore(kb): revise relevant articles after pihole upgrade
This commit is contained in:
@@ -9,7 +9,7 @@
|
|||||||
## TL;DR
|
## TL;DR
|
||||||
|
|
||||||
<details>
|
<details>
|
||||||
<summary>Installation and configuration</summary>
|
<summary>Setup</summary>
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
docker pull 'ckulka/baikal-docker'
|
docker pull 'ckulka/baikal-docker'
|
||||||
@@ -42,7 +42,7 @@ Ensure the following are available:
|
|||||||
## Further readings
|
## Further readings
|
||||||
|
|
||||||
- [Website]
|
- [Website]
|
||||||
- [Github]
|
- [Codebase]
|
||||||
- [Self-hosting]
|
- [Self-hosting]
|
||||||
|
|
||||||
### Sources
|
### Sources
|
||||||
@@ -65,8 +65,8 @@ Ensure the following are available:
|
|||||||
<!-- Upstream -->
|
<!-- Upstream -->
|
||||||
[baïkal dependencies]: https://github.com/sabre-io/Baikal/wiki/Ba%C3%AFkal-dependencies
|
[baïkal dependencies]: https://github.com/sabre-io/Baikal/wiki/Ba%C3%AFkal-dependencies
|
||||||
[baikal php error]: https://github.com/sabre-io/Baikal/issues/701
|
[baikal php error]: https://github.com/sabre-io/Baikal/issues/701
|
||||||
[github]: https://github.com/sabre-io/Baikal
|
[Codebase]: https://github.com/sabre-io/Baikal
|
||||||
[website]: https://sabre.io/baikal/
|
[Website]: https://sabre.io/baikal/
|
||||||
|
|
||||||
<!-- Others -->
|
<!-- Others -->
|
||||||
[ckulka/baikal-docker]: https://github.com/ckulka/baikal-docker
|
[ckulka/baikal-docker]: https://github.com/ckulka/baikal-docker
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
1. [TL;DR](#tldr)
|
1. [TL;DR](#tldr)
|
||||||
1. [Further readings](#further-readings)
|
1. [Further readings](#further-readings)
|
||||||
|
1. [Sources](#sources)
|
||||||
|
|
||||||
## TL;DR
|
## TL;DR
|
||||||
|
|
||||||
@@ -30,12 +31,29 @@ addgroup 'nobody' 'docker'
|
|||||||
# Start services.
|
# Start services.
|
||||||
rc-update add 'gitea'
|
rc-update add 'gitea'
|
||||||
rc-service 'gitea' start
|
rc-service 'gitea' start
|
||||||
|
|
||||||
|
# Upgrade to a new release branch.
|
||||||
|
sed -i'.bak' -e 's/v3.22/v3.23/g' '/etc/apk/repositories' \
|
||||||
|
&& apk add --upgrade --update-cache 'apk-tools' \
|
||||||
|
&& apk upgrade --available \
|
||||||
|
&& reboot
|
||||||
|
|
||||||
|
# Update configuration files.
|
||||||
|
find '/etc' -name "*.apk-new"
|
||||||
|
diff '/etc/init.d/localmount' '/etc/init.d/localmount.apk-new' \
|
||||||
|
&& mv -iv '/etc/init.d/localmount.apk-new' '/etc/init.d/localmount'
|
||||||
```
|
```
|
||||||
|
|
||||||
## Further readings
|
## Further readings
|
||||||
|
|
||||||
|
- [Website]
|
||||||
|
- [Documentation]
|
||||||
- [APK]
|
- [APK]
|
||||||
|
|
||||||
|
### Sources
|
||||||
|
|
||||||
|
- [Upgrading Alpine Linux to a new release branch]
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
Reference
|
Reference
|
||||||
═╬═Time══
|
═╬═Time══
|
||||||
@@ -43,3 +61,8 @@ rc-service 'gitea' start
|
|||||||
|
|
||||||
<!-- Knowledge base -->
|
<!-- Knowledge base -->
|
||||||
[apk]: ../apk.md
|
[apk]: ../apk.md
|
||||||
|
|
||||||
|
<!-- Upstream -->
|
||||||
|
[Documentation]: https://wiki.alpinelinux.org/wiki/Main_Page
|
||||||
|
[Upgrading Alpine Linux to a new release branch]: https://wiki.alpinelinux.org/wiki/Upgrading_Alpine_Linux_to_a_new_release_branch
|
||||||
|
[Website]: https://alpinelinux.org/
|
||||||
|
|||||||
@@ -529,14 +529,15 @@ curl -sSL 'https://install.pi-hole.net' | bash
|
|||||||
/etc/.pihole/pihole -a -p
|
/etc/.pihole/pihole -a -p
|
||||||
|
|
||||||
# Update pi-hole as a whole, if needed.
|
# Update pi-hole as a whole, if needed.
|
||||||
|
/etc/.pihole/pihole updatePihole
|
||||||
/etc/.pihole/pihole -up
|
/etc/.pihole/pihole -up
|
||||||
|
|
||||||
# Set the router as the primary DNS server.
|
# Set the router as the primary DNS server.
|
||||||
sed -E -i.bak 's|^#?\s*DNS\s*=\s*.*$|DNS=192.168.1.1|' '/etc/systemd/resolved.conf'
|
sed -E -i'.bak' 's|^#?\s*DNS\s*=\s*.*$|DNS=192.168.1.1|' '/etc/systemd/resolved.conf'
|
||||||
|
|
||||||
# Set Cloudflare as the fallback DNS server.
|
# Set Cloudflare as the fallback DNS server.
|
||||||
# Optional.
|
# Optional.
|
||||||
sed -E -i.bak 's|^#?\s*FallbackDNS\s*=\s*.*$|FallbackDNS=1.1.1.1 1.0.0.1 2606:4700:4700::1111 2606:4700:4700::1001 # Cloudflare|' '/etc/systemd/resolved.conf'
|
sed -E -i'.bak' 's|^#?\s*FallbackDNS\s*=\s*.*$|FallbackDNS=1.1.1.1 1.0.0.1 2606:4700:4700::1111 2606:4700:4700::1001 # Cloudflare|' '/etc/systemd/resolved.conf'
|
||||||
|
|
||||||
# Set the interface to ignore DNS lists given by the DHCP server.
|
# Set the interface to ignore DNS lists given by the DHCP server.
|
||||||
cp '/etc/systemd/network/eth0.network' '/etc/systemd/network/eth0.network.bak'
|
cp '/etc/systemd/network/eth0.network' '/etc/systemd/network/eth0.network.bak'
|
||||||
|
|||||||
Reference in New Issue
Block a user