From 482e046200000c8f45f6e14a80c247946d09a264 Mon Sep 17 00:00:00 2001 From: Astro Date: Thu, 16 Jun 2022 23:48:49 +0200 Subject: [PATCH] mobilizon: nixify --- flake.lock | 8 ++++---- flake.nix | 4 ++-- hosts/containers/mobilizon/default.nix | 13 +++++++++++-- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index d44f202e..824516de 100644 --- a/flake.lock +++ b/flake.lock @@ -288,16 +288,16 @@ }, "nixpkgs-mobilizon": { "locked": { - "lastModified": 1640913261, - "narHash": "sha256-xzrqwWSQ8H+yLYrZQIOJ1TsL7YB7tIP4c8pqNzUzZLY=", + "lastModified": 1653064340, + "narHash": "sha256-+f7npGBg6yn0zQEPXbe5v8MZXhpGJDRs06xumg/wp0Y=", "owner": "minijackson", "repo": "nixpkgs", - "rev": "5d7e6012eb4bc77ba4ab0907a3e66ef4138362c3", + "rev": "72f4d757fa18680b10390d969b29ab39e3f71c5b", "type": "github" }, "original": { "owner": "minijackson", - "ref": "mobilizon", + "ref": "init-mobilizon", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index fa2d6126..e942e6bc 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/release-22.05"; - nixpkgs-mobilizon.url = "github:minijackson/nixpkgs/mobilizon"; + nixpkgs-mobilizon.url = "github:minijackson/nixpkgs/init-mobilizon"; nixpkgs-openwebrx.url = "github:astro/nixpkgs/openwebrx"; nixos-hardware.url = "github:nixos/nixos-hardware"; fenix = { @@ -533,7 +533,7 @@ # TODO: pending https://github.com/NixOS/nixpkgs/pull/119132 nixpkgs = inputs.nixpkgs-mobilizon; modules = [ - ./config/lxc-container.nix + self.nixosModules.microvm ./hosts/containers/mobilizon ]; }; diff --git a/hosts/containers/mobilizon/default.nix b/hosts/containers/mobilizon/default.nix index 26f8511a..9e27caf7 100644 --- a/hosts/containers/mobilizon/default.nix +++ b/hosts/containers/mobilizon/default.nix @@ -1,9 +1,17 @@ -{ zentralwerk, config, ... }: +{ zentralwerk, config, pkgs, ... }: { c3d2.isInHq = false; + c3d2.deployment = { + server = "server10"; + mounts = [ "etc" "home" "var"]; + interfaces = [ { + net = "serv"; + mac = "4A:D1:5C:A7:16:76"; + } ]; + }; networking = { hostName = "mobilizon"; - interfaces.eth0.ipv4.addresses = [{ + interfaces.ens3.ipv4.addresses = [{ address = config.c3d2.hosts."${config.networking.hostName}".ip4; prefixLength = zentralwerk.lib.config.site.net.serv.subnet4Len; }]; @@ -11,6 +19,7 @@ firewall.allowedTCPPorts = [ 80 443 ]; }; + services.postgresql.package = pkgs.postgresql_13; services.mobilizon = { enable = true;