Move spip and chloe website to pkgs

8 files changed, 151 insertions, 2 deletions

diff --git a/pkgs/private/default.nix b/pkgs/private/default.nix
index 951a23f..60fabad 100644
--- a/pkgs/private/default.nix
+++ b/pkgs/private/default.nix
@@ -4,5 +4,9 @@ let
   mylibs = import ../../libs.nix { inherit pkgs; };
 in
 rec {
-  webapps = callPackage ./webapps { inherit mylibs; inherit (pkgs) composerEnv; };
+  webapps = callPackage ./webapps {
+    inherit mylibs;
+    inherit (pkgs) composerEnv;
+    inherit (pkgs.webapps) spip;
+  };
 }
diff --git a/pkgs/private/webapps/chloe/chloe.json b/pkgs/private/webapps/chloe/chloe.json
new file mode 100644
index 0000000..686d751
--- /dev/null
+++ b/pkgs/private/webapps/chloe/chloe.json
@@ -0,0 +1,14 @@
+{
+  "tag": "96fc4eb-master",
+  "meta": {
+    "name": "chloe",
+    "url": "gitolite@git.immae.eu:perso/Immae/Sites/Chloe",
+    "branch": "master"
+  },
+  "git": {
+    "url": "gitolite@git.immae.eu:perso/Immae/Sites/Chloe",
+    "rev": "96fc4eb0099a29b0f9a58fb4eaec4bf14ac65f0a",
+    "sha256": "0mf15j6z86j2smm2k360cmm5djhcjbs9949pznwi57kw97vkm1s3",
+    "fetchSubmodules": true
+  }
+}
diff --git a/pkgs/private/webapps/chloe/default.nix b/pkgs/private/webapps/chloe/default.nix
new file mode 100644
index 0000000..f148d4b
--- /dev/null
+++ b/pkgs/private/webapps/chloe/default.nix
@@ -0,0 +1,19 @@
+{ environment ? "prod"
+, varDir ? "/var/lib/chloe_${environment}"
+, spip, stdenv, mylibs, sassc }:
+let
+  siteDir = stdenv.mkDerivation (mylibs.fetchedGitPrivate ./chloe.json // rec {
+    buildPhase = ''
+      make
+      '';
+    installPhase = ''
+      cp -a . $out
+      '';
+    buildInputs = [ sassc ];
+  });
+in
+spip.override {
+  ldap = true;
+  siteName = "chloe";
+  inherit environment siteDir;
+}
diff --git a/pkgs/private/webapps/default.nix b/pkgs/private/webapps/default.nix
index 46ad31c..14fd544 100644
--- a/pkgs/private/webapps/default.nix
+++ b/pkgs/private/webapps/default.nix
@@ -1,6 +1,7 @@
-{ callPackage, mylibs, composerEnv, lib }:
+{ callPackage, mylibs, composerEnv, lib, spip }:
 rec {
   aten = callPackage ./aten { inherit composerEnv mylibs; };
+  chloe = callPackage ./chloe { inherit mylibs spip; };
   connexionswing = callPackage ./connexionswing { inherit composerEnv mylibs;};
   ludivinecassal = callPackage ./ludivinecassal { inherit composerEnv mylibs; };
   piedsjaloux = callPackage ./piedsjaloux { inherit composerEnv mylibs; };
diff --git a/pkgs/webapps/default.nix b/pkgs/webapps/default.nix
index 0ef6736..229609f 100644
--- a/pkgs/webapps/default.nix
+++ b/pkgs/webapps/default.nix
@@ -86,6 +86,7 @@ rec {
     lib.attrsets.genAttrs names
       (name: callPackage (./roundcubemail/plugins + "/${name}") { buildPlugin = roundcubemail.buildPlugin; });
 
+  spip = callPackage ./spip {};
   taskwarrior-web = callPackage ./taskwarrior-web { inherit mylibs; };
 
   ttrss = callPackage ./ttrss { inherit mylibs; };
diff --git a/pkgs/webapps/spip/default.nix b/pkgs/webapps/spip/default.nix
new file mode 100644
index 0000000..8099f53
--- /dev/null
+++ b/pkgs/webapps/spip/default.nix
@@ -0,0 +1,32 @@
+{ siteName ? "spip"
+, siteDir ? runCommand "empty" { preferLocalBuild = true; } "mkdir -p $out"
+, environment ? "prod"
+, ldap ? false
+, varDir ? "/var/lib/${siteName}_${environment}"
+, lib, fetchzip, runCommand, stdenv }:
+let
+  app = stdenv.mkDerivation rec {
+    name = "${siteName}-${environment}-spip-${version}";
+    version = "3.2.3";
+    src = fetchzip {
+      url = "https://files.spip.net/spip/archives/SPIP-v${version}.zip";
+      sha256 = "1r1mjvsnrp6mvkgjakvi3x4ms8m8k5mp93micbbg8r99fj7qlfkq";
+    };
+    paches = lib.optionals ldap [ ./spip_ldap_patch.patch ];
+    buildPhase = ''
+      rm -rf IMG local tmp config/remove.txt
+      ln -sf ${./spip_mes_options.php} config/mes_options.php
+      echo "Require all denied" > "config/.htaccess"
+      ln -sf ${varDir}/{IMG,local} .
+    '';
+    installPhase = ''
+      cp -a . $out
+      cp -a ${siteDir}/* $out
+    '';
+    passthru = {
+      inherit siteName siteDir environment varDir;
+      webRoot = app;
+      spipConfig = ./spip_mes_options.php;
+    };
+  };
+in app
diff --git a/pkgs/webapps/spip/spip_ldap_patch.patch b/pkgs/webapps/spip/spip_ldap_patch.patch
new file mode 100644
index 0000000..653c909
--- /dev/null
+++ b/pkgs/webapps/spip/spip_ldap_patch.patch
@@ -0,0 +1,60 @@
+--- old/ecrire/auth/ldap.php    2017-06-08 21:58:17.000000000 +0200
++++ new/ecrire/auth/ldap.php    2017-06-10 02:54:02.687954143 +0200
+@@ -171,24 +171,41 @@
+        $desc = isset($ldap['attributes']) && $ldap['attributes'] ? $ldap['attributes'] : $GLOBALS['ldap_attributes'] ;
+ 
+        $logins = is_array($desc['login']) ? $desc['login'] : array($desc['login']);
++        if (isset($GLOBALS['ldap_search'])) {
++          $search_query = str_replace("%user%", $login_search, $GLOBALS['ldap_search']);
++          $result = @ldap_search($ldap_link, $ldap_base, $search_query, array("dn"));
++          $info = @ldap_get_entries($ldap_link, $result);
++          // Ne pas accepter les resultats si plus d'une entree
++          // (on veut un attribut unique)
+ 
+-       // Tenter une recherche pour essayer de retrouver le DN
+-       foreach ($logins as $att) {
+-               $result = @ldap_search($ldap_link, $ldap_base, "$att=$login_search", array("dn"));
+-               $info = @ldap_get_entries($ldap_link, $result);
+-               // Ne pas accepter les resultats si plus d'une entree
+-               // (on veut un attribut unique)
++          if (is_array($info) and $info['count'] == 1) {
++            $dn = $info[0]['dn'];
++            if (!$checkpass) {
++              return $dn;
++            }
++            if (@ldap_bind($ldap_link, $dn, $pass)) {
++              return $dn;
++            }
++          }
++        } else {
++          // Tenter une recherche pour essayer de retrouver le DN
++          foreach ($logins as $att) {
++                  $result = @ldap_search($ldap_link, $ldap_base, "$att=$login_search", array("dn"));
++                  $info = @ldap_get_entries($ldap_link, $result);
++                  // Ne pas accepter les resultats si plus d'une entree
++                  // (on veut un attribut unique)
+ 
+-               if (is_array($info) and $info['count'] == 1) {
+-                       $dn = $info[0]['dn'];
+-                       if (!$checkpass) {
+-                               return $dn;
+-                       }
+-                       if (@ldap_bind($ldap_link, $dn, $pass)) {
+-                               return $dn;
+-                       }
+-               }
+-       }
++                  if (is_array($info) and $info['count'] == 1) {
++                          $dn = $info[0]['dn'];
++                          if (!$checkpass) {
++                                  return $dn;
++                          }
++                          if (@ldap_bind($ldap_link, $dn, $pass)) {
++                                  return $dn;
++                          }
++                  }
++          }
++        }
+ 
+        if ($checkpass and !isset($dn)) {
+                // Si echec, essayer de deviner le DN
diff --git a/pkgs/webapps/spip/spip_mes_options.php b/pkgs/webapps/spip/spip_mes_options.php
new file mode 100644
index 0000000..8db8389
--- /dev/null
+++ b/pkgs/webapps/spip/spip_mes_options.php
@@ -0,0 +1,18 @@
+<?php // /!\ Important: There must be no blank space before &lt;?php or after ?&gt;
+// This file was inspired from the spip contrib website
+// http://www.spip.net/fr_article3811.html
+
+$config_dir = getenv('SPIP_CONFIG_DIR') . '/';
+$var_dir = getenv('SPIP_VAR_DIR') . '/';
+
+$cookie_prefix = str_replace('.', '_', getenv("SPIP_SITE"));
+$table_prefix = 'spip';
+
+spip_initialisation(
+        $config_dir,
+        _DIR_RACINE . _NOM_PERMANENTS_ACCESSIBLES,
+        $var_dir . _NOM_TEMPORAIRES_INACCESSIBLES,
+        _DIR_RACINE . _NOM_TEMPORAIRES_ACCESSIBLES
+);
+
+?>