···

       
38
       
38
       
 
       
  };

     

       
39
       
39
       
 
       


     

       
40
       
40
       
 
       


     

       
41
       
41
       
-
       
  vhostOptions = import ./per-server-options.nix {

     

       
42
       
42
       
-
       
    inherit mkOption;

     

       
43
       
43
       
-
       
    forMainServer = false;

     

       
44
       
44
       
-
       
  };

     

       
45
       
45
       
-
       


     

       
46
       
46
       
-
       
  vhosts = let

     

       
47
       
47
       
-
       
    makeVirtualHost = cfgIn:

     

       
48
       
48
       
-
       
      let

     

       
49
       
49
       
-
       
        # Fill in defaults for missing options.

     

       
50
       
50
       
-
       
        cfg = addDefaultOptionValues vhostOptions cfgIn;

     

       
51
       
51
       
-
       
      in cfg;

     

       
52
       
52
       
-
       
    in map makeVirtualHost mainCfg.virtualHosts;

     

       
53
       
53
       
-
       


     

       
54
       
54
       
-
       


     

       
55
       
55
       
-
       
  allHosts = [mainCfg] ++ vhosts;

     

       
41
       
41
       
+
       
  allHosts = [mainCfg] ++ mainCfg.virtualHosts;

     

       
56
       
42
       
 
       


     

       
57
       
43
       
 
       


     

       
58
       
44
       
 
       
  callSubservices = serverInfo: defs:

     
···

       
86
       
72
       
 
       


     

       
87
       
73
       
 
       
  mainSubservices = subservicesFor mainCfg;

     

       
88
       
74
       
 
       


     

       
89
       
89
       
-
       
  allSubservices = mainSubservices ++ concatMap subservicesFor vhosts;

     

       
75
       
75
       
+
       
  allSubservices = mainSubservices ++ concatMap subservicesFor mainCfg.virtualHosts;

     

       
90
       
76
       
 
       


     

       
91
       
77
       
 
       


     

       
92
       
78
       
 
       
  # !!! should be in lib

     
···

       
389
       
375
       
 
       
              ${perServerConf false vhost}

     

       
390
       
376
       
 
       
          </VirtualHost>

     

       
391
       
377
       
 
       
        '';

     

       
392
       
392
       
-
       
      in concatMapStrings makeVirtualHost vhosts

     

       
378
       
378
       
+
       
      in concatMapStrings makeVirtualHost mainCfg.virtualHosts

     

       
393
       
379
       
 
       
    }

     

       
394
       
380
       
 
       
  '';

     

       
395
       
381
       
 
       


     
···

       
428
       
414
       
 
       


     

       
429
       
415
       
 
       
      package = mkOption {

     

       
430
       
416
       
 
       
        default = pkgs.apacheHttpd.override { mpm = mainCfg.multiProcessingModule; };

     

       
431
       
431
       
-
       
	example = "pkgs.apacheHttpd_2_4";

     

       
417
       
417
       
+
       
        example = "pkgs.apacheHttpd_2_4";

     

       
432
       
418
       
 
       
        description = "

     

       
433
       
419
       
 
       
          Overridable attribute of the Apache HTTP Server package to use.

     

       
434
       
420
       
 
       
        ";

     
···

       
436
       
422
       
 
       


     

       
437
       
423
       
 
       
      configFile = mkOption {

     

       
438
       
424
       
 
       
        default = confFile;

     

       
439
       
439
       
-
       
	example = ''pkgs.writeText "httpd.conf" "# my custom config file ...";'';

     

       
425
       
425
       
+
       
        example = literalExample ''pkgs.writeText "httpd.conf" "# my custom config file ...";'';

     

       
440
       
426
       
 
       
        description = "

     

       
441
       
427
       
 
       
          Overridable config file to use for Apache. By default, use the

     

       
442
       
428
       
 
       
          file automatically generated by nixos.

     
···

       
507
       
493
       
 
       
      };

     

       
508
       
494
       
 
       


     

       
509
       
495
       
 
       
      virtualHosts = mkOption {

     

       
496
       
496
       
+
       
        type = types.listOf (types.submodule (

     

       
497
       
497
       
+
       
          { options = import ./per-server-options.nix {

     

       
498
       
498
       
+
       
              inherit mkOption;

     

       
499
       
499
       
+
       
              forMainServer = false;

     

       
500
       
500
       
+
       
            };

     

       
501
       
501
       
+
       
          }));

     

       
510
       
502
       
 
       
        default = [];

     

       
511
       
503
       
 
       
        example = [

     

       
512
       
504
       
 
       
          { hostName = "foo";