X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fflorian%2Fapp.nix;fp=nixops%2Fmodules%2Fwebsites%2Ftellesflorian%2Fdefault.nix;h=08506e101a36ed05dd766f72e5b64acb09fec884;hp=bbbde07ff7cb93a9b14320b6966252a9c05a76c7;hb=f8026b6e4c869aa108f6361c8ccd50890657994d;hpb=4aac110f17f0528d90510eec00c9a8df60bcf04f

diff --git a/nixops/modules/websites/tellesflorian/default.nix b/modules/private/websites/florian/app.nix
similarity index 51%
rename from nixops/modules/websites/tellesflorian/default.nix
rename to modules/private/websites/florian/app.nix
index bbbde07..08506e1 100644
--- a/nixops/modules/websites/tellesflorian/default.nix
+++ b/modules/private/websites/florian/app.nix
@@ -2,37 +2,35 @@
 let
   adminer = pkgs.callPackage ../commons/adminer.nix {};
 
-  tellesflorian_dev  = pkgs.callPackage ./tellesflorian.nix {
+  tellesflorian  = pkgs.callPackage ./builder_app.nix {
     inherit (pkgs.webapps) tellesflorian;
     config = myconfig.env.websites.tellesflorian.integration;
+    apacheUser = config.services.httpd.Inte.user;
+    apacheGroup = config.services.httpd.Inte.group;
   };
 
-  cfg = config.services.myWebsites.TellesFlorian;
+  cfg = config.myServices.websites.florian.app;
 in {
-  options.services.myWebsites.TellesFlorian = {
-    integration = {
-      enable = lib.mkEnableOption "enable Florian Telles's website in integration";
-    };
-  };
+  options.myServices.websites.florian.app.enable = lib.mkEnableOption "enable Florian's app in integration";
 
-  config = lib.mkIf cfg.integration.enable {
-    secrets.keys = tellesflorian_dev.keys;
-    services.myPhpfpm.preStart.tellesflorian_dev = tellesflorian_dev.phpFpm.preStart;
-    services.myPhpfpm.serviceDependencies.tellesflorian_dev = tellesflorian_dev.phpFpm.serviceDeps;
-    services.myPhpfpm.poolConfigs.tellesflorian_dev = tellesflorian_dev.phpFpm.pool;
-    system.activationScripts.tellesflorian_dev = tellesflorian_dev.activationScript;
+  config = lib.mkIf cfg.enable {
+    secrets.keys = tellesflorian.keys;
+    services.myPhpfpm.preStart.tellesflorian_dev = tellesflorian.phpFpm.preStart;
+    services.myPhpfpm.serviceDependencies.tellesflorian_dev = tellesflorian.phpFpm.serviceDeps;
+    services.myPhpfpm.poolConfigs.tellesflorian_dev = tellesflorian.phpFpm.pool;
+    system.activationScripts.tellesflorian_dev = tellesflorian.activationScript;
     system.extraSystemBuilderCmds = ''
       mkdir -p $out/webapps
-      ln -s ${tellesflorian_dev.app.webRoot} $out/webapps/${tellesflorian_dev.apache.webappName}
+      ln -s ${tellesflorian.app.webRoot} $out/webapps/${tellesflorian.apache.webappName}
       '';
-    services.websites.integration.modules = adminer.apache.modules ++ tellesflorian_dev.apache.modules;
+    services.websites.integration.modules = adminer.apache.modules ++ tellesflorian.apache.modules;
     services.websites.integration.vhostConfs.tellesflorian = {
       certName    = "eldiron";
       addToCerts  = true;
       hosts       = ["app.tellesflorian.com" ];
-      root        = tellesflorian_dev.apache.root;
+      root        = tellesflorian.apache.root;
       extraConfig = [
-        tellesflorian_dev.apache.vhostConf
+        tellesflorian.apache.vhostConf
         adminer.apache.vhostConf
       ];
     };