diff --git a/flake.lock b/flake.lock index 9b5ac54d..91a82004 100644 --- a/flake.lock +++ b/flake.lock @@ -67,6 +67,7 @@ "nixpkgs": "nixpkgs", "scrapers": "scrapers", "secrets": "secrets", + "ticker": "ticker", "tigger": "tigger", "yammat": "yammat", "zentralwerk": "zentralwerk" @@ -103,6 +104,22 @@ "url": "ssh://git@gitea.c3d2.de:2222/c3d2-admins/secrets.git" } }, + "ticker": { + "flake": false, + "locked": { + "lastModified": 1630774955, + "narHash": "sha256-+5Dh5xzruoc9urs3iTYR4/9cdxbpLSMAkgkKp05WDHg=", + "ref": "master", + "rev": "30babcddc5fd762a8ce92d318923e604651c5f44", + "revCount": 80, + "type": "git", + "url": "https://gitea.c3d2.de/astro/ticker.git" + }, + "original": { + "type": "git", + "url": "https://gitea.c3d2.de/astro/ticker.git" + } + }, "tigger": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index c84465d0..e6a43352 100644 --- a/flake.nix +++ b/flake.nix @@ -11,9 +11,11 @@ scrapers.flake = false; tigger.url = "github:astro/tigger"; tigger.flake = false; + ticker.url = "git+https://gitea.c3d2.de/astro/ticker.git"; + ticker.flake = false; }; - outputs = { self, nixpkgs, secrets, nixos-hardware, zentralwerk, yammat, scrapers, tigger }: + outputs = { self, nixpkgs, secrets, nixos-hardware, zentralwerk, yammat, scrapers, tigger, ticker }: let forAllSystems = nixpkgs.lib.genAttrs [ "aarch64-linux" "x86_64-linux" ]; @@ -282,6 +284,15 @@ system = "x86_64-linux"; }; + ticker = nixosSystem' { + modules = [ + ./lib/lxc-container.nix + "${ticker}/nixos-module.nix" + ./hosts/containers/ticker + ]; + system = "x86_64-linux"; + }; + }; nixosModules.c3d2 = import ./lib; diff --git a/hosts/containers/ticker/default.nix b/hosts/containers/ticker/default.nix index 8cb25b19..0cf34eb9 100644 --- a/hosts/containers/ticker/default.nix +++ b/hosts/containers/ticker/default.nix @@ -2,24 +2,19 @@ with lib; -let - tickerSrc = builtins.fetchGit { - url = "https://gitea.c3d2.de/astro/ticker.git"; - }; -in { boot.isContainer = true; - #boot.loader.initScript.enable = true; + boot.loader.initScript.enable = true; networking.interfaces.eth0.ipv4.addresses = [{ address = "172.20.73.52"; prefixLength = 26; }]; networking.interfaces.eth0.useDHCP = false; networking.defaultGateway = "172.20.73.1"; networking.nameservers = [ "172.20.73.8" "9.9.9.9" ]; networking.hostName = mkDefault "ticker"; networking.useDHCP = false; - networking.firewall.allowedTCPPorts = [ 80 443 ]; + networking.firewall.allowedTCPPorts = [ 22 80 443 ]; nix.useSandbox = false; environment.systemPackages = with pkgs; [ vim git ]; - imports = [ "${tickerSrc}/nixos-module.nix" ]; time.timeZone = "Europe/Berlin"; + services.openssh.enable = true; services.nginx.enable = true; services.nginx.virtualHosts."ticker.c3d2.de" = { @@ -31,7 +26,6 @@ in email = "admin@c3d2.de"; acceptTerms = true; }; - services.ticker.updateInterval = "hourly"; services.ticker.config.calendars = {