Replace myPhpfpm with correct overrides

[perso/Immae/Config/Nix.git] / nixops / modules / websites / default.nix

diff --git a/nixops/modules/websites/default.nix b/nixops/modules/websites/default.nix
index 432ad3c02466c26619c2df203327490d7b5d25a6..1948fe9c4e255d3e92d1f15533e8df9b2061c29b 100644 (file)
--- a/nixops/modules/websites/default.nix
+++ b/nixops/modules/websites/default.nix
@@ -66,23 +66,6 @@ let
 in
 {
   imports = [
-    ./chloe
-    ./ludivine
-    ./aten
-    ./piedsjaloux
-    ./connexionswing
-    ./tellesflorian
-    ./emilia
-    ./capitaines
-    ./ftp/jerome.nix
-    ./ftp/nassime.nix
-    ./ftp/florian.nix
-    ./ftp/denisejerome.nix
-    ./ftp/leila.nix
-    ./ftp/papa.nix
-    ./ftp/immae.nix
-    ./ftp/release.nix
-    ./ftp/temp.nix
     ./tools/db.nix
     ./tools/tools
     ./tools/dav
@@ -93,8 +76,6 @@ in
     ./tools/diaspora.nix
     ./tools/ether.nix
     ./tools/peertube.nix
-    # Adapted from base phpfpm
-    ./phpfpm
   ];
 
   config = {
@@ -133,31 +114,6 @@ in
     services.myWebsites.tools.etherpad-lite.enable = true;
     services.myWebsites.tools.peertube.enable = true;
 
-    services.myWebsites.Chloe.production.enable = true;
-    services.myWebsites.Ludivine.production.enable = true;
-    services.myWebsites.Aten.production.enable = true;
-    services.myWebsites.PiedsJaloux.production.enable = true;
-    services.myWebsites.Connexionswing.production.enable = true;
-    services.myWebsites.Jerome.production.enable = true;
-    services.myWebsites.Nassime.production.enable = true;
-    services.myWebsites.Florian.production.enable = true;
-    services.myWebsites.Leila.production.enable = true;
-    services.myWebsites.Papa.production.enable = true;
-    services.myWebsites.DeniseJerome.production.enable = true;
-    services.myWebsites.Emilia.production.enable = true;
-    services.myWebsites.Capitaines.production.enable = true;
-    services.myWebsites.Immae.production.enable = true;
-    services.myWebsites.Release.production.enable = true;
-    services.myWebsites.Temp.production.enable = true;
-
-    services.myWebsites.Chloe.integration.enable = true;
-    services.myWebsites.Ludivine.integration.enable = true;
-    services.myWebsites.Aten.integration.enable = true;
-    services.myWebsites.PiedsJaloux.integration.enable = true;
-    services.myWebsites.Connexionswing.integration.enable = true;
-    services.myWebsites.TellesFlorian.integration.enable = true;
-    services.myWebsites.Florian.integration.enable = true;
-
     secrets.keys = [{
       dest = "apache-ldap";
       user = "wwwrun";
@@ -198,7 +154,7 @@ in
       ln -s ${adminer.webRoot} $out/webapps/${adminer.apache.webappName}
       '';
 
-    services.myPhpfpm = {
+    services.phpfpm = {
       phpPackage = pkgs.php;
       phpOptions = ''
         session.save_path = "/var/lib/php/sessions"