Move phpldapadmin to pkgs

diff --git a/nixops/modules/websites/tools/tools/default.nix b/nixops/modules/websites/tools/tools/default.nix
index 827c5639bb0a28bd9b63d2d79e5ece134b307d68..e8722242c5c7494bfc410ba917f49ea6a58a1353 100644 (file)
--- a/nixops/modules/websites/tools/tools/default.nix
+++ b/nixops/modules/websites/tools/tools/default.nix
@@ -33,6 +33,7 @@ let
       inherit (mylibs) fetchedGithub;
     };
     ldap = pkgs.callPackage ./ldap.nix {
+      inherit (pkgs.webapps) phpldapadmin;
       env = myconfig.env.tools.phpldapadmin;
     };
 

diff --git a/nixops/modules/websites/tools/tools/ldap.nix b/nixops/modules/websites/tools/tools/ldap.nix
index 7c26b6143e27b0a2804330b2a6e4e092b2e6e269..8ee39f61e9dc5fb26297d4c3b11546cb146bb623 100644 (file)
--- a/nixops/modules/websites/tools/tools/ldap.nix
+++ b/nixops/modules/websites/tools/tools/ldap.nix
@@ -1,4 +1,4 @@
-{ lib, php, env, writeText, stdenv, optipng, fetchurl }:
+{ lib, php, env, writeText, phpldapadmin }:
 rec {
   keys = [{
     dest = "webapps/tools-ldap";
@@ -25,29 +25,7 @@ rec {
       $servers->setValue('login','fallback_dn',true);
       '';
   }];
-  webRoot = stdenv.mkDerivation rec {
-    version = "1.2.3";
-    name = "phpldapadmin-${version}";
-    src = fetchurl {
-      url = "https://downloads.sourceforge.net/project/phpldapadmin/phpldapadmin-php5/${version}/${name}.tgz";
-      sha256 = "0n7dhp2a7n1krmnik3pb969jynsmhghmxviivnckifkprv1zijmf";
-    };
-    patches = [
-      ./ldap-php5_5.patch
-      ./ldap-disable-mcrypt.patch
-      ./ldap-php7_2.patch
-      ./ldap-sort-in-templates.patch
-      ./ldap-align-button.patch
-      ];
-    buildInputs = [ optipng ];
-    buildPhase = ''
-      find -name '*.png' -exec optipng -quiet -force -fix {} \;
-    '';
-    installPhase = ''
-      cp -a . $out
-      ln -sf /var/secrets/webapps/tools-ldap $out/config/config.php
-    '';
-  };
+  webRoot = phpldapadmin.override { config = "/var/secrets/webapps/tools-ldap"; };
   apache = rec {
     user = "wwwrun";
     group = "wwwrun";

diff --git a/pkgs/webapps/default.nix b/pkgs/webapps/default.nix
index da38f5fe5b280d93f064b23a4f206b2f6a4cc94b..7e04e8d498d4a558f365769d3a7d70365bcc80b0 100644 (file)
--- a/pkgs/webapps/default.nix
+++ b/pkgs/webapps/default.nix
@@ -1,10 +1,14 @@
 { callPackage, mylibs, lib }:
 rec {
   diaspora = callPackage ./diaspora { inherit mylibs; };
+
   mastodon = callPackage ./mastodon { inherit mylibs; };
+
   awl = callPackage ./awl {};
   davical = callPackage ./davical {};
+
   infcloud = callPackage ./infcloud {};
+
   nextcloud = callPackage ./nextcloud {};
   nextcloud-apps = let
       names = [
@@ -17,4 +21,6 @@ rec {
     in
     lib.attrsets.genAttrs names
       (name: callPackage (./nextcloud/apps + "/${name}.nix") { buildApp = nextcloud.buildApp; });
+
+  phpldapadmin = callPackage ./phpldapadmin {};
 }

diff --git a/pkgs/webapps/phpldapadmin/default.nix b/pkgs/webapps/phpldapadmin/default.nix
new file mode 100644 (file)
index 0000000..70fd19a
--- /dev/null
+++ b/pkgs/webapps/phpldapadmin/default.nix
@@ -0,0 +1,24 @@
+{ config ? "/etc/phpldapadmin/config.php", fetchurl, stdenv, optipng }:
+stdenv.mkDerivation rec {
+  version = "1.2.3";
+  name = "phpldapadmin-${version}";
+  src = fetchurl {
+    url = "https://downloads.sourceforge.net/project/phpldapadmin/phpldapadmin-php5/${version}/${name}.tgz";
+    sha256 = "0n7dhp2a7n1krmnik3pb969jynsmhghmxviivnckifkprv1zijmf";
+  };
+  patches = [
+    ./ldap-php5_5.patch
+    ./ldap-disable-mcrypt.patch
+    ./ldap-php7_2.patch
+    ./ldap-sort-in-templates.patch
+    ./ldap-align-button.patch
+    ];
+  buildInputs = [ optipng ];
+  buildPhase = ''
+    find -name '*.png' -exec optipng -quiet -force -fix {} \;
+  '';
+  installPhase = ''
+    cp -a . $out
+    ln -sf ${config} $out/config/config.php
+  '';
+}

diff --git a/nixops/modules/websites/tools/tools/ldap-align-button.patch b/pkgs/webapps/phpldapadmin/ldap-align-button.patch
similarity index 100%
rename from nixops/modules/websites/tools/tools/ldap-align-button.patch
rename to pkgs/webapps/phpldapadmin/ldap-align-button.patch

diff --git a/nixops/modules/websites/tools/tools/ldap-disable-mcrypt.patch b/pkgs/webapps/phpldapadmin/ldap-disable-mcrypt.patch
similarity index 100%
rename from nixops/modules/websites/tools/tools/ldap-disable-mcrypt.patch
rename to pkgs/webapps/phpldapadmin/ldap-disable-mcrypt.patch

diff --git a/nixops/modules/websites/tools/tools/ldap-php5_5.patch b/pkgs/webapps/phpldapadmin/ldap-php5_5.patch
similarity index 100%
rename from nixops/modules/websites/tools/tools/ldap-php5_5.patch
rename to pkgs/webapps/phpldapadmin/ldap-php5_5.patch

diff --git a/nixops/modules/websites/tools/tools/ldap-php7_2.patch b/pkgs/webapps/phpldapadmin/ldap-php7_2.patch
similarity index 100%
rename from nixops/modules/websites/tools/tools/ldap-php7_2.patch
rename to pkgs/webapps/phpldapadmin/ldap-php7_2.patch

diff --git a/nixops/modules/websites/tools/tools/ldap-sort-in-templates.patch b/pkgs/webapps/phpldapadmin/ldap-sort-in-templates.patch
similarity index 100%
rename from nixops/modules/websites/tools/tools/ldap-sort-in-templates.patch
rename to pkgs/webapps/phpldapadmin/ldap-sort-in-templates.patch