From 091ae73429b8853e6ab971bffaccd84bdd59f40d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Thu, 10 Jan 2019 23:02:54 +0100
Subject: [PATCH] Move packages fils to module

---
 virtual/modules/websites.nix                           | 10 +++++-----
 virtual/{packages => modules/websites/aten}/aten.json  |  0
 virtual/{packages => modules/websites/aten}/aten.nix   |  0
 .../modules/websites/{aten.nix => aten/default.nix}    |  8 ++++++--
 .../websites/aten/goaccess.conf}                       |  0
 .../{packages => modules/websites/chloe}/chloe.json    |  0
 virtual/{packages => modules/websites/chloe}/chloe.nix |  6 +++---
 .../websites/chloe}/chloe_config/chmod.php             |  0
 .../websites/chloe}/chloe_config/connect.php           |  0
 .../websites/chloe}/chloe_config/ldap.php              |  0
 .../modules/websites/{chloe.nix => chloe/default.nix}  |  8 ++++++--
 .../websites/chloe/goaccess.conf}                      |  0
 .../websites/commons/spip}/spip_ldap_patch.patch       |  0
 .../websites/commons/spip}/spip_mes_options.php        |  0
 .../websites/connexionswing/connexionswing.json}       |  2 +-
 .../websites/connexionswing}/connexionswing.nix        |  2 +-
 .../{connexionswing.nix => connexionswing/default.nix} |  8 ++++++--
 .../websites/connexionswing/goaccess.conf}             |  0
 .../websites/{ludivine.nix => ludivine/default.nix}    |  4 ++--
 .../websites/ludivine/goaccess.conf}                   |  0
 .../websites/ludivine/ludivinecassal.json}             |  2 +-
 .../websites/ludivine}/ludivinecassal.nix              |  2 +-
 .../{piedsjaloux.nix => piedsjaloux/default.nix}       |  6 +++---
 .../websites/piedsjaloux/goaccess.conf}                |  0
 .../websites/piedsjaloux}/piedsjaloux.json             |  0
 .../websites/piedsjaloux}/piedsjaloux.nix              |  0
 26 files changed, 35 insertions(+), 23 deletions(-)
 rename virtual/{packages => modules/websites/aten}/aten.json (100%)
 rename virtual/{packages => modules/websites/aten}/aten.nix (100%)
 rename virtual/modules/websites/{aten.nix => aten/default.nix} (92%)
 rename virtual/{packages/aten_goaccess.conf => modules/websites/aten/goaccess.conf} (100%)
 rename virtual/{packages => modules/websites/chloe}/chloe.json (100%)
 rename virtual/{packages => modules/websites/chloe}/chloe.nix (94%)
 rename virtual/{packages => modules/websites/chloe}/chloe_config/chmod.php (100%)
 rename virtual/{packages => modules/websites/chloe}/chloe_config/connect.php (100%)
 rename virtual/{packages => modules/websites/chloe}/chloe_config/ldap.php (100%)
 rename virtual/modules/websites/{chloe.nix => chloe/default.nix} (91%)
 rename virtual/{packages/chloe_goaccess.conf => modules/websites/chloe/goaccess.conf} (100%)
 rename virtual/{packages => modules/websites/commons/spip}/spip_ldap_patch.patch (100%)
 rename virtual/{packages => modules/websites/commons/spip}/spip_mes_options.php (100%)
 rename virtual/{packages/connexionswing_master.json => modules/websites/connexionswing/connexionswing.json} (91%)
 rename virtual/{packages => modules/websites/connexionswing}/connexionswing.nix (99%)
 rename virtual/modules/websites/{connexionswing.nix => connexionswing/default.nix} (92%)
 rename virtual/{packages/connexionswing_goaccess.conf => modules/websites/connexionswing/goaccess.conf} (100%)
 rename virtual/modules/websites/{ludivine.nix => ludivine/default.nix} (92%)
 rename virtual/{packages/ludivinecassal_goaccess.conf => modules/websites/ludivine/goaccess.conf} (100%)
 rename virtual/{packages/ludivinecassal_master.json => modules/websites/ludivine/ludivinecassal.json} (90%)
 rename virtual/{packages => modules/websites/ludivine}/ludivinecassal.nix (99%)
 rename virtual/modules/websites/{piedsjaloux.nix => piedsjaloux/default.nix} (91%)
 rename virtual/{packages/piedsjaloux_goaccess.conf => modules/websites/piedsjaloux/goaccess.conf} (100%)
 rename virtual/{packages => modules/websites/piedsjaloux}/piedsjaloux.json (100%)
 rename virtual/{packages => modules/websites/piedsjaloux}/piedsjaloux.nix (100%)

