From 62a0946e8b3eda220943b9740becb3c969455549 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Fri, 18 Jan 2019 23:03:33 +0100
Subject: Fix chloe dev website

---
 virtual/modules/websites/chloe/chloe.nix                     | 2 +-
 virtual/modules/websites/chloe/chloe_config/chmod.php        | 4 ----
 virtual/modules/websites/chloe/chloe_config/connect.php      | 6 ------
 virtual/modules/websites/chloe/chloe_config/ldap.php         | 9 ---------
 virtual/modules/websites/chloe/chloe_config_dev/chmod.php    | 4 ++++
 virtual/modules/websites/chloe/chloe_config_dev/connect.php  | 6 ++++++
 virtual/modules/websites/chloe/chloe_config_dev/ldap.php     | 9 +++++++++
 virtual/modules/websites/chloe/chloe_config_prod/chmod.php   | 4 ++++
 virtual/modules/websites/chloe/chloe_config_prod/connect.php | 6 ++++++
 virtual/modules/websites/chloe/chloe_config_prod/ldap.php    | 9 +++++++++
 virtual/modules/websites/chloe/default.nix                   | 2 +-
 11 files changed, 40 insertions(+), 21 deletions(-)
 delete mode 100644 virtual/modules/websites/chloe/chloe_config/chmod.php
 delete mode 100644 virtual/modules/websites/chloe/chloe_config/connect.php
 delete mode 100644 virtual/modules/websites/chloe/chloe_config/ldap.php
 create mode 100644 virtual/modules/websites/chloe/chloe_config_dev/chmod.php
 create mode 100644 virtual/modules/websites/chloe/chloe_config_dev/connect.php
 create mode 100644 virtual/modules/websites/chloe/chloe_config_dev/ldap.php
 create mode 100644 virtual/modules/websites/chloe/chloe_config_prod/chmod.php
 create mode 100644 virtual/modules/websites/chloe/chloe_config_prod/connect.php
 create mode 100644 virtual/modules/websites/chloe/chloe_config_prod/ldap.php

(limited to 'virtual/modules/websites/chloe')

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/chmod.php
deleted file mode 100644
index aae16cd..0000000
--- a/virtual/modules/websites/chloe/chloe_config/chmod.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?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/connect.php b/virtual/modules/websites/chloe/chloe_config/connect.php
deleted file mode 100644
index 2e4439f..0000000
--- a/virtual/modules/websites/chloe/chloe_config/connect.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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/ldap.php b/virtual/modules/websites/chloe/chloe_config/ldap.php
deleted file mode 100644
index 825b7ed..0000000
--- a/virtual/modules/websites/chloe/chloe_config/ldap.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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/chloe_config_dev/chmod.php b/virtual/modules/websites/chloe/chloe_config_dev/chmod.php
new file mode 100644
index 0000000..aae16cd
--- /dev/null
+++ b/virtual/modules/websites/chloe/chloe_config_dev/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_dev/connect.php b/virtual/modules/websites/chloe/chloe_config_dev/connect.php
new file mode 100644
index 0000000..2e4439f
--- /dev/null
+++ b/virtual/modules/websites/chloe/chloe_config_dev/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_dev/ldap.php b/virtual/modules/websites/chloe/chloe_config_dev/ldap.php
new file mode 100644
index 0000000..825b7ed
--- /dev/null
+++ b/virtual/modules/websites/chloe/chloe_config_dev/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/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;
-- 
cgit v1.2.3