From 7bb5c4549478631a4f0d8ac93e63044fe9b2b4b5 Mon Sep 17 00:00:00 2001
From: Dominik Polakovics <dominik.polakovics@cloonar.com>
Date: Wed, 4 Feb 2026 15:59:05 +0100
Subject: [PATCH] feat: update phpldapadmin and clean it up

---
 hosts/fw/modules/phpldapadmin.nix     | 40 ---------------------------
 hosts/fw/modules/web/phpldapadmin.nix |  2 +-
 hosts/fw/pkgs/default.nix             |  1 -
 hosts/fw/pkgs/phpldapadmin.nix        | 23 ---------------
 4 files changed, 1 insertion(+), 65 deletions(-)
 delete mode 100644 hosts/fw/modules/phpldapadmin.nix
 delete mode 100644 hosts/fw/pkgs/phpldapadmin.nix

diff --git a/hosts/fw/modules/phpldapadmin.nix b/hosts/fw/modules/phpldapadmin.nix
deleted file mode 100644
index 07d3279..0000000
--- a/hosts/fw/modules/phpldapadmin.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  virtualisation.oci-containers.backend = "podman";
-  virtualisation.oci-containers.containers = {
-    phpldapadmin = {
-      image = "phpldapadmin/phpldapadmin:2.2.2";
-      autoStart = true;
-      ports = [
-        "80:8087/tcp"
-      ];
-      environmentFiles = [
-        config.sops.secrets.phpldapadmin.path
-      ];
-    };
-  };
-
-  systemd.timers."restart-phpldapadmin" = {
-    wantedBy = [ "timers.target" ];
-      timerConfig = {
-        OnCalendar = "*-*-* 3:00:00";
-        Unit = "restart-phpldapadmin.service";
-      };
-  };
-
-  systemd.services."restart-phpldapadmin" = {
-    script = ''
-      set -eu
-      if ${pkgs.systemd}/bin/systemctl is-active --quiet podman-phpldapadmin.service; then
-          ${pkgs.systemd}/bin/systemctl restart podman-phpldapadmin.service
-      fi
-    '';
-    serviceConfig = {
-      Type = "oneshot";
-      User = "root";
-    };
-  };
-
-  sops.secrets.phpldapadmin = {};
-}
diff --git a/hosts/fw/modules/web/phpldapadmin.nix b/hosts/fw/modules/web/phpldapadmin.nix
index 32d7bd2..e267af3 100644
--- a/hosts/fw/modules/web/phpldapadmin.nix
+++ b/hosts/fw/modules/web/phpldapadmin.nix
@@ -6,7 +6,7 @@ with lib;
   virtualisation.oci-containers.backend = "podman";
   virtualisation.oci-containers.containers = {
     phpldapadmin = {
-      image = "phpldapadmin/phpldapadmin:2.2.2";
+      image = "phpldapadmin/phpldapadmin:2.3.9";
       autoStart = true;
       ports = [
         "8087:8080/tcp"
diff --git a/hosts/fw/pkgs/default.nix b/hosts/fw/pkgs/default.nix
index 5e2bb28..fc10c7a 100644
--- a/hosts/fw/pkgs/default.nix
+++ b/hosts/fw/pkgs/default.nix
@@ -3,5 +3,4 @@ let
   pkgs = import <nixpkgs> {};
 in
 {
-  phpLDAPadmin = pkgs.callPackage ./phpldapadmin.nix { };
 }
diff --git a/hosts/fw/pkgs/phpldapadmin.nix b/hosts/fw/pkgs/phpldapadmin.nix
deleted file mode 100644
index b781b52..0000000
--- a/hosts/fw/pkgs/phpldapadmin.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ fetchurl, lib, stdenv }:
-
-stdenv.mkDerivation rec {
-  pname      = "phpLDAPadmin";
-  version    = "2.1.4";
-
-  src = fetchurl {
-    url    = "https://github.com/leenooks/phpLDAPadmin/archive/${version}.tar.gz";
-    sha256 = "hkigC458YSgAZVCzVznix8ktDBuQm+UH3ujXn9Umylc=";
-  };
-
-  installPhase = ''
-    mkdir -p $out
-    cp -r . $out/
-    ln -sf /etc/phpldapadmin/env $out/.env
-  '';
-
-  meta = {
-    description = "phpLDAPadmin";
-    license     = lib.licenses.gpl3;
-    platforms   = lib.platforms.all;
-  };
-}