X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Ftools%2Fgit%2Fdefault.nix;h=ea0d9717ae152f2df53d288a048d74da56888a11;hb=daf64e3f7de98e4267823d14fa34891b27b5f657;hp=799c18097269650e7ee10c994a312f0485311259;hpb=1a7188052f235fb632700478fad0108e4306107d;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/nixops/modules/websites/tools/git/default.nix b/nixops/modules/websites/tools/git/default.nix index 799c180..ea0d971 100644 --- a/nixops/modules/websites/tools/git/default.nix +++ b/nixops/modules/websites/tools/git/default.nix @@ -1,7 +1,6 @@ -{ lib, pkgs, config, myconfig, mylibs, ... }: +{ lib, pkgs, config, myconfig, ... }: let mantisbt = pkgs.callPackage ./mantisbt.nix { - inherit (mylibs) fetchedGithub; inherit (pkgs.webapps) mantisbt_2 mantisbt_2-plugins; env = myconfig.env.tools.mantisbt; }; @@ -17,7 +16,7 @@ in { security.acme.certs."eldiron".extraDomains."git.immae.eu" = null; secrets.keys = mantisbt.keys; - services.myWebsites.tools.modules = + services.websites.tools.modules = gitweb.apache.modules ++ mantisbt.apache.modules; system.extraSystemBuilderCmds = '' @@ -26,7 +25,7 @@ in { ln -s ${mantisbt.webRoot} $out/webapps/${mantisbt.apache.webappName} ''; - services.myWebsites.tools.vhostConfs.git = { + services.websites.tools.vhostConfs.git = { certName = "eldiron"; hosts = ["git.immae.eu" ]; root = gitweb.apache.root;