movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

nixos/dokuwiki: Don't force http with Caddy (#327743)

Browse source
This commit is contained in:
Arne Keller 2024-12-12 10:21:24 +01:00 • committed by GitHub
commit 27aef3ef74
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nixos/doc/manual/release-notes/rl-2505.section.md
View file

@ -86,6 +86,10 @@
- `nodePackages.expo-cli` has been removed, as it was deprecated by upstream. The suggested replacement is the `npx expo` command. - `nodePackages.expo-cli` has been removed, as it was deprecated by upstream. The suggested replacement is the `npx expo` command.
- DokuWiki with the Caddy webserver (`services.dokuwiki.webserver = "caddy"`) now sets up sites with Caddy's automatic HTTPS instead of HTTP-only.
To keep the old behavior for a site `example.com`, set `services.caddy.virtualHosts."example.com".hostName = "http://example.com"`.
If you set custom Caddy options for a DokuWiki site, migrate these options by removing `http://` from `services.caddy.virtualHosts."http://example.com"`.
- `vscode-utils.buildVscodeExtension` now requires pname as an argument - `vscode-utils.buildVscodeExtension` now requires pname as an argument
- `nerdfonts` has been separated into individual font packages under the namespace `nerd-fonts`. The directories for font - `nerdfonts` has been separated into individual font packages under the namespace `nerd-fonts`. The directories for font

2
nixos/modules/services/web-apps/dokuwiki.nix
View file

@ -475,7 +475,7 @@ in
services.caddy = { services.caddy = {
enable = true; enable = true;
virtualHosts = mapAttrs' (hostName: cfg: ( virtualHosts = mapAttrs' (hostName: cfg: (
nameValuePair "http://${hostName}" { nameValuePair hostName {
extraConfig = '' extraConfig = ''
root * ${pkg hostName cfg}/share/dokuwiki root * ${pkg hostName cfg}/share/dokuwiki
file_server file_server

5
nixos/tests/dokuwiki.nix
View file

@ -78,6 +78,11 @@ let
}; };
}; };
services.caddy.virtualHosts = {
"site1.local".hostName = "http://site1.local";
"site2.local".hostName = "http://site2.local";
};
networking.firewall.allowedTCPPorts = [ 80 ]; networking.firewall.allowedTCPPorts = [ 80 ];
networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ]; networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ];
}; };