diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2023-11-23 11:35:47 +0100 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2023-11-26 16:25:04 +0000 |
| commit | d579023fbea74721c50bdbbd7e87b4708473f513 (patch) | |
| tree | aeb20692a64d3e350c110da5a12596fed630935a | |
| parent | Merge pull request #270009 from NixOS/backport-269821-to-release-23.11 (diff) | |
| download | nixpkgs-origin/backport-269423-to-release-23.11.tar.gz | |
nixos/mediawiki: update url option defaultTextorigin/backport-269423-to-release-23.11
(cherry picked from commit 401e56568738cc33456603ab9797e2cabdb314cb)
| -rw-r--r-- | nixos/modules/services/web-apps/mediawiki.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/nixos/modules/services/web-apps/mediawiki.nix b/nixos/modules/services/web-apps/mediawiki.nix index ce7bcd94b3f0..e34039708f30 100644 --- a/nixos/modules/services/web-apps/mediawiki.nix +++ b/nixos/modules/services/web-apps/mediawiki.nix @@ -230,11 +230,8 @@ in "${if hasSSL config.services.nginx.virtualHosts.${cfg.nginx.hostName} then "https" else "http"}://${cfg.nginx.hostName}" else "http://localhost"; - defaultText = literalExpression '' - if cfg.webserver == "apache" then - "''${if cfg.httpd.virtualHost.addSSL || cfg.httpd.virtualHost.forceSSL || cfg.httpd.virtualHost.onlySSL then "https" else "http"}://''${cfg.httpd.virtualHost.hostName}" - else - "http://localhost"; + defaultText = '' + if "mediawiki uses ssl" then "{"https" else "http"}://''${cfg.hostName}" else "http://localhost"; ''; example = "https://wiki.example.org"; description = lib.mdDoc "URL of the wiki."; |
