github-actions[bot]
79cb2f7e61
Merge master into staging-next
2023-01-14 11:12:34 +00:00
Naïm Favier
94197f9339
Merge pull request #207725 from SuperSandro2000/nixos-nginx
2023-01-14 10:45:32 +01:00
github-actions[bot]
49722fd14a
Merge master into staging-next
2023-01-13 18:01:34 +00:00
pennae
53fc887582
nixos/manual: move "edit the MD file" comments to generated XML
2023-01-10 12:34:37 +01:00
pennae
bf92eaebe4
nixos/manual: generate module chapters with md-to-db.sh
2023-01-10 10:32:00 +01:00
pennae
23ea73b416
nixos/manual: enable smart quotes for all MD chapters
2023-01-10 10:31:59 +01:00
pennae
8a86d1f759
nixos/garage: convert manual chapter to MD
2023-01-10 10:31:59 +01:00
pennae
22144ba269
nixos/manual: normalize <package> -> <literal>
...
markdown can only do <literal>, so normalize to that. without
auto-linking to a package index the distinction is not very useful anyway.
2023-01-10 10:31:52 +01:00
pennae
0715ecf936
nixos/manual: normalize <programlisting>
...
makes sure that program listing tags are separated from their contents
by exactly a newline character. this makes the markdown translation
easier to verify (since no new newlines need to be inserted), and
there's no rendering difference anyway.
2023-01-10 10:31:52 +01:00
Sandro Jäckel
b973513d04
nixos/nginx: cleanup, remove old todo
2023-01-09 22:04:06 +01:00
github-actions[bot]
e859576396
Merge staging-next into staging
2023-01-04 00:03:20 +00:00
Kevin Cox
c930fd9517
Merge pull request #207874 from kevincox/nginx-unique
...
nixos/nginx: Deduplicate modules.
2023-01-03 13:07:43 -05:00
Jan Tojnar
5810109b42
Merge branch 'staging-next' into staging
...
- readline6 attribute removed from all-packages.nix in d879125d61a0be8ecb2afddaca8f2b0530db0260
- readline attribute was bumped to readline82 in 50adabdd60d590c951824974356a9ccb9bb73ffc
2023-01-02 03:04:32 +01:00
Raito Bezarius
1db2175e7a
nixos/garage: provide multiple versions to provide an upgrade path when using NixOS service
...
- Add mention to release notes 23.05
- Introduce Garage v0.8
- Protect against unexpected upgrade with stateVersion
- Test matrix over 0.7 × 0.8
2022-12-30 15:12:44 +01:00
Izorkin
4a7d0140a0
nixos/nginx: add recommended brotli settings
2022-12-29 18:14:35 +03:00
Kevin Cox
487b51e77c
nixos/nginx: Deduplicate modules.
...
In most places in NixOS defining an option multiple places just merges the result together. This is particularly useful if you have two modules that both need an option, you don't want to have problems when they both set it. This makes the nginx `additionalModules` option follow this pattern.
2022-12-26 15:47:51 -05:00
Jan Tojnar
72c37eddec
Merge branch 'staging-next' into staging
2022-12-25 01:30:47 +01:00
Jörg Thalheim
7ef58bce9d
nixos/nginx: disable configuration validation for now
...
There still seem a lot of breakages not addressed yet:
https://github.com/NixOS/nixpkgs/pull/205561
2022-12-24 09:25:43 +01:00
Guillaume Girol
92dbac3199
Merge pull request #205561 from symphorien/nginx-conf-validate
...
nixos/nginx: validate config at build time
2022-12-19 19:52:33 +00:00
github-actions[bot]
dc7ebb0163
Merge staging-next into staging
2022-12-18 18:01:41 +00:00
Valentin Gagarin
f782da699e
Merge pull request #206646 from figsoda/typos
2022-12-18 18:27:57 +01:00
Vincent Bernat
fc39b5ecc8
nginx: make global redirect vhost option accept exceptions
...
By moving the return into a location directive, one can provide
exceptions by adding locations. This is similar to what the forceSSL
option does.
2022-12-18 12:21:27 +01:00
figsoda
6bb0dbf91f
nixos: fix typos
2022-12-17 19:31:14 -05:00
Guillaume Girol
a768871934
nixos/nginx: validate syntax of config file at build time
...
Shamelessly stolen from nixcloud-webservices:
https://github.com/nixcloud/nixcloud-webservices/blob/master/modules/web/webserver/lib/nginx_check_config.nix
The nixos test testing the behavior of nginx in case of faulty config
would not build with this change (on purpose), so I modified it so that
the failure is not syntactic.
2022-12-10 23:04:57 +01:00
Robert Hensing
16f5747575
Merge pull request #175649 from Artturin/opt-in-structured-attrs
...
stdenv: support opt-in __structuredAttrs
2022-12-10 21:12:43 +01:00
Artturin
c01f509e44
treewide: source .attrs in builders
...
if theres a source $stdenv then this is needed
for structuredAttrs
2022-12-08 21:09:02 +02:00
Naïm Favier
0ff3b35356
nixos/doc: fix some options
2022-12-08 17:52:52 +01:00
Daniel Nagy
ad866e565d
treewide: switch to port type for nixos modules
2022-12-08 00:00:00 +01:00
Alexander Bantyev
df85dda331
Merge pull request #198314 from Izorkin/update-nginx-cache
...
nixos/nginx: add proxyCache options
2022-11-27 18:51:09 +04:00
Pierre Bourdon
4ac2dbfec5
Merge pull request #201329 from jqqqqqqqqqq/master
...
nixos/nginx: fix default listen port options
2022-11-15 17:57:51 +01:00
Curtis Jiang
f7bed8cd44
nixos/nginx: fix default listen port options
2022-11-15 15:11:52 +00:00
Franz Pletz
f0609d6c05
Merge pull request #198529 from jqqqqqqqqqq/master
2022-11-15 04:58:47 +01:00
Curtis Jiang
81cd6b06f9
nixos/nginx: add default listen port options
2022-11-15 02:00:03 +00:00
Bryan Richter
e3fc19b301
nixos/nginx: docs: Update formatting
...
* Capitalize ACME
* Use bold instead of ALL CAPS
* Tweak sentence structure
2022-11-14 12:24:17 +02:00
Bryan Richter
fd9eed5bf3
nixos/nginx: Extend acmeFallbackHost documentation
...
This extra example would have saved me a lot of uncertainty and doubt.
2022-11-14 11:54:33 +02:00
Pol Dellaiera
364a7d2920
php: switch to nts by default
2022-11-13 11:47:27 +01:00
Izorkin
c09fd120cc
nixos/nginx: add proxyCache options
2022-11-01 10:07:38 +03:00
Francesco Gazzetta
b43605fb03
nixos/merecat: init
2022-10-31 09:24:28 +01:00
Sandro
8f0c7e38cb
Merge pull request #190181 from RaitoBezarius/garage-module
...
services/garage: init
2022-10-27 02:14:01 +02:00
Raito Bezarius
9b7dc6cb1c
services/garage: init
2022-10-23 18:54:18 +02:00
happysalada
fdfdc5df21
caddy: module: rmem_max default
2022-10-22 07:55:53 -04:00
Sandro
67e4972c5d
Merge pull request #195745 from virusdave/patch-1
2022-10-22 00:00:52 +02:00
Jonas Heinrich
c54a28030f
nixos/httpd: Make option adminAddr optional
2022-10-21 09:12:25 -04:00
Dave Nicponski
1a73877305
Tweak nginx config for Let's Encrypt ACME challenges
...
Currently, this is using a "URI prefix match", but per nginx docs,
```
[...] the location with the longest matching prefix is selected and remembered. Then regular expressions are checked, in the order of their appearance in the configuration file. The search of regular expressions terminates on the first match, and the corresponding configuration is used. If no match with a regular expression is found then the configuration of the prefix location remembered earlier is used.
```
which means a config like this (from wordpress service) will override that
```
locations = {
"~ /\\." = {
priority = 800;
extraConfig = "deny all;";
};
};
```
😱
Luckily, from nginx docs:
```
If the longest matching prefix location has the “^~” modifier then regular expressions are not checked.
```
Whew!
2022-10-20 10:59:28 -04:00
David Warde-Farley
a81954b818
Fix docs.
2022-09-28 10:48:10 -04:00
David Warde-Farley
c3e75d4931
Use null instead of empty string.
...
Per @aanderse in 7556fd7.
2022-09-28 10:48:10 -04:00
David Warde-Farley
0d5a365f61
caddy: Omit --adapter from invocations if empty string supplied
...
This allows specifying configuration in the natively processed Caddy JSON format.
Fixes #153142 .
2022-09-28 10:48:10 -04:00
pennae
1d41cff3dc
nixos/*: convert straggler options to MD
2022-08-31 17:27:38 +02:00
pennae
f2ea09ecbe
nixos/*: convert options with listings
...
minor rendering changes.
2022-08-31 17:27:36 +02:00
pennae
722b99bc0e
nixos/*: convert options with admonitions to MD
...
rendering changes only slightly, most changes are in spacing.
2022-08-31 16:36:16 +02:00
