diff options
| author | Nick Cao <nickcao@nichi.co> | 2023-11-30 09:41:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-30 09:41:10 -0500 |
| commit | aacc0321a47a4947dce19e59bc7573a91a5d4ecd (patch) | |
| tree | f41af53d4dd495b22c856029698a4d4bc955d3a2 /nixos/modules | |
| parent | ddb095909c09df447fc37432356f803b3921def2 (diff) | |
| parent | d579023fbea74721c50bdbbd7e87b4708473f513 (diff) | |
Merge pull request #270186 from NixOS/backport-269423-to-release-23.11
[Backport release-23.11] nixos/mediawiki: update url option defaultText
Diffstat (limited to 'nixos/modules')
| -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 ce7bcd94b3f01..e34039708f309 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."; |