aboutsummaryrefslogtreecommitdiff
path: root/nixos/modules/services/web-servers (follow)
Commit message (Collapse)AuthorAgeFilesLines
* nginx: remove gzip_disable directiveVincent Bernat2019-09-121-1/+0
| | | | | | IE6 is long gone and this directive is not useful anymore. We can spare a few CPU cycles (and maybe skip some bugs) by not trying to disable gzip for MSIE6.
* treewide: remove redundant quotesvolth2019-09-081-1/+1
|
* Merge pull request #68094 from peterhoeg/f/darkhttpPeter Hoeg2019-09-041-1/+1
|\ | | | | nixos/darkhttpd: fix package reference
| * nixos/darkhttpd: fix package referencePeter Hoeg2019-08-281-1/+1
| |
* | nixos/modules: Remove all usages of types.stringSilvan Mosberger2019-08-316-11/+11
| | | | | | | | | | | | And replace them with a more appropriate type Also fix up some minor module problems along the way
* | Fix letsencrypt (#60219)Arian van Putten2019-08-291-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nixos/acme: Fix ordering of cert requests When subsequent certificates would be added, they would not wake up nginx correctly due to target units only being triggered once. We now added more fine-grained systemd dependencies to make sure nginx always is aware of new certificates and doesn't restart too early resulting in a crash. Furthermore, the acme module has been refactored. Mostly to get rid of the deprecated PermissionStartOnly systemd options which were deprecated. Below is a summary of changes made. * Use SERVICE_RESULT to determine status This was added in systemd v232. we don't have to keep track of the EXITCODE ourselves anymore. * Add regression test for requesting mutliple domains * Deprecate 'directory' option We now use systemd's StateDirectory option to manage create and permissions of the acme state directory. * The webroot is created using a systemd.tmpfiles.rules rule instead of the preStart script. * Depend on certs directly By getting rid of the target units, we make sure ordering is correct in the case that you add new certs after already having deployed some. Reason it broke before: acme-certificates.target would be in active state, and if you then add a new cert, it would still be active and hence nginx would restart without even requesting a new cert. Not good! We make the dependencies more fine-grained now. this should fix that * Remove activationDelay option It complicated the code a lot, and is rather arbitrary. What if your activation script takes more than activationDelay seconds? Instead, one should use systemd dependencies to make sure some action happens before setting the certificate live. e.g. If you want to wait until your cert is published in DNS DANE / TLSA, you could create a unit that blocks until it appears in DNS: ``` RequiredBy=acme-${cert}.service After=acme-${cert}.service ExecStart=publish-wait-for-dns-script ```
* | nixos/treewide: drop dependencies to `keys.target`Maximilian Bosch2019-08-271-2/+1
|/ | | | | | | | | | | | | | | | | | | | | | | | | The `keys.target` is used to indicate whether all NixOps keys were successfully uploaded on an unattended reboot. However this can cause startup issues e.g. with NixOS containers (see #67265) and can block boots even though this might not be needed (e.g. with a dovecot2 instance running that doesn't need any of the NixOps keys). As described in the NixOps manual[1], dependencies to keys should be defined like this now: ``` nix { systemd.services.myservice = { after = [ "secret-key.service" ]; wants = [ "secret-key.service" ]; }; } ``` However I'd leave the issue open until it's discussed whether or not to keep `keys.target` in `nixpkgs`. [1] https://nixos.org/nixops/manual/#idm140737322342384
* nixos darkhttpd: module to enable darkhttpdPeter Hoeg2019-08-261-0/+77
|
* nixos/phpfpm: deprecate extraConfig options in favor of settings optionsAaron Andersen2019-08-231-30/+93
|
* nixos/phpfpm: Use systemd's RuntimeDirectoryAaron Andersen2019-08-231-5/+4
|
* nixos/phpfpm: add user and group option to each poolAaron Andersen2019-08-231-2/+15
|
* nixos/phpfpm: add socket option to replace the listen optionAaron Andersen2019-08-231-3/+25
|
* nixos/phpfpm: merge pool-options.nix into default.nixAaron Andersen2019-08-232-60/+51
|
* nixos/phpfpm: deprecate poolConfigs optionAaron Andersen2019-08-231-55/+12
|
* nginx: expose generated config and allow nginx reloads (#57429)Danylo Hlynskyi2019-08-211-2/+31
| | | | | | | | | | | | | | | | | | * nginx: expose generated config and allow nginx reloads Fixes: https://github.com/NixOS/nixpkgs/issues/15906 Another try was done, but not yet merged in https://github.com/NixOS/nixpkgs/pull/24476 This add 2 new features: ability to review generated Nginx config (and NixOS has sophisticated generation!) and reloading of nginx on config changes. This preserves nginx restart on package updates. I've modified nginx test to use this new feature and check reload/restart behavior. * rename to enableReload * add sleep(1) in ETag test (race condition) and rewrite rebuild-switch using `nesting.clone`
* caddy: remove 'bin' attributeTimothy DeHerrera2019-08-181-1/+1
|
* Merge pull request #65439 from aanderse/httpd-extra-modulesMarek Mahut2019-08-131-1/+1
|\ | | | | nixos/httpd: remove duplicate module entries from httpd.conf
| * nixos/httpd: remove duplicate module entries from httpd.confAaron Andersen2019-07-261-1/+1
| |
* | nixos/mediawiki: init service to replace httpd subserviceAaron Andersen2019-07-231-349/+0
|/
* nixos/httpd: drop postgresql referenceAaron Andersen2019-07-201-1/+1
|
* nixos/httpd: mark extraSubservices option as deprecatedAaron Andersen2019-07-201-0/+2
|
* nixos/httpd: drop the port optionAaron Andersen2019-07-202-14/+3
|
* Merge pull request #64052 from aanderse/tomcat-connectorGraham Christensen2019-07-191-103/+0
|\ | | | | nixos/httpd: drop tomcat-connector httpd subservice
| * nixos/httpd: drop tomcat-connector httpd subserviceAaron Andersen2019-07-111-103/+0
| |
* | Merge pull request #63844 from aanderse/zabbix-cleanupAaron Andersen2019-07-121-84/+0
|\ \ | |/ |/| nixos/zabbix: overhaul package & module
| * nixos/zabbixWeb: replace httpd subservice with new moduleAaron Andersen2019-07-111-84/+0
| |
* | foswiki: drop package & httpd subserviceAaron Andersen2019-07-111-78/+0
| |
* | nixos/httpd: remove broken trac subserviceAaron Andersen2019-07-111-121/+0
|/
* Merge pull request #64236 from NixOS/staging-nextFrederik Rietdijk2019-07-101-1/+1
|\ | | | | Staging next
| * Merge branch 'master' into staging-nextVladimír Čunát2019-07-063-381/+146
| |\ | | | | | | | | | | | | There are several thousand rebuilds from master already. Hydra nixpkgs: ?compare=1528940
| * \ Merge staging-next into stagingFrederik Rietdijk2019-07-033-148/+98
| |\ \
| * | | treewide: use dontConfigureworldofpeace2019-07-011-1/+1
| | | |
* | | | Merge pull request #64050 from aanderse/mercurialAaron Andersen2019-07-091-75/+0
|\ \ \ \ | |_|_|/ |/| | | nixos/httpd: drop mercurial httpd subservice
| * | | nixos/httpd: drop mercurial httpd subserviceAaron Andersen2019-07-011-75/+0
| | |/ | |/|
* | | nixos/wordpress: create module to replace the httpd subserviceAaron Andersen2019-07-031-285/+0
| | |
* | | Revert "Merge pull request #63156 from Izorkin/phpfpm-rootless"Aaron Andersen2019-06-282-97/+146
| | | | | | | | | | | | | | | This reverts commit b5478fd1a2ef442a54c36031bf3a27a96b5ea31c, reversing changes made to dbb00bfcbfb291e79d4d2d512041656e6bcfcd9a.
* | | Revert "nixos/phpfpm: Remove usage of undefined variable fpmCfg"Aaron Andersen2019-06-281-4/+5
|/ / | | | | | | This reverts commit 54645ce43a1cd2ecde5f1b6d035366b0311117cf.
* | nixos/phpfpm: Remove usage of undefined variable fpmCfgElis Hirwing2019-06-271-5/+4
| |
* | Merge pull request #63156 from Izorkin/phpfpm-rootlessElis Hirwing2019-06-272-146/+97
|\ \ | | | | | | phpfpm: do not run anything as root
| * | nixos/phpfpm: remove options services.phpfpm.poolConfigsIzorkin2019-06-172-134/+67
| | |
| * | nixos/phpfpm: do not run anything as rootIzorkin2019-06-162-27/+45
| | |
* | | nixos/cgit: fix config examplepacien2019-06-261-2/+2
| |/ |/| | | | | | | The order of the keys matters: scan-path must be the last key for other settings to be taken into account.
* | treewide: remove unused variables (#63177)volth2019-06-161-11/+0
|/ | | | | | * treewide: remove unused variables * making ofborg happy
* Merge pull request #63100 from aanderse/phabricator-removeFrederik Rietdijk2019-06-151-50/+0
|\ | | | | drop unmaintained phabricator package, service, and httpd subservice
| * nixos/httpd: remove unmaintained subservice (phabricator)Aaron Andersen2019-06-131-50/+0
| |
* | nixos/cgit: mention filters in configText examplepacien2019-06-111-0/+2
|/
* Merge pull request #60021 from aanderse/httpd-cleanupAaron Andersen2019-06-061-42/+13
|\ | | | | nixos/httpd: cleanup old apache2.2 syntax
| * nixos/httpd: cleanup old apache2.2 syntaxAaron Andersen2019-04-201-42/+13
| |
* | nixos/nginx: add ipv6 options to resolverIzorkin2019-06-021-1/+10
| |
* | Merge pull request #57752 from aanderse/limesurveyMatthew Bauer2019-06-011-196/+0
|\ \ | | | | | | limesurvey: 2.05_plus_141210 -> 3.17.1+190408, init module