X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fdefault.nix;h=946705590b7ccc148d5d611914d34d430e45678e;hb=f7c27d313296485fd5f6d76a9264c26beef2eeaa;hp=27719cca5ef44608c087fb1fdf9f6b055ad50e95;hpb=6c7d42fc4844bc4f9af72dab531be8377825296a;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/modules/private/websites/default.nix b/modules/private/websites/default.nix index 27719cc..9467055 100644 --- a/modules/private/websites/default.nix +++ b/modules/private/websites/default.nix @@ -89,6 +89,14 @@ let }; makeModules = lib.lists.flatten (lib.attrsets.mapAttrsToList (n: v: v.modules or []) apacheConfig); makeExtraConfig = (builtins.filter (x: x != null) (lib.attrsets.mapAttrsToList (n: v: v.extraConfig or null) apacheConfig)); + moomin = let + lines = lib.splitString "\n" (lib.fileContents ./moomin.txt); + pad = width: str: let + padWidth = width - lib.stringLength str; + padding = lib.concatStrings (lib.genList (lib.const "0") padWidth); + in lib.optionalString (padWidth > 0) padding + str; + in + lib.imap0 (i: e: ''Header always set "X-Moomin-${pad 2 (builtins.toString i)}" "${e}"'') lines; in { options.myServices.websites.enable = lib.mkEnableOption "enable websites"; @@ -96,6 +104,7 @@ in config = lib.mkIf config.myServices.websites.enable { services.duplyBackup.profiles.php = { rootDir = "/var/lib/php"; + remotes = [ "eriomem" "ovh" ]; }; users.users.wwwrun.extraGroups = [ "keys" ]; networking.firewall.allowedTCPPorts = [ 80 443 ]; @@ -169,7 +178,7 @@ in let ips = config.myEnv.servers.eldiron.ips.integration; in [ips.ip4] ++ (ips.ip6 or []); modules = makeModules; - extraConfig = makeExtraConfig; + extraConfig = makeExtraConfig ++ moomin; fallbackVhost = { certName = "eldiron"; hosts = ["eldiron.immae.eu" ]; @@ -232,6 +241,9 @@ in denise = { evariste.enable = true; denisejerome.enable = true; + oms.enable = true; + aventuriers.enable = true; + production.enable = true; }; emilia.moodle.enable = true; @@ -283,7 +295,9 @@ in telio_tortay.production.enable = true; + tools.assets.enable = true; tools.cloud.enable = true; + tools.commento.enable = true; tools.dav.enable = true; tools.db.enable = true; tools.diaspora.enable = true; @@ -292,6 +306,7 @@ in tools.mastodon.enable = true; tools.mediagoblin.enable = true; tools.peertube.enable = true; + tools.performance.enable = true; tools.tools.enable = true; tools.email.enable = true;