From f5efae0f8c4c53798f8f9fc88c5f92f38a223320 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Mon, 6 May 2019 00:40:09 +0200 Subject: [PATCH] Move phpldapadmin to pkgs --- .../modules/websites/tools/tools/default.nix | 1 + nixops/modules/websites/tools/tools/ldap.nix | 26 ++----------------- pkgs/webapps/default.nix | 6 +++++ pkgs/webapps/phpldapadmin/default.nix | 24 +++++++++++++++++ .../phpldapadmin}/ldap-align-button.patch | 0 .../phpldapadmin}/ldap-disable-mcrypt.patch | 0 .../webapps/phpldapadmin}/ldap-php5_5.patch | 0 .../webapps/phpldapadmin}/ldap-php7_2.patch | 0 .../ldap-sort-in-templates.patch | 0 9 files changed, 33 insertions(+), 24 deletions(-) create mode 100644 pkgs/webapps/phpldapadmin/default.nix rename {nixops/modules/websites/tools/tools => pkgs/webapps/phpldapadmin}/ldap-align-button.patch (100%) rename {nixops/modules/websites/tools/tools => pkgs/webapps/phpldapadmin}/ldap-disable-mcrypt.patch (100%) rename {nixops/modules/websites/tools/tools => pkgs/webapps/phpldapadmin}/ldap-php5_5.patch (100%) rename {nixops/modules/websites/tools/tools => pkgs/webapps/phpldapadmin}/ldap-php7_2.patch (100%) rename {nixops/modules/websites/tools/tools => pkgs/webapps/phpldapadmin}/ldap-sort-in-templates.patch (100%) diff --git a/nixops/modules/websites/tools/tools/default.nix b/nixops/modules/websites/tools/tools/default.nix index 827c563..e872224 100644 --- 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 7c26b61..8ee39f6 100644 --- 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 da38f5f..7e04e8d 100644 --- 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 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 -- 2.41.0