about summary refs log tree commit diff
path: root/nixos/modules/services/web-servers
Commit message (Collapse)AuthorAge
* Merge pull request #85026 from talyz/php_buildenv_overrideElis Hirwing2020-04-29
|\ | | | | php.buildEnv: Make the exported php package overridable, improve handling of currently enabled extensions, etc
| * php.buildEnv: Add phpIni attribute for easy access to the php.initalyz2020-04-29
| |
* | treewide: add types to boolean / enable options or make use of mkEnableOptionDominik Xaver Hörl2020-04-27
| |
* | Merge pull request #85043 from aanderse/httpd-2020Aaron Andersen2020-04-25
|\ \ | |/ |/| nixos/httpd: modernize module standards
| * nixos/httpd: some mod_php cleanupAaron Andersen2020-04-21
| |
| * nixos/httpd: set modern default values for mpm and http2Aaron Andersen2020-04-21
| |
| * nixos/httpd: run as non root userAaron Andersen2020-04-21
| |
* | Merge pull request #85402 from jtojnar/httpd-phpJan Tojnar2020-04-22
|\ \ | |/ |/|
| * nixos/httpd: remove unnecessary overrideJan Tojnar2020-04-17
| | | | | | | | | | This was introduced in https://github.com/NixOS/nixpkgs/commit/c801cd1a047efa51055fd04698e316ddd503fd1b but it no longer seems necessary.
| * nixos/httpd: Use extensions from php packageJan Tojnar2020-04-17
| | | | | | | | | | | | | | | | | | | | | | | | | | After the recent rewrite, enabled extensions are passed to php programs through an extra ini file by a wrapper. Since httpd uses shared module instead of program, the wrapper did not affect it and no extensions other than built-ins were loaded. To fix this, we are passing the extension config another way – by adding it to the service's generated config. For now we are hardcoding the path to the ini file. It would be nice to add the path to the passthru and use that once the PHP expression settles down.
* | nixos/phpfpm: fix erroneous pools exampleThomas Churchman2020-04-21
| |
* | treewide: add bool type to enable options, or make use of mkEnableOptionDominik Xaver Hörl2020-04-21
|/ | | | Add missing type information to manually specified enable options or replace them by mkEnableOption where appropriate.
* nixos/traefik: make config deep mergeableIoannis Koutras2020-04-12
|
* nixos/traefik: Adapt to traefik v2Ioannis Koutras2020-04-12
| | | | | | | | | This commit: 1. Updates the path of the traefik package, so that the out output is used. 2. Adapts the configuration settings and options to Traefik v2. 3. Formats the NixOS traefik service using nixfmt.
* treewide: Per RFC45, remove all unquoted URLsMichael Reilly2020-04-10
|
* Merge pull request #82784 from davidak/fpmAaron Andersen2020-03-28
|\ | | | | nixos/phpfpm: add example to socket
| * nixos/phpfpm: add example to socketdavidak2020-03-17
| |
* | nixos/nginx: fix evalJan Tojnar2020-03-29
| | | | | | | | Fixes a typo introduced in https://github.com/NixOS/nixpkgs/pull/83611
* | nginx: increase types_hash_max_size to 4096 (#83609)Vincent Bernat2020-03-28
| | | | | | | | | | | | | | | | | | | | | | | | | | After upgrading to NixOS 20.03, I've got the following warning: nginx: [warn] could not build optimal types_hash, you should increase either types_hash_max_size: 2048 or types_hash_bucket_size: 64; ignoring types_hash_bucket_size The documentation states that "if nginx emits the message requesting to increase either hash max size or hash bucket size then the first parameter should first be increased" (aka types_hash_max_size). In 19.03, the size of mime.types was around 100 entries. In 20.03, we are around 900 entries. This is due to ff0148d868bd which makes nginx use mailcap mime.types.
* | nixos/nginx: use mailcap mimetypes in all cases (#83611)Vincent Bernat2020-03-28
|/ | | | | | | | In ff0148d868bd, nginx configuration was modified to use mime.types from mailcap package as it is more complete. However, there are two places where mime.types is included in configuration. When the user was setting `cfg.httpConfig`, the mime.types from nginx was still used. This commit fix that by moving the common snippet in a variable of its own and ensure it is used at both places.
* Merge pull request #81891 from emilazy/nginx-use-mozilla-tls-configJörg Thalheim2020-03-06
|\ | | | | nixos/nginx: use Mozilla Intermediate TLS configuration
| * nixos/nginx: use Mozilla Intermediate TLS configurationEmily2020-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | The configuration at https://ssl-config.mozilla.org/#server=nginx&config=intermediate is reliably kept up-to-date in terms of security and compatible with a wide range of clients. They've probably had more care and thought put into them than our defaults, and will be easier to keep updated in the future. The only removed (rather than changed) configuration option here is ssl_ecdh_curve, per https://github.com/mozilla/server-side-tls/issues/189. Resolves #80952.
* | uwsgi: use pyhome instead of pythonpath for uwsgi vassalsAlexander Bakker2020-03-04
|/
* Merge pull request #78360 from serokell/mkaito/caddy-restartFlorian Klink2020-02-13
|\ | | | | nixos/caddy: resync with upstream unit file
| * nixos/caddy: resync with upstream unit fileYorick van Pelt2020-01-23
| |
* | nixos/httpd: add http2 optionAaron Andersen2020-02-01
| |
* | nixos/httpd: provision log directory with tmpfiles instead of mkdirAaron Andersen2020-01-31
| |
* | nixos/httpd: code cleanupAaron Andersen2020-01-31
| |
* | nixos/httpd: add services.httpd.virtualHosts.<name>.locations option to ↵Aaron Andersen2020-01-23
| | | | | | | | match nginx
* | nixos/unit: fix attrsIzorkin2020-01-23
|/
* Merge pull request #76537 from Izorkin/unitJörg Thalheim2020-01-21
|\ | | | | unit: 1.13.0 -> 1.14.0
| * nixos/unit: fix typoIzorkin2019-12-28
| |
* | Merge pull request #75602 from vanyaklimenko/nginx-gitweb-more-optionsAaron Andersen2020-01-15
|\ \ | | | | | | nixos/nginx/gitweb: add some (crucial) options
| * | nixos/nginx/gitweb: add some (crucial) optionsVanya Klimenko2020-01-14
| | | | | | | | | | | | | | | | | | | | | | | | This replaces some hardcoded values in nginx's VirtualHosts's configuration with customizable options. Previous values are kept as default, so nothing should break for existing users. Co-Authored-By: Florian Klink <flokli@flokli.de>
* | | Merge pull request #77326 from aanderse/apacheHttpdAaron Andersen2020-01-15
|\ \ \ | | | | | | | | nixos/httpd: symlink apache configuration to /etc/httpd/httpd.conf for use in the apachectl command
| * | | nixos/httpd: symlink apache configuration to /etc/httpd/httpd.conf for use ↵Aaron Andersen2020-01-08
| | | | | | | | | | | | | | | | in the apachectl command
* | | | Merge branch 'master' into ihatemoneyLéo Gaspard2020-01-09
|\| | |
| * | | treewide: use attrs instead of list for types.loaOf optionsrnhmjoj2020-01-06
| | | |
| * | | nixos/nginx: don't hide nginx config errors on nixos-rebuild --switch with ↵Danylo Hlynskyi2020-01-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reload enabled (#76179) nixos/nginx: don't hide nginx config errors on nixos-rebuild --switch with reload enabled Closes https://github.com/NixOS/nixpkgs/issues/73455
| * | | nixos/httpd: update default ssl protocolsAaron Andersen2019-12-30
| | |/ | |/|
| * | Merge pull request #73113 from aanderse/httpd-vhostAaron Andersen2019-12-26
| |\ \ | | | | | | | | nixos/httpd: support overridable virtual hosts
| | * | nixos/httpd: limit serving web content to virtual hosts, convert ↵Aaron Andersen2019-12-24
| | | | | | | | | | | | | | | | virtualHosts option type from listOf to attrsOf, add ACME integration
| * | | nixos/nginx: fixup permissions for Nginx state dirdanbst2019-12-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The commit b0bbacb52134a7e731e549f4c0a7a2a39ca6b481 was a bit too fast It did set executable bit for log files. Also, it didn't account for other directories in state dir: ``` # ls -la /var/spool/nginx/ total 32 drwxr-x--- 8 nginx nginx 4096 Dec 26 12:00 . drwxr-xr-x 4 root root 4096 Oct 10 20:24 .. drwx------ 2 root root 4096 Oct 10 20:24 client_body_temp drwx------ 2 root root 4096 Oct 10 20:24 fastcgi_temp drwxr-x--- 2 nginx nginx 4096 Dec 26 12:00 logs drwx------ 2 root root 4096 Oct 10 20:24 proxy_temp drwx------ 2 root root 4096 Oct 10 20:24 scgi_temp drwx------ 2 root root 4096 Oct 10 20:24 uwsgi_temp ``` With proposed change, only ownership is changed for state files, and mode is left as is except that statedir/logs is now group accessible.
| * | | nixos/nginx: recursively change logs directory owner/group (#76174)Yurii Izorkin2019-12-26
| |/ / | | | | | | | | | | | | This change brings pre-existing installations (where the logfiles are owned by root) in line with the new permssions (where logfiles are owned by the nginx user)
| * | Merge pull request #56255 from Izorkin/nginx-temp1Florian Klink2019-12-20
| |\ \ | | | | | | | | nginx: do not run anything as root
| | * | nixos/nginx: do not run anything as rootIzorkin2019-12-15
| | | |
| * | | nixos/nginx: drop extra semicolon in return example (#76055)brprice2019-12-19
| |/ /
| * | nixos/unit: update preStart scriptIzorkin2019-12-12
| | |
| * | nixos/unit: enable sanboxingIzorkin2019-12-12
| | |
| * | nixos/treewide: Move rename.nix imports to their respective modulesSilvan Mosberger2019-12-10
| | | | | | | | | | | | | | | | | | | | | | | | A centralized list for these renames is not good because: - It breaks disabledModules for modules that have a rename defined - Adding/removing renames for a module means having to find them in the central file - Merge conflicts due to multiple people editing the central file