X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fsystem%2Fdilion.nix;h=a0d56cc355769d77d69db14c642aca714c893803;hb=6c95e93c85640e1fe544ed1b6a0b83e27725d0f0;hp=d8bad6b72ed9632bf633bd63734d4a3b25db7dce;hpb=ba9412966f462a18f913cb22d9be3aae9728230f;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/modules/private/system/dilion.nix b/modules/private/system/dilion.nix index d8bad6b..a0d56cc 100644 --- a/modules/private/system/dilion.nix +++ b/modules/private/system/dilion.nix @@ -1,10 +1,12 @@ { privateFiles }: -{ config, pkgs, name, ... }: +{ config, pkgs, name, lib, ... }: { + boot.supportedFilesystems = [ "zfs" ]; boot.kernelPackages = pkgs.linuxPackages_latest; myEnv = import "${privateFiles}/environment.nix" // { inherit privateFiles; }; networking = { + hostId = "27c3048d"; # generated with head -c4 /dev/urandom | od -A none -t x4 firewall.enable = false; interfaces."eth0".ipv4.addresses = pkgs.lib.attrsets.mapAttrsToList (n: ips: { address = ips.ip4; prefixLength = 32; }) @@ -39,6 +41,8 @@ }; }; + system.nssModules = [ pkgs.libvirt ]; + system.nssHosts = lib.mkForce [ "files" "libvirt_guest" "mymachines" "dns" "myhostname" ]; programs.zsh.enable = true; users.users.backup = { @@ -74,12 +78,24 @@ install -m 0750 -o backup -g root -d /var/lib/backup/eldiron ''; + system.activationScripts.libvirtd_exports = '' + install -m 0755 -o root -g root -d /var/lib/caldance + ''; virtualisation.docker.enable = true; virtualisation.libvirtd.enable = true; users.extraUsers.immae.extraGroups = [ "libvirtd" "docker" ]; systemd.services.libvirtd.postStart = '' install -m 0770 -g libvirtd -d /var/lib/libvirt/images ''; + systemd.services.socat-caldance = { + description = "Forward ssh port to caldance"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + ExecStart = "${pkgs.socat}/bin/socat TCP-LISTEN:8022,fork TCP:nixops-99a7e1ba-54dc-11ea-a965-10bf487fe63b-caldance:22"; + }; + }; time.timeZone = "Europe/Paris"; nix = { @@ -101,8 +117,8 @@ # This is equivalent to setting environment.sessionVariables.NIX_PATH nix.nixPath = [ - "home-manager=https://github.com/rycee/home-manager/archive/master.tar.gz" - "nixpkgs=https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz" + "home-manager=${pkgs.sources.home-manager.url}" + "nixpkgs=${pkgs.sources.nixpkgs-home-manager.url}" ]; nix.binaryCaches = [ "https://hydra.iohk.io" "https://cache.nixos.org" ]; nix.binaryCachePublicKeys = [ "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" ]; @@ -114,6 +130,8 @@ extraDomains = { "discourse.immae.eu" = null; "discourse.cip-ca.fr" = null; + "dev.immae.eu" = null; + "caldance.immae.eu" = null; }; }; services.nginx = { @@ -121,7 +139,16 @@ recommendedOptimisation = true; recommendedGzipSettings = true; recommendedProxySettings = true; + upstreams = { + caldance.servers."nixops-99a7e1ba-54dc-11ea-a965-10bf487fe63b-caldance:3031" = {}; + }; virtualHosts = { + "dev.immae.eu" = { + acmeRoot = config.myServices.certificates.webroot; + useACMEHost = name; + forceSSL = true; + root = "/home/immae/www"; + }; "discourse.immae.eu" = { acmeRoot = config.myServices.certificates.webroot; useACMEHost = name; @@ -134,6 +161,20 @@ forceSSL = true; locations."/".proxyPass = "http://localhost:18031"; }; + "caldance.immae.eu" = { + acmeRoot = config.myServices.certificates.webroot; + useACMEHost = name; + forceSSL = true; + locations."/".extraConfig = '' + uwsgi_pass caldance; + ''; + locations."/static/".alias = "/var/lib/caldance/caldance/app/www/static/"; + locations."/media/".alias = "/var/lib/caldance/caldance/media/"; + extraConfig = '' + auth_basic "Authentification requise"; + auth_basic_user_file ${pkgs.writeText "htpasswd" config.myEnv.websites.caldance.integration.password}; + ''; + }; }; };