Move websites/tools to modules

[perso/Immae/Config/Nix.git] / modules / private / websites / aten / production.nix

diff --git a/modules/private/websites/aten/production.nix b/modules/private/websites/aten/production.nix
index 697f1b83f247f30570798915768520a75c061af4..7a4adb5a2f865fc191315baed7613d234648fc6b 100644 (file)
--- a/modules/private/websites/aten/production.nix
+++ b/modules/private/websites/aten/production.nix
@@ -15,14 +15,12 @@ in {
     secrets.keys = aten.keys;
     services.webstats.sites = [ { name = "aten.pro"; } ];
 
-    services.myPhpfpm.preStart.aten_prod = aten.phpFpm.preStart;
-    services.myPhpfpm.serviceDependencies.aten_prod = aten.phpFpm.serviceDeps;
-    services.myPhpfpm.poolConfigs.aten_prod = aten.phpFpm.pool;
+    systemd.services.phpfpm-aten_prod.preStart = lib.mkAfter aten.phpFpm.preStart;
+    systemd.services.phpfpm-aten_prod.after = lib.mkAfter aten.phpFpm.serviceDeps;
+    systemd.services.phpfpm-aten_prod.wants = aten.phpFpm.serviceDeps;
+    services.phpfpm.poolConfigs.aten_prod = aten.phpFpm.pool;
     system.activationScripts.aten_prod = aten.activationScript;
-    system.extraSystemBuilderCmds = ''
-      mkdir -p $out/webapps
-      ln -s ${aten.app.webRoot} $out/webapps/${aten.apache.webappName}
-      '';
+    myServices.websites.webappDirs."${aten.apache.webappName}" = aten.app.webRoot;
     services.websites.production.modules = aten.apache.modules;
     services.websites.production.vhostConfs.aten = {
       certName     = "aten";