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

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2023-02-12 06:01:33 +00:00 • committed by GitHub
commit db256a18b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
54 changed files with 2795 additions and 7060 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -82,7 +82,7 @@ let
basePackage = cfg.package;
localConfig = dokuwikiLocalConfig hostName cfg;
pluginsConfig = dokuwikiPluginsLocalConfig hostName cfg;
aclConfig = if cfg.aclUse && cfg.acl != null then dokuwikiAclAuthConfig hostName cfg else null;
aclConfig = if cfg.settings.useacl && cfg.acl != null then dokuwikiAclAuthConfig hostName cfg else null;
};
aclOpts = { ... }: {

4
nixos/modules/virtualisation/linode-config.nix
View file

@ -6,8 +6,8 @@ with lib;
services.openssh = {
enable = true;
permitRootLogin = "prohibit-password";
passwordAuthentication = mkDefault false;
settings.PermitRootLogin = "prohibit-password";
settings.PasswordAuthentication = mkDefault false;
};
networking = {