pihole-ftl: init at 5.8.1 #108055

JamieMagee · 2020-12-31T16:02:58Z

Motivation for this change

The first part of a trio of PRs (to be followed by pihole and pihole-admin). Based on the work of @nuxeh and the pi-hole-ftl Arch Linux package

#61617

Things done

pkgs/tools/networking/pihole-ftl/cmake.patch

pkgs/tools/networking/pihole-ftl/default.nix

pkgs/tools/networking/pihole-ftl/version.patch

SuperSandro2000 · 2021-01-11T00:59:36Z

This is a semi-automatic executed nixpkgs-review which does not build all packages (e.g. lumo, tensorflow or pytorch)
If you find some bugs or got suggestions for further things to search or run please reach out to SuperSandro2000 on IRC.

Result of nixpkgs-review pr 108055 run on x86_64-darwin 1

1 package failed to build and are new build failure:

pihole-ftl: log https://termbin.com/sgpu

SuperSandro2000 · 2021-01-11T01:04:47Z

This is a semi-automatic executed nixpkgs-review which does not build all packages (e.g. lumo, tensorflow or pytorch)
If you find some bugs or got suggestions for further things to search or run please reach out to SuperSandro2000 on IRC.

Result of nixpkgs-review pr 108055 run on x86_64-linux 1

1 package blacklisted:

tests.nixos-functions.nixos-test

1 package built:

pihole-ftl

JamieMagee · 2021-01-12T19:16:02Z

I will mark this package as linux only. Fixes for mac should be made upstream.

pkgs/tools/networking/pihole-ftl/default.nix

JamieMagee · 2021-03-29T15:25:24Z

@SuperSandro2000 Ready for re-review

cole-h

I look forward to getting this into Nixpkgs so I can ditch my old Pi that's showing its age :)

nixos/modules/services/networking/pihole-ftl.nix

pkgs/tools/networking/pihole-ftl/default.nix

nixos/modules/services/networking/pihole-ftl.nix

pkgs/tools/networking/pihole-ftl/default.nix

Mindavi

LGTM, haven't tested this though.

nixos/modules/services/networking/pihole-ftl.nix

JamieMagee · 2021-05-27T15:03:57Z

@cole-h I think this iteration is ready for review.

cole-h · 2021-05-27T15:31:15Z

Great! Unfortunately, I'm a bit swamped at the moment... I'll be able to take a look Monday at the earliest. Sorry for the inconvenience.

JamieMagee · 2021-05-27T15:33:04Z

Not a problem. I know the feeling 😅. This PR has been open for a while, so there's no rush!

SuperSandro2000 · 2021-05-29T00:25:44Z

nixos/modules/services/networking/pihole-ftl.nix

