commit ae9980040fe267aa6e1b04e10c9ef1cbfe7fb53f · pyrox.dev/nixpkgs

+28 -6

nixos/modules/services/web-servers/apache-httpd/default.nix

···

       179
       179
        
               then hostOpts.documentRoot

     

       180
       180
        
               else pkgs.runCommand "empty" { preferLocalBuild = true; } "mkdir -p $out"

     

       181
       181
        
             ;

     

       182
       182
       +
       

     

       183
       183
       +
             mkLocations = locations: concatStringsSep "\n" (map (config: ''

     

       184
       184
       +
               <Location ${config.location}>

     

       185
       185
       +
                 ${optionalString (config.proxyPass != null) ''

     

       186
       186
       +
                   <IfModule mod_proxy.c>

     

       187
       187
       +
                       ProxyPass ${config.proxyPass}

     

       188
       188
       +
                       ProxyPassReverse ${config.proxyPass}

     

       189
       189
       +
                   </IfModule>

     

       190
       190
       +
                 ''}

     

       191
       191
       +
                 ${optionalString (config.index != null) ''

     

       192
       192
       +
                   <IfModule mod_dir.c>

     

       193
       193
       +
                       DirectoryIndex ${config.index}

     

       194
       194
       +
                   </IfModule>

     

       195
       195
       +
                 ''}

     

       196
       196
       +
                 ${optionalString (config.alias != null) ''

     

       197
       197
       +
                   <IfModule mod_alias.c>

     

       198
       198
       +
                       Alias "${config.alias}"

     

       199
       199
       +
                   </IfModule>

     

       200
       200
       +
                 ''}

     

       201
       201
       +
                 ${config.extraConfig}

     

       202
       202
       +
               </Location>

     

       203
       203
       +
             '') (sortProperties (mapAttrsToList (k: v: v // { location = k; }) locations)));

     

       182
       204
        
           in

     

       183
       205
        
             ''

     

       184
       206
        
               ${optionalString mainCfg.logPerVirtualHost ''

     
···

       218
       240
        
               ''}

     

       219
       241
        
       

     

       220
       242
        
               ${

     

       221
       221
       -
                 let makeFileConf = elem: ''

     

       222
       222
       -
                       Alias ${elem.urlPath} ${elem.file}

     

       223
       223
       -
                     '';

     

       224
       224
       -
                 in concatMapStrings makeFileConf hostOpts.servedFiles

     

       225
       225
       -
               }

     

       226
       226
       -
               ${

     

       227
       243
        
                 let makeDirConf = elem: ''

     

       228
       244
        
                       Alias ${elem.urlPath} ${elem.dir}/

     

       229
       245
        
                       <Directory ${elem.dir}>

     
···

       235
       251
        
                 in concatMapStrings makeDirConf hostOpts.servedDirs

     

       236
       252
        
               }

     

       237
       253
        
       

     

       254
       254
       +
               ${mkLocations hostOpts.locations}

     

       238
       255
        
               ${hostOpts.extraConfig}

     

       239
       256
        
             ''

     

       240
       257
        
         ;

     
···

       605
       622
        
               '';

     

       606
       623
        
             }

     

       607
       624
        
           ];

     

       625
       625
       +
       

     

       626
       626
       +
           warnings =

     

       627
       627
       +
             mapAttrsToList (name: hostOpts: ''

     

       628
       628
       +
               Using config.services.httpd.virtualHosts."${name}".servedFiles is deprecated and will become unsupported in a future release. Your configuration will continue to work as is but please migrate your configuration to config.services.httpd.virtualHosts."${name}".locations before the 20.09 release of NixOS.

     

       629
       629
       +
             '') (filterAttrs (name: hostOpts: hostOpts.servedFiles != []) mainCfg.virtualHosts);

     

       608
       630
        
       

     

       609
       631
        
           users.users = optionalAttrs (mainCfg.user == "wwwrun") {

     

       610
       632
        
             wwwrun = {

+54

nixos/modules/services/web-servers/apache-httpd/location-options.nix

···

       1
       1
       +
       { config, lib, name, ... }:

     

       2
       2
       +
       let

     

       3
       3
       +
         inherit (lib) mkOption types;

     

       4
       4
       +
       in

     

       5
       5
       +
       {

     

       6
       6
       +
         options = {

     

       7
       7
       +
       

     

       8
       8
       +
           proxyPass = mkOption {

     

       9
       9
       +
             type = with types; nullOr str;

     

       10
       10
       +
             default = null;

     

       11
       11
       +
             example = "http://www.example.org/";

     

       12
       12
       +
             description = ''

     

       13
       13
       +
               Sets up a simple reverse proxy as described by <link xlink:href="https://httpd.apache.org/docs/2.4/howto/reverse_proxy.html#simple" />.

     

       14
       14
       +
             '';

     

       15
       15
       +
           };

     

       16
       16
       +
       

     

       17
       17
       +
           index = mkOption {

     

       18
       18
       +
             type = with types; nullOr str;

     

       19
       19
       +
             default = null;

     

       20
       20
       +
             example = "index.php index.html";

     

       21
       21
       +
             description = ''

     

       22
       22
       +
               Adds DirectoryIndex directive. See <link xlink:href="https://httpd.apache.org/docs/2.4/mod/mod_dir.html#directoryindex" />.

     

       23
       23
       +
             '';

     

       24
       24
       +
           };

     

       25
       25
       +
       

     

       26
       26
       +
           alias = mkOption {

     

       27
       27
       +
             type = with types; nullOr path;

     

       28
       28
       +
             default = null;

     

       29
       29
       +
             example = "/your/alias/directory";

     

       30
       30
       +
             description = ''

     

       31
       31
       +
               Alias directory for requests. See <link xlink:href="https://httpd.apache.org/docs/2.4/mod/mod_alias.html#alias" />.

     

       32
       32
       +
             '';

     

       33
       33
       +
           };

     

       34
       34
       +
       

     

       35
       35
       +
           extraConfig = mkOption {

     

       36
       36
       +
             type = types.lines;

     

       37
       37
       +
             default = "";

     

       38
       38
       +
             description = ''

     

       39
       39
       +
               These lines go to the end of the location verbatim.

     

       40
       40
       +
             '';

     

       41
       41
       +
           };

     

       42
       42
       +
       

     

       43
       43
       +
           priority = mkOption {

     

       44
       44
       +
             type = types.int;

     

       45
       45
       +
             default = 1000;

     

       46
       46
       +
             description = ''

     

       47
       47
       +
               Order of this location block in relation to the others in the vhost.

     

       48
       48
       +
               The semantics are the same as with `lib.mkOrder`. Smaller values have

     

       49
       49
       +
               a greater priority.

     

       50
       50
       +
             '';

     

       51
       51
       +
           };

     

       52
       52
       +
       

     

       53
       53
       +
         };

     

       54
       54
       +
       }

+32 -1

nixos/modules/services/web-servers/apache-httpd/per-server-options.nix

···

       1
       1
        
       { config, lib, name, ... }:

     

       2
       2
        
       let

     

       3
       3
       -
         inherit (lib) mkOption types;

     

       3
       3
       +
         inherit (lib) literalExample mkOption nameValuePair types;

     

       4
       4
        
       in

     

       5
       5
        
       {

     

       6
       6
        
         options = {

     
···

       175
       175
        
             ];

     

       176
       176
        
             description = ''

     

       177
       177
        
               This option provides a simple way to serve individual, static files.

     

       178
       178
       +
       

     

       179
       179
       +
               <note><para>

     

       180
       180
       +
                 This option has been deprecated and will be removed in a future

     

       181
       181
       +
                 version of NixOS. You can achieve the same result by making use of

     

       182
       182
       +
                 the <literal>locations.&lt;name&gt;.alias</literal> option.

     

       183
       183
       +
               </para></note>

     

       178
       184
        
             '';

     

       179
       185
        
           };

     

       180
       186
        
       

     
···

       230
       236
        
               xlink:href='http://www.robotstxt.org/'/> for details.

     

       231
       237
        
             '';

     

       232
       238
        
           };

     

       239
       239
       +
       

     

       240
       240
       +
           locations = mkOption {

     

       241
       241
       +
             type = with types; attrsOf (submodule (import ./location-options.nix));

     

       242
       242
       +
             default = {};

     

       243
       243
       +
             example = literalExample ''

     

       244
       244
       +
               {

     

       245
       245
       +
                 "/" = {

     

       246
       246
       +
                   proxyPass = "http://localhost:3000";

     

       247
       247
       +
                 };

     

       248
       248
       +
                 "/foo/bar.png" = {

     

       249
       249
       +
                   alias = "/home/eelco/some-file.png";

     

       250
       250
       +
                 };

     

       251
       251
       +
               };

     

       252
       252
       +
             '';

     

       253
       253
       +
             description = ''

     

       254
       254
       +
               Declarative location config. See <link

     

       255
       255
       +
               xlink:href="https://httpd.apache.org/docs/2.4/mod/core.html#location"/> for details.

     

       256
       256
       +
             '';

     

       257
       257
       +
           };

     

       258
       258
       +
       

     

       259
       259
       +
         };

     

       260
       260
       +
       

     

       261
       261
       +
         config = {

     

       262
       262
       +
       

     

       263
       263
       +
           locations = builtins.listToAttrs (map (elem: nameValuePair elem.urlPath { alias = elem.file; }) config.servedFiles);

     

       233
       264
        
       

     

       234
       265
        
         };

     

       235
       266
        
       }