commit fff8cc79df5aa26e935f8ee30c06ef79368ad5dc · pyrox.dev/nixpkgs

+20

nixos/modules/services/web-servers/nginx/default.nix

···

       87
        
       

     

       88
        
             server_tokens ${if cfg.serverTokens then "on" else "off"};

     

       89
        
       

     

       0
        
       
     

       0
        
       
     

       90
        
             ${vhosts}

     

       91
        
       

     

       92
        
             ${optionalString cfg.statusPage ''

     
···

       272
        
                 can be specified more than once and it's value will be

     

       273
        
                 concatenated (contrary to <option>config</option> which

     

       274
        
                 can be set only once).

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       275
        
               '';

     

       276
        
             };

     

       277

···

       87
        
       

     

       88
        
             server_tokens ${if cfg.serverTokens then "on" else "off"};

     

       89
        
       

     

       90
       +
             ${cfg.commonHttpConfig}

     

       91
       +
       

     

       92
        
             ${vhosts}

     

       93
        
       

     

       94
        
             ${optionalString cfg.statusPage ''

     
···

       274
        
                 can be specified more than once and it's value will be

     

       275
        
                 concatenated (contrary to <option>config</option> which

     

       276
        
                 can be set only once).

     

       277
       +
               '';

     

       278
       +
             };

     

       279
       +
       

     

       280
       +
             commonHttpConfig = mkOption {

     

       281
       +
               type = types.lines;

     

       282
       +
               default = "";

     

       283
       +
               example = ''

     

       284
       +
                 resolver 127.0.0.1 valid=5s;

     

       285
       +
       

     

       286
       +
                 log_format myformat '$remote_addr - $remote_user [$time_local] '

     

       287
       +
                                     '"$request" $status $body_bytes_sent '

     

       288
       +
                                     '"$http_referer" "$http_user_agent"';

     

       289
       +
               '';

     

       290
       +
               description = ''

     

       291
       +
                 With nginx you must provide common http context definitions before

     

       292
       +
                 they are used, e.g. log_format, resolver, etc. inside of server

     

       293
       +
                 or location contexts. Use this attribute to set these definitions

     

       294
       +
                 at the appropriate location.

     

       295
        
               '';

     

       296
        
             };

     

       297

+42

nixos/tests/nginx.nix

···

       1
       +
       # verifies:

     

       2
       +
       #   1. nginx generates config file with shared http context definitions above

     

       3
       +
       #      generated virtual hosts config.

     

       4
       +
       

     

       5
       +
       import ./make-test.nix ({ pkgs, ...} : {

     

       6
       +
         name = "jenkins";

     

       7
       +
         meta = with pkgs.stdenv.lib.maintainers; {

     

       8
       +
           maintainers = [ mbbx6spp ];

     

       9
       +
         };

     

       10
       +
       

     

       11
       +
         nodes = {

     

       12
       +
           webserver =

     

       13
       +
             { config, pkgs, ... }:

     

       14
       +
             { services.nginx.enable = true;

     

       15
       +
               services.nginx.commonHttpConfig = ''

     

       16
       +
               log_format ceeformat '@cee: {"status":"$status",'

     

       17
       +
                 '"request_time":$request_time,'

     

       18
       +
                 '"upstream_response_time":$upstream_response_time,'

     

       19
       +
                 '"pipe":"$pipe","bytes_sent":$bytes_sent,'

     

       20
       +
                 '"connection":"$connection",'

     

       21
       +
                 '"remote_addr":"$remote_addr",'

     

       22
       +
                 '"host":"$host",'

     

       23
       +
                 '"timestamp":"$time_iso8601",'

     

       24
       +
                 '"request":"$request",'

     

       25
       +
                 '"http_referer":"$http_referer",'

     

       26
       +
                 '"upstream_addr":"$upstream_addr"}';

     

       27
       +
               '';

     

       28
       +
               services.nginx.virtualHosts."0.my.test" = {

     

       29
       +
                 extraConfig = ''

     

       30
       +
                   access_log syslog:server=unix:/dev/log,facility=user,tag=mytag,severity=info ceeformat;

     

       31
       +
                 '';

     

       32
       +
               };

     

       33
       +
             };

     

       34
       +
         };

     

       35
       +
       

     

       36
       +
         testScript = ''

     

       37
       +
           startAll;

     

       38
       +
       

     

       39
       +
           $webserver->waitForUnit("nginx");

     

       40
       +
           $webserver->waitForOpenPort("80");

     

       41
       +
         '';

     

       42
       +
       })