+    assertions = [
+      {
+        assertion = !config.services.dnsmasq.enable;
+        message = "pihole-ftl conflicts with dnsmasq";


Suggested change

message = "pihole-ftl conflicts with dnsmasq";

message = "pihole-ftl conflicts with dnsmasq. Please disable one of them.";

aanderse · 2021-05-29T00:53:21Z

nixos/modules/services/networking/pihole-ftl.nix

+let
+
+  cfg = config.services.pihole-ftl;
+  stateDir = "/etc/pihole";


🚨

When we start calling variables that point to /etc by stateDir in NixOS the red alert sirens start up. Generally people in the NixOS community aren't a fan of using configuration directories for state.

You have a problem, though. It appears this software is very stubborn when it comes to doing almost everything NixOS doesn't want software to do. Just take a look at this.

Can we use RootDirectory to shoehorn this service into its own space?

It is pretty common to edit the config values for pihole over the web interface. That wouldn't really work on nixos.

Also it regularly updates blocklists which need to go there.

aanderse · 2021-05-29T00:54:34Z

nixos/modules/services/networking/pihole-ftl.nix

+    systemd.tmpfiles.rules = [
+      "d ${stateDir} 0700 pihole pihole - -"
+      "L+ ${confFile} - - - - ${confText}"
+      "f ${logFile} 0700 pihole pihole - -"


Will this grow indefinitely until the system it runs on comes to a crash from lack of disk space?

It will keep 24h I think https://docs.pi-hole.net/ftldns/configfile/#maxlogage

I saw a number of mentions about log rotation, so maybe the old files need to be deleted. NixOS has a module for that, if needed.

cole-h

Diff LGTM, but I'm gonna try and run it to make sure everything looks good before giving the green checkmark.

cole-h · 2021-05-31T15:56:26Z

pkgs/tools/networking/pihole-ftl/default.nix

+    owner = "pi-hole";
+    repo = "FTL";
+    rev = "v${version}";
+    sha512 = "1ybf71jwr781c7q3xvjla2vhnarba6dpp94ghzd31vhdc038g36f0ad2xp3hh8bk1hmlwzzqpcd5pl23w0f4b19kgms4cbk8rh6nvpr";


Any reason why you chose sha512? Nixpkgs usually defaults to sha256.

It doesn't matter (I don't think); just curious.

cole-h · 2021-05-31T15:58:09Z

pkgs/tools/networking/pihole-ftl/default.nix

+    substituteInPlace src/version.h.in \
+      --replace "@GIT_VERSION@" "v${version}" \
+      --replace "@GIT_DATE@" "1970-01-01" \
+      --replace "@GIT_BRANCH@" "master" \


I'd also change this to v${version}.

Kranzes · 2021-08-05T23:56:30Z

Any updates on the current state of this PR?

JamieMagee · 2021-08-09T17:29:51Z

@Kranzes I haven't had a chance to work on this PR recently. I think it is relatively close, so feel free to pick up the remaining work to get it merged.

SuperSandro2000 · 2022-10-14T22:49:10Z

I would really like to get pihole into nixpkgs but I think it won't be easy and almost not feasible because it assumes almost everywhere writable FHS directories like https://github.com/pi-hole/pi-hole/blob/master/advanced/Scripts/piholeLogFlush.sh

JamieMagee · 2022-12-18T21:16:30Z

Closing this PR as I don't intend to continue with it. I'll leave the branch around if anyone wants to pick up where I left off.

williamvds · 2023-03-08T00:09:47Z

For those who may be interested, I'm currently picking up this work. For now it lives in my personal Flake.
I've got pihole-ftl running alongside the Admin UI in a mostly functional and declarative state. I'll raise a draft PR once I've ironed out more of the kinks.

ofborg bot added 6.topic: nixos 8.has: module (update) 8.has: package (new) 11.by: package-maintainer 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 labels Dec 31, 2020

SuperSandro2000 requested changes Dec 31, 2020

View reviewed changes

JamieMagee force-pushed the pihole-ftl branch from 4cec299 to f78daf9 Compare January 2, 2021 18:48

JamieMagee requested a review from SuperSandro2000 January 2, 2021 20:13

jkachmar reviewed Jan 20, 2021

View reviewed changes

pkgs/tools/networking/pihole-ftl/default.nix Outdated Show resolved Hide resolved

JamieMagee force-pushed the pihole-ftl branch 2 times, most recently from 23b5611 to bdf09cc Compare March 28, 2021 02:57

JamieMagee changed the title ~~pihole-ftl: init at 5.3.4~~ pihole-ftl: init at 5.7 Mar 28, 2021

ofborg bot added 10.rebuild-darwin: 0 and removed 10.rebuild-darwin: 1 10.rebuild-darwin: 1-10 labels Mar 28, 2021

lunik1 mentioned this pull request Apr 24, 2021

nixos/adguardhome: init #120568

Merged

10 tasks

cole-h reviewed May 18, 2021

View reviewed changes

pkgs/tools/networking/pihole-ftl/default.nix Outdated Show resolved Hide resolved

JamieMagee force-pushed the pihole-ftl branch from bdf09cc to 6df75c2 Compare May 18, 2021 17:12

JamieMagee changed the title ~~pihole-ftl: init at 5.7~~ pihole-ftl: init at 5.8.1 May 18, 2021

Mindavi reviewed May 18, 2021

View reviewed changes

pkgs/tools/networking/pihole-ftl/default.nix Outdated Show resolved Hide resolved

pihole-ftl: init at 5.8.1

239c301

JamieMagee force-pushed the pihole-ftl branch from 6df75c2 to cfbd27b Compare May 19, 2021 02:57

nixos/pihole-ftl: init

53ae1b2

JamieMagee force-pushed the pihole-ftl branch from cfbd27b to 53ae1b2 Compare May 19, 2021 03:02

JamieMagee requested review from cole-h and Mindavi May 19, 2021 03:31

Mindavi reviewed May 19, 2021

View reviewed changes

nixos/modules/services/networking/pihole-ftl.nix Show resolved Hide resolved

SuperSandro2000 reviewed May 29, 2021

View reviewed changes

SuperSandro2000 requested a review from aanderse May 29, 2021 00:26

aanderse reviewed May 29, 2021

View reviewed changes

cole-h reviewed May 31, 2021

View reviewed changes

stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jun 19, 2022

SuperSandro2000 added the 2.status: merge conflict label Oct 14, 2022

stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Oct 14, 2022

SuperSandro2000 added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Oct 14, 2022

stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Oct 14, 2022

JamieMagee closed this Dec 18, 2022

williamvds mentioned this pull request Apr 5, 2023

pihole: init at various #224881

Open

15 tasks

JamieMagee deleted the pihole-ftl branch September 3, 2023 05:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

pihole-ftl: init at 5.8.1 #108055

pihole-ftl: init at 5.8.1 #108055

JamieMagee commented Dec 31, 2020

SuperSandro2000 commented Jan 11, 2021

SuperSandro2000 commented Jan 11, 2021

JamieMagee commented Jan 12, 2021

JamieMagee commented Mar 29, 2021

cole-h left a comment

Mindavi left a comment

JamieMagee commented May 27, 2021

cole-h commented May 27, 2021

JamieMagee commented May 27, 2021

SuperSandro2000 May 29, 2021

aanderse May 29, 2021

SuperSandro2000 May 31, 2021 •

edited

aanderse May 29, 2021

SuperSandro2000 May 31, 2021

aanderse May 31, 2021

cole-h left a comment

cole-h May 31, 2021

cole-h May 31, 2021

Kranzes commented Aug 5, 2021

JamieMagee commented Aug 9, 2021

SuperSandro2000 commented Oct 14, 2022

JamieMagee commented Dec 18, 2022

williamvds commented Mar 8, 2023 •

edited

	message = "pihole-ftl conflicts with dnsmasq";
	message = "pihole-ftl conflicts with dnsmasq. Please disable one of them.";

pihole-ftl: init at 5.8.1 #108055

pihole-ftl: init at 5.8.1 #108055

Conversation

JamieMagee commented Dec 31, 2020

Motivation for this change

Things done

SuperSandro2000 commented Jan 11, 2021

SuperSandro2000 commented Jan 11, 2021

JamieMagee commented Jan 12, 2021

JamieMagee commented Mar 29, 2021

cole-h left a comment

Choose a reason for hiding this comment

Mindavi left a comment

Choose a reason for hiding this comment

JamieMagee commented May 27, 2021

cole-h commented May 27, 2021

JamieMagee commented May 27, 2021

SuperSandro2000 May 29, 2021

Choose a reason for hiding this comment

aanderse May 29, 2021

Choose a reason for hiding this comment

SuperSandro2000 May 31, 2021 • edited

Choose a reason for hiding this comment

aanderse May 29, 2021

Choose a reason for hiding this comment

SuperSandro2000 May 31, 2021

Choose a reason for hiding this comment

aanderse May 31, 2021

Choose a reason for hiding this comment

cole-h left a comment

Choose a reason for hiding this comment

cole-h May 31, 2021

Choose a reason for hiding this comment

cole-h May 31, 2021

Choose a reason for hiding this comment

Kranzes commented Aug 5, 2021

JamieMagee commented Aug 9, 2021

SuperSandro2000 commented Oct 14, 2022

JamieMagee commented Dec 18, 2022

williamvds commented Mar 8, 2023 • edited

SuperSandro2000 May 31, 2021 •

edited

williamvds commented Mar 8, 2023 •

edited