module v3

This commit is contained in:
Alexander Khodyrev 2024-09-12 21:42:22 +03:00
parent a8822d7581
commit 8c47956653
2 changed files with 19 additions and 20 deletions

View file

@ -8,20 +8,19 @@
inputs.gomod2nix.inputs.flake-utils.follows = "flake-utils"; inputs.gomod2nix.inputs.flake-utils.follows = "flake-utils";
outputs = inputs@{ self, nixpkgs, flake-utils, gomod2nix }: outputs = inputs@{ self, nixpkgs, flake-utils, gomod2nix }:
(flake-utils.lib.eachDefaultSystem (flake-utils.lib.eachDefaultSystem (system:
(system:
let let
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
callPackage = pkgs.darwin.apple_sdk_11_0.callPackage or pkgs.callPackage; callPackage =
in pkgs.darwin.apple_sdk_11_0.callPackage or pkgs.callPackage;
{ in {
packages.default = callPackage ./. { packages.default = callPackage ./. {
inherit (gomod2nix.legacyPackages.${system}) buildGoApplication; inherit (gomod2nix.legacyPackages.${system}) buildGoApplication;
}; };
devShells.default = callPackage ./shell.nix { devShells.default = callPackage ./shell.nix {
inherit (gomod2nix.legacyPackages.${system}) mkGoEnv gomod2nix; inherit (gomod2nix.legacyPackages.${system}) mkGoEnv gomod2nix;
}; };
})) // {
nixosModules.default = import ./module.nix inputs; nixosModules.default = import ./module.nix inputs;
}) };
);
} }

View file

@ -4,7 +4,7 @@ let
inherit (pkgs.stdenv.hostPlatform) system; inherit (pkgs.stdenv.hostPlatform) system;
cfg = config.services.birdtown-visit-counter; cfg = config.services.birdtown-visit-counter;
inherit (lib) types mkOption mkIf; inherit (lib) types mkOption mkIf;
package = inputs.self.packages."${system}".birdtown-visit-counter; package = inputs.self.packages."${system}".default;
in { in {
options.services.birdtown-visit-counter = { options.services.birdtown-visit-counter = {
enable = mkOption { enable = mkOption {
@ -30,7 +30,7 @@ in {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
serviceConfig = { serviceConfig = {
ExecStart = ExecStart =
"${package}/bin/birdtown-visit-counter -addr :${cfg.listenPort} -file visits.json"; "${package}/bin/birdtown-visit-counter -addr :${toString cfg.listenPort} -file visits.json";
User = "birdtown-visit-counter"; User = "birdtown-visit-counter";
Group = "birdtown-visit-counter"; Group = "birdtown-visit-counter";
WorkingDirectory = "/var/lib/birdtown-visit-counter"; WorkingDirectory = "/var/lib/birdtown-visit-counter";
@ -49,7 +49,7 @@ in {
systemd.services.birdtown-visits-saver = { systemd.services.birdtown-visits-saver = {
script = '' script = ''
set -eu set -eu
if ${pkgs.curl}/bin/curl http://localhost:${cfg.listenPort}/visits > visits-new.json; then if ${pkgs.curl}/bin/curl http://localhost:${toString cfg.listenPort}/visits > visits-new.json; then
cp visits-new.json "$(date +"%Y-%m-%d-%H-%M").json" cp visits-new.json "$(date +"%Y-%m-%d-%H-%M").json"
mv visits-new.json visits.json mv visits-new.json visits.json
fi fi