From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Fri, 18 Jan 2019 22:03:33 +0000 (+0100)
Subject: Fix chloe dev website
X-Git-Tag: nur_publish~319
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;ds=sidebyside;h=62a0946e8b3eda220943b9740becb3c969455549;p=perso%2FImmae%2FConfig%2FNix.git

Fix chloe dev website
---

diff --git a/virtual/modules/websites/chloe/chloe.nix b/virtual/modules/websites/chloe/chloe.nix
index 126d8e7..ca34b5a 100644
--- a/virtual/modules/websites/chloe/chloe.nix
+++ b/virtual/modules/websites/chloe/chloe.nix
@@ -96,7 +96,7 @@ let
         install -m 0750 -o ${apache.user} -g ${apache.group} -d ${varDir}/phpSessions
       '';
     };
-    configDir = ./chloe_config;
+    configDir = ./chloe_config_ + environment;
     varDir = "/var/lib/chloe_${environment}";
     siteDir = stdenv.mkDerivation (fetchedGitPrivate ./chloe.json // rec {
       buildPhase = ''
diff --git a/virtual/modules/websites/chloe/chloe_config/chmod.php b/virtual/modules/websites/chloe/chloe_config_dev/chmod.php
similarity index 100%
rename from virtual/modules/websites/chloe/chloe_config/chmod.php
rename to virtual/modules/websites/chloe/chloe_config_dev/chmod.php
diff --git a/virtual/modules/websites/chloe/chloe_config/connect.php b/virtual/modules/websites/chloe/chloe_config_dev/connect.php
similarity index 100%
rename from virtual/modules/websites/chloe/chloe_config/connect.php
rename to virtual/modules/websites/chloe/chloe_config_dev/connect.php
diff --git a/virtual/modules/websites/chloe/chloe_config/ldap.php b/virtual/modules/websites/chloe/chloe_config_dev/ldap.php
similarity index 100%
rename from virtual/modules/websites/chloe/chloe_config/ldap.php
rename to virtual/modules/websites/chloe/chloe_config_dev/ldap.php
diff --git a/virtual/modules/websites/chloe/chloe_config_prod/chmod.php b/virtual/modules/websites/chloe/chloe_config_prod/chmod.php
new file mode 100644
index 0000000..aae16cd
--- /dev/null
+++ b/virtual/modules/websites/chloe/chloe_config_prod/chmod.php
@@ -0,0 +1,4 @@
+<?php
+if (!defined("_ECRIRE_INC_VERSION")) return;
+if (!defined('_SPIP_CHMOD')) define('_SPIP_CHMOD', 0777);
+?>
\ No newline at end of file
diff --git a/virtual/modules/websites/chloe/chloe_config_prod/connect.php b/virtual/modules/websites/chloe/chloe_config_prod/connect.php
new file mode 100644
index 0000000..2e4439f
--- /dev/null
+++ b/virtual/modules/websites/chloe/chloe_config_prod/connect.php
@@ -0,0 +1,6 @@
+<?php
+if (!defined("_ECRIRE_INC_VERSION")) return;
+define('_MYSQL_SET_SQL_MODE',true);
+$GLOBALS['spip_connect_version'] = 0.7;
+spip_connect_db(getenv("SPIP_MYSQL_HOST"),'',getenv("SPIP_MYSQL_USER"),getenv("SPIP_MYSQL_PASSWORD"),getenv("SPIP_MYSQL_DB"),'mysql', 'spip','ldap.php');
+?>
diff --git a/virtual/modules/websites/chloe/chloe_config_prod/ldap.php b/virtual/modules/websites/chloe/chloe_config_prod/ldap.php
new file mode 100644
index 0000000..825b7ed
--- /dev/null
+++ b/virtual/modules/websites/chloe/chloe_config_prod/ldap.php
@@ -0,0 +1,9 @@
+<?php
+if (!defined("_ECRIRE_INC_VERSION")) return;
+$GLOBALS['ldap_base'] = getenv("SPIP_LDAP_BASE");
+$GLOBALS['ldap_link'] = @ldap_connect(getenv("SPIP_LDAP_HOST"));
+@ldap_set_option($GLOBALS['ldap_link'],LDAP_OPT_PROTOCOL_VERSION,'3');
+@ldap_bind($GLOBALS['ldap_link'],getenv("SPIP_LDAP_SEARCH_DN"), getenv("SPIP_LDAP_SEARCH_PW"));
+$GLOBALS['ldap_champs'] = array('login' => array('sAMAccountName','uid','login','userid','cn','sn'),'nom' => 'cn','email' => 'mail','bio' => 'description',);
+$GLOBALS['ldap_search'] = getenv("SPIP_LDAP_SEARCH");
+?>
diff --git a/virtual/modules/websites/chloe/default.nix b/virtual/modules/websites/chloe/default.nix
index fb1f602..de85e92 100644
--- a/virtual/modules/websites/chloe/default.nix
+++ b/virtual/modules/websites/chloe/default.nix
@@ -52,7 +52,7 @@ in {
     (lib.mkIf cfg.integration.enable {
       security.acme.certs."eldiron".extraDomains."chloe.immae.eu" = null;
       services.myPhpfpm.poolConfigs.chloe_dev = chloe_dev.phpFpm.pool;
-      services.myPhpfpm.poolPhpConfigs.chloe_prod = ''
+      services.myPhpfpm.poolPhpConfigs.chloe_dev = ''
         extension=${pkgs.php}/lib/php/extensions/mysqli.so
         '';
       system.activationScripts.chloe_dev = chloe_dev.activationScript;