clerie
/
nixfiles
1
0
Fork 0
Code

pkgs/nixfiles: rename nixfiles-system-sync-to-hydra to nixfiles-system-upgrade

This commit is contained in:
clerie 2023-12-01 18:02:44 +01:00
parent cff95863fd
commit 01b1ce3caa
10 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flake.nix
View File

@ -107,7 +107,7 @@
nixfiles-auto-install nixfiles-auto-install
nixfiles-generate-backup-secrets nixfiles-generate-backup-secrets
nixfiles-generate-config nixfiles-generate-config
nixfiles-system-sync-to-hydra nixfiles-system-upgrade
nixfiles-updated-inputs nixfiles-updated-inputs
nixfiles-update-ssh-host-keys nixfiles-update-ssh-host-keys
nixos-firewall-tool nixos-firewall-tool

2
hosts/dn42-il-gw1/configuration.nix
View File

@ -329,7 +329,7 @@
} }
''; '';
clerie.nixfiles.system-auto-sync-to-hydra = { clerie.nixfiles.system-auto-upgrade = {
enable = true; enable = true;
allowReboot = true; allowReboot = true;
}; };

2
hosts/dn42-il-gw5/configuration.nix
View File

@ -183,7 +183,7 @@
} }
''; '';
clerie.nixfiles.system-auto-sync-to-hydra = { clerie.nixfiles.system-auto-upgrade = {
enable = true; enable = true;
allowReboot = true; allowReboot = true;
}; };

2
hosts/dn42-il-gw6/configuration.nix
View File

@ -183,7 +183,7 @@
} }
''; '';
clerie.nixfiles.system-auto-sync-to-hydra = { clerie.nixfiles.system-auto-upgrade = {
enable = true; enable = true;
allowReboot = true; allowReboot = true;
}; };

2
hosts/nonat/configuration.nix
View File

@ -39,7 +39,7 @@
networking.firewall.allowedUDPPorts = []; networking.firewall.allowedUDPPorts = [];
clerie.nixfiles.system-auto-sync-to-hydra = { clerie.nixfiles.system-auto-upgrade = {
enable = true; enable = true;
allowReboot = true; allowReboot = true;
}; };

2
modules/default.nix
View File

@ -13,7 +13,7 @@
./monitoring ./monitoring
./nginx-port-forward ./nginx-port-forward
./nixfiles ./nixfiles
./nixfiles/system-auto-sync-to-hydra.nix ./nixfiles/nixfiles-system-upgrade.nix
./update-from-hydra ./update-from-hydra
./wg-clerie ./wg-clerie
./wireguard-initrd ./wireguard-initrd

8
modules/nixfiles/system-auto-sync-to-hydra.nix → modules/nixfiles/nixfiles-system-upgrade.nix
View File

@ -3,12 +3,12 @@
with lib; with lib;
let let
cfg = config.clerie.nixfiles.system-auto-sync-to-hydra; cfg = config.clerie.nixfiles.system-auto-upgrade;
in in
{ {
options = { options = {
clerie.nixfiles.system-auto-sync-to-hydra = { clerie.nixfiles.system-auto-upgrade = {
enable = mkEnableOption "clerie nixfiles tools"; enable = mkEnableOption "clerie nixfiles tools";
allowReboot = mkOption { allowReboot = mkOption {
type = types.bool; type = types.bool;
@ -18,10 +18,10 @@ in
}; };
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
systemd.services.nixfiles-system-auto-sync-to-hydra = { systemd.services.nixfiles-system-auto-upgrade = {
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
ExecStart = pkgs.nixfiles-system-sync-to-hydra + "/bin/nixfiles-system-sync-to-hydra${optionalString cfg.allowReboot " --allow-reboot"}"; ExecStart = pkgs.nixfiles-system-upgrade + "/bin/nixfiles-system-upgrade${optionalString cfg.allowReboot " --allow-reboot"}";
}; };
startAt = "*-*-* 06:47:00"; startAt = "*-*-* 06:47:00";
}; };

4
pkgs/nixfiles/nixfiles-system-sync-to-hydra.nix → pkgs/nixfiles/nixfiles-system-upgrade.nix
View File

@ -1,8 +1,8 @@
{ pkgs, ... }: { pkgs, ... }:
pkgs.writeShellApplication { pkgs.writeShellApplication {
name = "nixfiles-system-sync-to-hydra"; name = "nixfiles-system-upgrade";
text = builtins.readFile ./nixfiles-system-sync-to-hydra.sh; text = builtins.readFile ./nixfiles-system-upgrade.sh;
runtimeInputs = with pkgs; [ runtimeInputs = with pkgs; [
curl curl
jq jq

0
pkgs/nixfiles/nixfiles-system-sync-to-hydra.sh → pkgs/nixfiles/nixfiles-system-upgrade.sh
View File

2
pkgs/overlay.nix
View File

@ -6,7 +6,7 @@ self: super: {
nixfiles-auto-install = self.callPackage ./nixfiles/nixfiles-auto-install.nix {}; nixfiles-auto-install = self.callPackage ./nixfiles/nixfiles-auto-install.nix {};
nixfiles-generate-backup-secrets = self.callPackage ./nixfiles/nixfiles-generate-backup-secrets.nix {}; nixfiles-generate-backup-secrets = self.callPackage ./nixfiles/nixfiles-generate-backup-secrets.nix {};
nixfiles-generate-config = self.callPackage ./nixfiles/nixfiles-generate-config.nix {}; nixfiles-generate-config = self.callPackage ./nixfiles/nixfiles-generate-config.nix {};
nixfiles-system-sync-to-hydra = self.callPackage ./nixfiles/nixfiles-system-sync-to-hydra.nix {}; nixfiles-system-upgrade = self.callPackage ./nixfiles/nixfiles-system-upgrade.nix {};
nixfiles-updated-inputs = self.callPackage ./nixfiles/nixfiles-updated-inputs.nix {}; nixfiles-updated-inputs = self.callPackage ./nixfiles/nixfiles-updated-inputs.nix {};
nixfiles-update-ssh-host-keys = self.callPackage ./nixfiles/nixfiles-update-ssh-host-keys.nix {}; nixfiles-update-ssh-host-keys = self.callPackage ./nixfiles/nixfiles-update-ssh-host-keys.nix {};
nixos-firewall-tool = self.callPackage ./nixos-firewall-tool {}; nixos-firewall-tool = self.callPackage ./nixos-firewall-tool {};