Move packages fils to module

diff --git a/virtual/modules/websites.nix b/virtual/modules/websites.nix
index cbd7de07926b4083694ba690e2c36c86774d653b..d794c7a90efd5ba75979fdabac6d3a7244cba96e 100644 (file)
--- 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 4688db3d5af2f5ccd294629957af665cb77236ab..d9db75cbdfe60668943015399945151c7500899f 100644 (file)
--- 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 863331772fc9e8edcbe605826861582d2b4ec5ff..126d8e70579b5b1ae5f9eb053eda5f4b9ad377a9 100644 (file)
--- 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 3309dd2b6dc2204346842eed3d29d70a87648d14..72a9b6fdb01667a395f30352096726e10b2e9240 100644 (file)
--- 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 2e1775b439252d6080e5f0d9142569344096888e..146c5f6e4483c8ee37510ea34bb8788913c8843d 100644 (file)
--- 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 1f3f2d51a22d53d0126e04f55923af006cc46116..90cca73b6181b5462b6cd4a7b91bdd7e350012c9 100644 (file)
--- 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 9fc0cecdb5ebba7c28b59bf1986a7b860c8db850..636b16eefba479049bd990b3b3a309e8ca7ba80e 100644 (file)
--- 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 b3c1c515fe4fb9df005b829598727825e848be75..ed719ba42a5520f88cdc82458b7d2ecc3a0a592d 100644 (file)
--- 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 403f9b0a90c546864e8f1acfc64a4ca7da8e25d3..89667c0e2e688ba71c03978de9e1a5e893ffae76 100644 (file)
--- 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 eabb8fafc2b6e16855c364fa6b68665ee750b3a8..ac637355d6249cc4bb9317aba243e7949fb27e14 100644 (file)
--- 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 451ae52a91cce7497a68dda126ba839176bea454..bf7417387ca0fb98bac378a93353c602a1880b5b 100644 (file)
--- 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