diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0df6c91ab..910bbf733 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,7 @@ jobs: - name: Clone DietPi-Docs repository id: clone # https://github.com/actions/checkout/tags - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Node.js for markdownlint-cli2 # https://github.com/actions/setup-node/tags uses: actions/setup-node@v3 diff --git a/docs/hardware.md b/docs/hardware.md index 527db7e5f..02e73e62f 100644 --- a/docs/hardware.md +++ b/docs/hardware.md @@ -755,7 +755,7 @@ After this, the script runs a couple of minutes, finally the following message o ![DietPi-Installer finish output](assets/images/dietpi-prep-finish.png){: width="550" height="113" loading="lazy"} -After this you can restart your system (`reboot`), alternatively you can copy the SC card (via `dd`) to an image (`.img`) to duplicate your base installation. +After this you can restart your system (`reboot`), alternatively you can copy the SD card (via `dd`) to an image (`.img`) to duplicate your base installation. A further step can be to generate a compressed DietPi image via the [`dietpi-imager`](https://github.com/MichaIng/DietPi/blob/master/.build/images/dietpi-imager) script: diff --git a/docs/install.md b/docs/install.md index 8d5fa4fd8..3ced3deb5 100644 --- a/docs/install.md +++ b/docs/install.md @@ -368,6 +368,8 @@ Select the following tabs for the installation description of your target. apt install open-vm-tools ``` + Another article with DietPi install and setup instructions on vSphere has been published by `virtualizationhowto.com`: + === "Proxmox"

Introduction

diff --git a/docs/releases/v6_27.md b/docs/releases/v6_27.md index 4fc1399bd..6b8cc285e 100644 --- a/docs/releases/v6_27.md +++ b/docs/releases/v6_27.md @@ -44,7 +44,7 @@ - **DietPi-Software** | **Home Assistant** :octicons-arrow-right-16: Resolved on issue where fresh install failed to started to start due to missing permissions. Many thanks to [@slopsjon](https://dietpi.com/forum/u/slopsjon){: class="nospellcheck"}, [@tyjtyj](https://dietpi.com/forum/u/tyjtyj){: class="nospellcheck"} and [@pakikje](https://dietpi.com/forum/u/pakikje){: class="nospellcheck"} for reporting this issue. - **DietPi-Software** | **Google AIY** :octicons-arrow-right-16: Resolved an issue where fresh install failed to start due to missing permissions. - **DietPi-Software** | **Grafana** :octicons-arrow-right-16: Resolved an issue where install failed on RPi 1/Zero Buster systems. The fix includes an update of Grafana to the latest official version for those models. Many thanks to @TBail for reporting this issue: -- **DietPi-Software** | **Jackett** :octicons-arrow-right-16: Resolved an issue where the internal updater broke the Jackett instance. Automated updates can be safely enabled again. Many thanks to @ngosang for providing the workaround: +- **DietPi-Software** | **Jackett** :octicons-arrow-right-16: Resolved an issue where the internal updater broke the Jackett instance. Automated updates can be safely enabled again. Many thanks to @ezekini for reporting this issue: - **DietPi-Software** | **Pi-hole** :octicons-arrow-right-16: Resolved an issue where choosing to block public admin panel access on Nginx failed. Many thanks to @anubis-genix for reporting this issue: - **DietPi-Software** | **Java** :octicons-arrow-right-16: Resolved an issue where install on ARMv6 RPis (1/Zero) on Buster system failed, since Java 11 is not ARMv6-compatible. On these system, Java 8 is now installed instead. Many thanks to @maartenlangeveld for reporting this issue: - **DietPi-Software** | **rTorrent** :octicons-arrow-right-16: Resolved an issue where rTorrent and the webserver didn't have sufficient permissions to read and write ruTorrent web UI settings and data. Many thanks to @notDavid for reporting this issue: diff --git a/docs/software/advanced_networking.md b/docs/software/advanced_networking.md index d66095877..a676ba654 100644 --- a/docs/software/advanced_networking.md +++ b/docs/software/advanced_networking.md @@ -38,7 +38,7 @@ The WiFi HotSpot package turns your device into a wireless hotspot/access point. The requirements are: - - 1x Ethernet connection + - 1x Ethernet connection (LAN) - 1x Supported USB WiFi adapter or onboard WiFi. This may vary depending on device and available WiFi drivers/modules. However, common adapters (e.g.: Atheros) should be fine. === "Initial connection credentials" @@ -145,6 +145,62 @@ The WiFi HotSpot package turns your device into a wireless hotspot/access point. Additionally, DHCP leases can be monitored via the file `/var/lib/dhcp/dhcpd.leases`. +=== "Combine with AdGuard Home resp. Pi-hole" + + The WiFi HotSpot can be combined with AdGuard Home resp. Pi-hole. To do this, the DHCP server needs to know the IP address of the Ad-Blocker system and announces it as the DNS server for the WiFi area. + + The corresponding file is `/etc/dhcp/dhcpd.conf`, the entry `option domain-name-servers` has to be set to your Ad-Blocker IP address. + In the following there are three examples given starting from the following base `dhcpd.conf` content: + + ``` + authoritative; + #default-lease-time 43200; + #max-lease-time 86400; + + subnet 192.168.42.0 netmask 255.255.255.0 { + range 192.168.42.10 192.168.42.250; + option broadcast-address 192.168.42.255; + option routers 192.168.42.1; + option domain-name "local"; + option domain-name-servers 9.9.9.9, 149.112.112.112; + } + ``` + + 1. AdGuard Home runs on the same DietPi system as the WiFi HotSpot runs. Then the "subnet" section contents has to be changed to + ``` + subnet 192.168.42.0 netmask 255.255.255.0 { + range 192.168.42.10 192.168.42.250; + option broadcast-address 192.168.42.255; + option routers 192.168.42.1; + option domain-name "local"; + # AdGuard Home runs on the localhost (with IP address 192.168.42.1) + option domain-name-servers 192.168.42.1; + } + ``` + + 1. Pi-hole runs in the subnet the (superimposed) LAN connection belongs to. Depending on the LAN subnet (e.g. 192.168.178.0/24) the "subnet" section contents might be changed to + ``` + subnet 192.168.42.0 netmask 255.255.255.0 { + range 192.168.42.10 192.168.42.250; + option broadcast-address 192.168.42.255; + option routers 192.168.42.1; + option domain-name "local"; + # Pi-hole runs on the LAN (with IP address 192.168.178.2) + option domain-name-servers 192.168.178.2; + } + ``` + + 1. Pi-hole runs in the subnet the WiFi connection belongs to. Depending on the WiFi HotSpot subnet (e.g. 192.168.42.0/24) the "subnet" section contents might be changed to + ``` + subnet 192.168.42.0 netmask 255.255.255.0 { + range 192.168.42.10 192.168.42.250; + option broadcast-address 192.168.42.255; + option routers 192.168.42.1; + # Pi-hole runs on the WiFi subnet (with IP address 192.168.42.250) + option domoption domain-name-servers 192.168.42.250; + } + ``` + *** YouTube video tutorial (German language): [Raspberry Hotspot: Internet Sperren umgehen mit eigenen WiFi Hotspot unter DietPi (für alle Geräte)](https://www.youtube.com/watch?v=3ZROq90tM_s){:class="nospellcheck"} @@ -240,7 +296,7 @@ It is best suited for high traffic web sites and powers quite a number of the wo *** Website: -Official documentation: +Official documentation: ## frp