diff --git a/flake.nix b/flake.nix index e97d8414..aa510885 100644 --- a/flake.nix +++ b/flake.nix @@ -688,6 +688,13 @@ ]; }; + mediawiki = nixosSystem' { + modules = [ + self.nixosModules.microvm + ./hosts/containers/mediawiki + ]; + }; + }; nixosModule = self.nixosModules.c3d2; diff --git a/hosts/containers/mediawiki/default.nix b/hosts/containers/mediawiki/default.nix index c64b5be2..db126a63 100644 --- a/hosts/containers/mediawiki/default.nix +++ b/hosts/containers/mediawiki/default.nix @@ -9,17 +9,12 @@ let }); in { networking.hostName = "mediawiki"; - networking.interfaces.eth0 = { - ipv4.addresses = [{ - address = config.c3d2.hosts.wiki.ip4; - prefixLength = zentralwerk.lib.config.site.net.serv.subnet4Len; - }]; - useDHCP = false; - }; - networking.defaultGateway = "172.20.73.1"; networking.firewall.allowedTCPPorts = [ 80 443 ]; - c3d2.autoUpdate = true; + c3d2.deployment = { + server = "server10"; + mounts = [ "etc" "home" "var"]; + }; services.nginx = { enable = true; @@ -31,16 +26,6 @@ in { }; }; - boot.isContainer = true; - - # Let 'nixos-version --json' know about the Git revision - # of this flake. - system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev; - - # Network configuration. - networking.useDHCP = false; - networking.firewall.allowedTCPPorts = [ 80 5432 ]; - services.postgresql = let cfg = config.services.mediawiki; @@ -70,7 +55,7 @@ in { in { enable = true; package = ourMediawiki; - virtualHosts."wiki.c3d2.de" = { + virtualHost."wiki.c3d2.de" = { default = true; adminAddr = "root@example.com"; };