diff --git a/virtual/modules/websites.nix b/virtual/modules/websites.nix
index cbd7de0..d794c7a 100644
--- a/virtual/modules/websites.nix
+++ b/virtual/modules/websites.nix
@@ -59,11 +59,11 @@ let
 in
 {
   imports = [
-    ./websites/chloe.nix
-    ./websites/ludivine.nix
-    ./websites/aten.nix
-    ./websites/piedsjaloux.nix
-    ./websites/connexionswing.nix
+    ./websites/chloe
+    ./websites/ludivine
+    ./websites/aten
+    ./websites/piedsjaloux
+    ./websites/connexionswing
     # built using:
     # sed -e "s/services\.httpd/services\.httpdProd/g" .nix-defexpr/channels/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix
     # And removed users / groups
diff --git a/virtual/packages/aten.json b/virtual/modules/websites/aten/aten.json
similarity index 100%
rename from virtual/packages/aten.json
rename to virtual/modules/websites/aten/aten.json
diff --git a/virtual/packages/aten.nix b/virtual/modules/websites/aten/aten.nix
similarity index 100%
rename from virtual/packages/aten.nix
rename to virtual/modules/websites/aten/aten.nix
diff --git a/virtual/modules/websites/aten.nix b/virtual/modules/websites/aten/default.nix
similarity index 92%
rename from virtual/modules/websites/aten.nix
rename to virtual/modules/websites/aten/default.nix
index 4688db3..d9db75c 100644
--- a/virtual/modules/websites/aten.nix
+++ b/virtual/modules/websites/aten/default.nix
@@ -1,6 +1,6 @@
 { lib, pkgs, config, mylibs, ... }:
 let
-    aten = pkgs.callPackage ../../packages/aten.nix { inherit (mylibs) checkEnv fetchedGitPrivate; };
+    aten = pkgs.callPackage ./aten.nix { inherit (mylibs) checkEnv fetchedGitPrivate; };
     aten_dev  = aten { environment = "dev"; };
     aten_prod = aten { environment = "prod"; };
 
@@ -15,13 +15,17 @@ in {
     };
   };
 
+  imports = [
+    ../commons/stats.nix
+  ];
+
   config = lib.mkMerge [
     (lib.mkIf cfg.production.enable {
       services.myWebsites.commons.stats.enable = true;
       services.myWebsites.commons.stats.sites = [
         {
           name = "aten.pro";
-          conf = ../../packages/aten_goaccess.conf;
+          conf = ./goaccess.conf;
         }
       ];
 
diff --git a/virtual/packages/aten_goaccess.conf b/virtual/modules/websites/aten/goaccess.conf
similarity index 100%
rename from virtual/packages/aten_goaccess.conf
rename to virtual/modules/websites/aten/goaccess.conf
diff --git a/virtual/packages/chloe.json b/virtual/modules/websites/chloe/chloe.json
similarity index 100%
rename from virtual/packages/chloe.json
rename to virtual/modules/websites/chloe/chloe.json
diff --git a/virtual/packages/chloe.nix b/virtual/modules/websites/chloe/chloe.nix
similarity index 94%
rename from virtual/packages/chloe.nix
rename to virtual/modules/websites/chloe/chloe.nix
index 8633317..126d8e7 100644
--- a/virtual/packages/chloe.nix
+++ b/virtual/modules/websites/chloe/chloe.nix
@@ -21,7 +21,7 @@ let
         php_admin_value[upload_max_filesize] = 20M
         php_admin_value[post_max_size] = 20M
         ;php_admin_flag[log_errors] = on
-        php_admin_value[open_basedir] = "${./spip_mes_options.php}:${configDir}:${webRoot}:${varDir}:/tmp"
+        php_admin_value[open_basedir] = "${../commons/spip/spip_mes_options.php}:${configDir}:${webRoot}:${varDir}:/tmp"
         php_admin_value[session.save_path] = "${varDir}/phpSessions"
         env[SPIP_CONFIG_DIR] = "${configDir}"
         env[SPIP_VAR_DIR] = "${varDir}"
@@ -114,10 +114,10 @@ let
         url = "http://files.spip.org/spip/stable/spip-${version}.zip";
         sha256 = "0cacpxs9nv61i3hzd3nbmplq4mp22s886llhacp3n4923jd6snx5";
       };
-      paches = [ ./spip_ldap_patch.patch ];
+      paches = [ ../commons/spip/spip_ldap_patch.patch ];
       buildPhase = ''
         rm -rf IMG local tmp config/remove.txt
-        ln -sf ${./spip_mes_options.php} config/mes_options.php
+        ln -sf ${../commons/spip/spip_mes_options.php} config/mes_options.php
         echo "Require all denied" > "config/.htaccess"
         ln -sf ../../../../../${varDir}/{IMG,local} .
       '';
diff --git a/virtual/packages/chloe_config/chmod.php b/virtual/modules/websites/chloe/chloe_config/chmod.php
similarity index 100%
rename from virtual/packages/chloe_config/chmod.php
rename to virtual/modules/websites/chloe/chloe_config/chmod.php
diff --git a/virtual/packages/chloe_config/connect.php b/virtual/modules/websites/chloe/chloe_config/connect.php
similarity index 100%
rename from virtual/packages/chloe_config/connect.php
rename to virtual/modules/websites/chloe/chloe_config/connect.php
diff --git a/virtual/packages/chloe_config/ldap.php b/virtual/modules/websites/chloe/chloe_config/ldap.php
similarity index 100%
rename from virtual/packages/chloe_config/ldap.php
rename to virtual/modules/websites/chloe/chloe_config/ldap.php
diff --git a/virtual/modules/websites/chloe.nix b/virtual/modules/websites/chloe/default.nix
similarity index 91%
rename from virtual/modules/websites/chloe.nix
rename to virtual/modules/websites/chloe/default.nix
index 3309dd2..72a9b6f 100644
--- a/virtual/modules/websites/chloe.nix
+++ b/virtual/modules/websites/chloe/default.nix
@@ -1,6 +1,6 @@
 { lib, pkgs, config, mylibs, ... }:
 let
-    chloe = pkgs.callPackage ../../packages/chloe.nix { inherit (mylibs) checkEnv fetchedGitPrivate; };
+    chloe = pkgs.callPackage ./chloe.nix { inherit (mylibs) checkEnv fetchedGitPrivate; };
     chloe_dev = chloe { environment = "dev"; };
     chloe_prod = chloe { environment = "prod"; };
 
@@ -15,13 +15,17 @@ in {
     };
   };
 
+  imports = [
+    ../commons/stats.nix
+  ];
+
   config = lib.mkMerge [
     (lib.mkIf cfg.production.enable {
       services.myWebsites.commons.stats.enable = true;
       services.myWebsites.commons.stats.sites = [
         {
           name = "osteopathe-cc.fr";
-          conf = ../../packages/chloe_goaccess.conf;
+          conf = ./goaccess.conf;
         }
       ];
 
diff --git a/virtual/packages/chloe_goaccess.conf b/virtual/modules/websites/chloe/goaccess.conf
similarity index 100%
rename from virtual/packages/chloe_goaccess.conf
rename to virtual/modules/websites/chloe/goaccess.conf
diff --git a/virtual/packages/spip_ldap_patch.patch b/virtual/modules/websites/commons/spip/spip_ldap_patch.patch
similarity index 100%
rename from virtual/packages/spip_ldap_patch.patch
rename to virtual/modules/websites/commons/spip/spip_ldap_patch.patch
diff --git a/virtual/packages/spip_mes_options.php b/virtual/modules/websites/commons/spip/spip_mes_options.php
similarity index 100%
rename from virtual/packages/spip_mes_options.php
rename to virtual/modules/websites/commons/spip/spip_mes_options.php
diff --git a/virtual/packages/connexionswing_master.json b/virtual/modules/websites/connexionswing/connexionswing.json
similarity index 91%
rename from virtual/packages/connexionswing_master.json
rename to virtual/modules/websites/connexionswing/connexionswing.json
index 2e1775b..146c5f6 100644
--- a/virtual/packages/connexionswing_master.json
+++ b/virtual/modules/websites/connexionswing/connexionswing.json
@@ -1,7 +1,7 @@
 {
   "tag": "0330478-master",
   "meta": {
-    "name": "connexionswing_master",
+    "name": "connexionswing",
     "url": "gitolite@git.immae.eu:perso/Immae/Projets/Connexionswing",
     "branch": "master"
   },
diff --git a/virtual/packages/connexionswing.nix b/virtual/modules/websites/connexionswing/connexionswing.nix
similarity index 99%
rename from virtual/packages/connexionswing.nix
rename to virtual/modules/websites/connexionswing/connexionswing.nix
index 1f3f2d5..90cca73 100644
--- a/virtual/packages/connexionswing.nix
+++ b/virtual/modules/websites/connexionswing/connexionswing.nix
@@ -148,7 +148,7 @@ let
       fi
       '';
     };
-    webappDir = stdenv.mkDerivation (fetchedGitPrivate ./connexionswing_master.json // rec {
+    webappDir = stdenv.mkDerivation (fetchedGitPrivate ./connexionswing.json // rec {
       # FIXME: can we do better than symlink?
       # FIXME: imagick optional
       # FIXME: initial sync
diff --git a/virtual/modules/websites/connexionswing.nix b/virtual/modules/websites/connexionswing/default.nix
similarity index 92%
rename from virtual/modules/websites/connexionswing.nix
rename to virtual/modules/websites/connexionswing/default.nix
index 9fc0cec..636b16e 100644
--- a/virtual/modules/websites/connexionswing.nix
+++ b/virtual/modules/websites/connexionswing/default.nix
@@ -1,6 +1,6 @@
 { lib, pkgs, config, mylibs, ... }:
 let
-    connexionswing = pkgs.callPackage ../../packages/connexionswing.nix { inherit (mylibs) checkEnv fetchedGitPrivate; };
+    connexionswing = pkgs.callPackage ./connexionswing.nix { inherit (mylibs) checkEnv fetchedGitPrivate; };
     connexionswing_dev  = connexionswing { environment = "dev"; };
     connexionswing_prod = connexionswing { environment = "prod"; };
 
@@ -15,13 +15,17 @@ in {
     };
   };
 
+  imports = [
+    ../commons/stats.nix
+  ];
+
   config = lib.mkMerge [
     (lib.mkIf cfg.production.enable {
       services.myWebsites.commons.stats.enable = true;
       services.myWebsites.commons.stats.sites = [
         {
           name = "connexionswing.com";
-          conf = ../../packages/connexionswing_goaccess.conf;
+          conf = ./goaccess.conf;
         }
       ];
 
diff --git a/virtual/packages/connexionswing_goaccess.conf b/virtual/modules/websites/connexionswing/goaccess.conf
similarity index 100%
rename from virtual/packages/connexionswing_goaccess.conf
rename to virtual/modules/websites/connexionswing/goaccess.conf
diff --git a/virtual/modules/websites/ludivine.nix b/virtual/modules/websites/ludivine/default.nix
similarity index 92%
rename from virtual/modules/websites/ludivine.nix
rename to virtual/modules/websites/ludivine/default.nix
index b3c1c51..ed719ba 100644
--- a/virtual/modules/websites/ludivine.nix
+++ b/virtual/modules/websites/ludivine/default.nix
@@ -1,6 +1,6 @@
 { lib, pkgs, config, mylibs, ... }:
 let
-    ludivinecassal = pkgs.callPackage ../../packages/ludivinecassal.nix { inherit (mylibs) checkEnv fetchedGitPrivate; };
+    ludivinecassal = pkgs.callPackage ./ludivinecassal.nix { inherit (mylibs) checkEnv fetchedGitPrivate; };
     ludivinecassal_dev  = ludivinecassal { environment = "dev"; };
     ludivinecassal_prod = ludivinecassal { environment = "prod"; };
 
@@ -21,7 +21,7 @@ in {
       services.myWebsites.commons.stats.sites = [
         {
           name = "ludivinecassal.com";
-          conf = ../../packages/ludivinecassal_goaccess.conf;
+          conf = ./goaccess.conf;
         }
       ];
 
diff --git a/virtual/packages/ludivinecassal_goaccess.conf b/virtual/modules/websites/ludivine/goaccess.conf
similarity index 100%
rename from virtual/packages/ludivinecassal_goaccess.conf
rename to virtual/modules/websites/ludivine/goaccess.conf
diff --git a/virtual/packages/ludivinecassal_master.json b/virtual/modules/websites/ludivine/ludivinecassal.json
similarity index 90%
rename from virtual/packages/ludivinecassal_master.json
rename to virtual/modules/websites/ludivine/ludivinecassal.json
index 403f9b0..89667c0 100644
--- a/virtual/packages/ludivinecassal_master.json
+++ b/virtual/modules/websites/ludivine/ludivinecassal.json
@@ -1,7 +1,7 @@
 {
   "tag": "4327b82-master",
   "meta": {
-    "name": "ludivinecassal_master",
+    "name": "ludivinecassal",
     "url": "gitolite@git.immae.eu:perso/Immae/Sites/Ludivine",
     "branch": "master"
   },
diff --git a/virtual/packages/ludivinecassal.nix b/virtual/modules/websites/ludivine/ludivinecassal.nix
similarity index 99%
rename from virtual/packages/ludivinecassal.nix
rename to virtual/modules/websites/ludivine/ludivinecassal.nix
index eabb8fa..ac63735 100644
--- a/virtual/packages/ludivinecassal.nix
+++ b/virtual/modules/websites/ludivine/ludivinecassal.nix
@@ -148,7 +148,7 @@ let
       fi
       '';
     };
-    webappDir = stdenv.mkDerivation (fetchedGitPrivate ./ludivinecassal_master.json // rec {
+    webappDir = stdenv.mkDerivation (fetchedGitPrivate ./ludivinecassal.json // rec {
       # FIXME: can we do better than symlink?
       # FIXME: initial sync
       # FIXME: backup
diff --git a/virtual/modules/websites/piedsjaloux.nix b/virtual/modules/websites/piedsjaloux/default.nix
similarity index 91%
rename from virtual/modules/websites/piedsjaloux.nix
rename to virtual/modules/websites/piedsjaloux/default.nix
index 451ae52..bf74173 100644
--- a/virtual/modules/websites/piedsjaloux.nix
+++ b/virtual/modules/websites/piedsjaloux/default.nix
@@ -1,6 +1,6 @@
 { lib, pkgs, config, mylibs, ... }:
 let
-    piedsjaloux = pkgs.callPackage ../../packages/piedsjaloux.nix { inherit (mylibs) checkEnv fetchedGitPrivate; };
+    piedsjaloux = pkgs.callPackage ./piedsjaloux.nix { inherit (mylibs) checkEnv fetchedGitPrivate; };
     piedsjaloux_dev  = piedsjaloux { environment = "dev"; };
     piedsjaloux_prod = piedsjaloux { environment = "prod"; };
 
@@ -16,7 +16,7 @@ in {
   };
 
   imports = [
-    ./commons/stats.nix
+    ../commons/stats.nix
   ];
 
   config = lib.mkMerge [
@@ -25,7 +25,7 @@ in {
       services.myWebsites.commons.stats.sites = [
         {
           name = "piedsjaloux.fr";
-          conf = ../../packages/piedsjaloux_goaccess.conf;
+          conf = ./goaccess.conf;
         }
       ];
 
diff --git a/virtual/packages/piedsjaloux_goaccess.conf b/virtual/modules/websites/piedsjaloux/goaccess.conf
similarity index 100%
rename from virtual/packages/piedsjaloux_goaccess.conf
rename to virtual/modules/websites/piedsjaloux/goaccess.conf
diff --git a/virtual/packages/piedsjaloux.json b/virtual/modules/websites/piedsjaloux/piedsjaloux.json
similarity index 100%
rename from virtual/packages/piedsjaloux.json
rename to virtual/modules/websites/piedsjaloux/piedsjaloux.json
diff --git a/virtual/packages/piedsjaloux.nix b/virtual/modules/websites/piedsjaloux/piedsjaloux.nix
similarity index 100%
rename from virtual/packages/piedsjaloux.nix
rename to virtual/modules/websites/piedsjaloux/piedsjaloux.nix
-- 
2.41.0