X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Ftools%2Fgit%2Fdefault.nix;fp=nixops%2Fmodules%2Fwebsites%2Ftools%2Fgit%2Fdefault.nix;h=3e8b605774167b82b842e95eb72b786377d052a7;hb=4288c2f2431fb782b0d512b1b3749187f2374b6a;hp=495c5eace0c7c6da9db8a8f4dc0d7a2b0be6fe98;hpb=f40f5b235b890f46770a22f005f8a0f664cf0562;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/websites/tools/git/default.nix b/modules/private/websites/tools/git/default.nix
similarity index 76%
rename from nixops/modules/websites/tools/git/default.nix
rename to modules/private/websites/tools/git/default.nix
index 495c5ea..3e8b605 100644
--- a/nixops/modules/websites/tools/git/default.nix
+++ b/modules/private/websites/tools/git/default.nix
@@ -6,9 +6,9 @@ let
     };
     gitweb = pkgs.callPackage ./gitweb.nix { gitoliteDir = config.services.myGitolite.gitoliteDir; };
 
-    cfg = config.services.myWebsites.tools.git;
+    cfg = config.myServices.websites.tools.git;
 in {
-  options.services.myWebsites.tools.git = {
+  options.myServices.websites.tools.git = {
     enable = lib.mkEnableOption "enable git's website";
   };
 
@@ -17,12 +17,10 @@ in {
     services.websites.tools.modules =
       gitweb.apache.modules ++
       mantisbt.apache.modules;
-    system.extraSystemBuilderCmds = ''
-      mkdir -p $out/webapps
-      ln -s ${gitweb.webRoot} $out/webapps/${gitweb.apache.webappName}
-      ln -s ${mantisbt.webRoot} $out/webapps/${mantisbt.apache.webappName}
-      '';
+    myServices.websites.webappDirs."${gitweb.apache.webappName}" = gitweb.webRoot;
+    myServices.websites.webappDirs."${mantisbt.apache.webappName}" = mantisbt.webRoot;
 
+    system.activationScripts.mantisbt = mantisbt.activationScript;
     services.websites.tools.vhostConfs.git = {
       certName    = "eldiron";
       addToCerts  = true;