* Allow subservices to declare a script that will be run before

the server start.  Useful to initialise necessary state.

svn path=/nixos/trunk/; revision=10761

upstart-jobs/apache-httpd/default.nix

@@ -23,11 +23,26 @@ let
     # a virtual host.
     adminAddr = if cfg.adminAddr != "" then cfg.adminAddr else mainCfg.adminAddr;
 
-    serverConfig = cfg;
+    vhostConfig = cfg;
+    serverConfig = mainCfg;
     fullConfig = config; # machine config
   };
 
 
+  vhostOptions = import ./per-server-options.nix {
+    inherit (pkgs.lib) mkOption;
+    forMainServer = false;
+  };
+
+  vhosts = let
+    makeVirtualHost = cfgIn: 
+      let
+        # Fill in defaults for missing options.
+        cfg = addDefaultOptionValues vhostOptions cfgIn;
+      in cfg;
+    in map makeVirtualHost cfg.virtualHosts;
+
+
   callSubservices = serverInfo: defs:
     let f = svc:
       let config = addDefaultOptionValues res.options svc.config;
@@ -36,9 +51,12 @@ let
     in map f defs;
 
 
-  mainSubservices = callSubservices (makeServerInfo cfg) cfg.extraSubservices;
+  # !!! callSubservices is expensive   
+  subservicesFor = cfg: callSubservices (makeServerInfo cfg) cfg.extraSubservices;
 
-  allSubservices = mainSubservices;
+  mainSubservices = subservicesFor mainCfg;
+
+  allSubservices = mainSubservices ++ pkgs.lib.concatMap subservicesFor vhosts;
 
 
   # !!! should be in lib
@@ -293,20 +311,12 @@ let
     NameVirtualHost *:*
 
     ${let
-        perServerOptions = import ./per-server-options.nix {
+        makeVirtualHost = cfg: ''
-          inherit (pkgs.lib) mkOption;
+          <VirtualHost *:*>
-          forMainServer = false;
+              ${perServerConf false cfg}
-        };
+          </VirtualHost>
-        makeVirtualHost = vhostIn:
+        '';
-          let
+      in concatMapStrings makeVirtualHost vhosts}
-            # Fill in defaults for missing options.
-            vhost = addDefaultOptionValues perServerOptions vhostIn;
-          in ''
-            <VirtualHost *:*>
-                ${perServerConf false vhost}
-            </VirtualHost>
-          '';
-      in concatMapStrings makeVirtualHost cfg.virtualHosts}
   '';
 
     
@@ -351,7 +361,13 @@ in
       # server restarts, eventually preventing it from restarting
       # succesfully.
       for i in $(${pkgs.utillinux}/bin/ipcs -s | grep ' ${cfg.user} ' | cut -f2 -d ' '); do
-        ${pkgs.utillinux}/bin/ipcrm -s $i
+          ${pkgs.utillinux}/bin/ipcrm -s $i
+      done
+
+      # Run the startup hooks for the subservices.
+      for i in ${toString (map (svn: svn.startupScript) allSubservices)}; do
+          echo Running Apache startup hook $i...
+          $i
       done
     end script
 

upstart-jobs/apache-httpd/dist-manager.nix

@@ -87,6 +87,7 @@ in {
   globalEnvVars = [];
   extraServerPath = [];
   extraPath = [];
+  startupScript = null;
 
   options = {
 

upstart-jobs/apache-httpd/subversion.nix

@@ -50,6 +50,8 @@ let
     inherit (pkgs) libxslt enscript db4 coreutils bzip2;
 
     inherit (serverInfo) canonicalName;
+
+    inherit (serverInfo.serverConfig) user group;    
     
     # Urgh, most of these are dependencies of Email::Send, should figure them out automatically.
     perlFlags = map (x: "-I${x}/lib/site_perl") [
@@ -335,6 +337,9 @@ in {
 
   
   extraPath = [scripts];
+
+
+  startupScript = "${scripts}/bin/svn-server-startup-hook.sh";
   
 
   options = {