Start moving websites configuration to modules

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

diff --git a/nixops/modules/buildbot/default.nix b/nixops/modules/buildbot/default.nix
index d7dd47943aac86676b582d8f08135ba3714d8417..89a0dea10610ff371049201d0f384eb26f608c7f 100644 (file)
--- a/nixops/modules/buildbot/default.nix
+++ b/nixops/modules/buildbot/default.nix
@@ -37,7 +37,7 @@ in
       extraGroups = [ "keys" ];
     };
 
-    services.myWebsites.tools.vhostConfs.git.extraConfig = lib.attrsets.mapAttrsToList (k: project: ''
+    services.websites.tools.vhostConfs.git.extraConfig = lib.attrsets.mapAttrsToList (k: project: ''
         RedirectMatch permanent "^/buildbot/${project.name}$" "/buildbot/${project.name}/"
         RewriteEngine On
         RewriteRule ^/buildbot/${project.name}/ws(.*)$   unix:///run/buildbot/${project.name}.sock|ws://git.immae.eu/ws$1 [P,NE,QSA,L]
@@ -61,11 +61,7 @@ in
 
     system.activationScripts = lib.attrsets.mapAttrs' (k: project: lib.attrsets.nameValuePair "buildbot-${project.name}" {
       deps = [ "users" "wrappers" ];
-      text = ''
-      install -m 0755 -o buildbot -g buildbot -d /run/buildbot/
-      install -m 0755 -o buildbot -g buildbot -d ${varDir}
-      ${project.activationScript}
-      '';
+      text = project.activationScript;
     }) myconfig.env.buildbot.projects;
 
     secrets.keys = (
@@ -190,6 +186,9 @@ in
         Type = "forking";
         User = "buildbot";
         Group = "buildbot";
+        RuntimeDirectory = "buildbot";
+        RuntimeDirectoryPreserve = "yes";
+        StateDirectory = "buildbot";
         SupplementaryGroups = "keys";
         WorkingDirectory = "${varDir}/${project.name}";
         ExecStart = "${buildbot}/bin/buildbot start";