simono41/chaos-jetzt-nixfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove redundand dokuwii override+openssh settings

Browse source
This commit is contained in:
Moritz 'e1mo' Fromm 2023-02-10 15:28:55 +01:00
parent 840eff4f97
commit dd3325ab95
No known key found for this signature in database
GPG key ID: 1D5D79A439E787F1
3 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/default.nix
View file

@ -47,9 +47,11 @@
services.openssh = { services.openssh = {
enable = true; enable = true;
permitRootLogin = "no"; settings = {
passwordAuthentication = false; PermitRootLogin = "no";
kbdInteractiveAuthentication = false; PasswordAuthentication = false;
KbdInteractiveAuthentication = false;
};
}; };
# That way we can't forget to disable the access logs for each individual website # That way we can't forget to disable the access logs for each individual website
services.nginx.appendHttpConfig = '' services.nginx.appendHttpConfig = ''

8
packages/default.nix
View file

@ -24,14 +24,6 @@ final: prev:
]; ];
}; };
dokuwiki = prev.dokuwiki.overrideAttrs (oldAttrs: {
installPhase = ''
${oldAttrs.installPhase}
runHook postInstall
'';
});
dokuwikiPlugins = { dokuwikiPlugins = {
tag = final.stdenv.mkDerivation rec { tag = final.stdenv.mkDerivation rec {
name = "tag"; name = "tag";

6
services/dokuwiki.nix
View file

@ -5,10 +5,6 @@
baseDomain, baseDomain,
... ...
}: let }: let
inherit (builtins) any hasAttr isAttrs isBool isInt isList isString;
inherit (lib) boolToString concatMapStringsSep concatStringsSep escapeShellArg flatten mapAttrsToList;
cfg = config.services.dokuwiki.sites.${dw_domain};
fpm_pool = "dokuwiki-${dw_domain}"; fpm_pool = "dokuwiki-${dw_domain}";
fpm_cfg = config.services.phpfpm.pools.${fpm_pool}; fpm_cfg = config.services.phpfpm.pools.${fpm_pool};
dw_domain = "wiki.${baseDomain}"; dw_domain = "wiki.${baseDomain}";
@ -58,7 +54,7 @@ in {
package = pkgs.dokuwiki.overrideAttrs (oldAttrs: { package = pkgs.dokuwiki.overrideAttrs (oldAttrs: {
name = "dokuwiki-${dw_domain}-with-acronyms-${oldAttrs.version}"; name = "dokuwiki-${dw_domain}-with-acronyms-${oldAttrs.version}";
postInstall = oldAttrs.postInstall or "" + '' postInstall = oldAttrs.postInstall or "" + ''
ln -s ${acronyms_file} $out/share/dokuwiki/conf/acronyms.local.conf ln -sf ${acronyms_file} $out/share/dokuwiki/conf/acronyms.local.conf
''; '';
}); });