Make sure git diff doesn't result in a failed upgrade service
This commit is contained in:
parent
be463aee17
commit
0234b928ff
|
@ -13,14 +13,14 @@ let
|
|||
pathPkgs = with pkgs; [
|
||||
# Courtesy of https://discourse.nixos.org/t/how-to-use-other-packages-binary-in-systemd-service-configuration/14363
|
||||
coreutils
|
||||
gnutar
|
||||
xz.bin
|
||||
gzip
|
||||
git
|
||||
gnutar
|
||||
gzip
|
||||
config.nix.package.out
|
||||
nh
|
||||
openssh
|
||||
config.programs.ssh.package
|
||||
sudo
|
||||
xz.bin
|
||||
];
|
||||
in
|
||||
{
|
||||
|
@ -40,7 +40,7 @@ in
|
|||
config = lib.mkMerge [
|
||||
(lib.mkIf cfg.enable {
|
||||
# Pull and apply updates.
|
||||
systemd.services."nixos-update" = {
|
||||
systemd.services."nixos-upgrade" = {
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
User = "root";
|
||||
|
@ -49,30 +49,33 @@ in
|
|||
script = ''
|
||||
cd ${config.secrets.nixConfigFolder}
|
||||
# Check if there are changes from Git.
|
||||
# Since we're running this as root, we need to su into the user who owns the config folder.
|
||||
echo "Pulling latest version..."
|
||||
sudo -u aires git fetch
|
||||
sudo -u aires git diff --exit-code main origin/main
|
||||
sudo -u aires git diff --quiet --exit-code main origin/main || true
|
||||
# If we have changes (git diff returns 1), pull changes and run the update
|
||||
if [ $? -eq 1 ]; then
|
||||
echo "Updates found, running nixos-rebuild..."
|
||||
sudo -u aires git pull --recurse-submodules
|
||||
nh os switch
|
||||
else
|
||||
echo "No updates found. Exiting."
|
||||
fi
|
||||
'';
|
||||
};
|
||||
systemd.timers."nixos-update-timer" = {
|
||||
systemd.timers."nixos-upgrade-timer" = {
|
||||
wants = [ "network-online.target" ];
|
||||
after = [ "network-online.target" ];
|
||||
wantedBy = [ "timers.target" ];
|
||||
timerConfig = {
|
||||
OnCalendar = "daily";
|
||||
Persistent = "true";
|
||||
Unit = "nixos-update.service";
|
||||
Unit = "nixos-upgrade.service";
|
||||
};
|
||||
};
|
||||
})
|
||||
(lib.mkIf cfg.pushUpdates {
|
||||
# Automatically update Flake configuration for other hosts to use
|
||||
systemd.services."nixos-update-flake" = {
|
||||
systemd.services."nixos-upgrade-flake" = {
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
User = config.users.users.aires.name;
|
||||
|
@ -83,20 +86,21 @@ in
|
|||
set -eu
|
||||
cd ${config.secrets.nixConfigFolder}
|
||||
# Make sure we're up-to-date
|
||||
echo "Pulling the latest version..."
|
||||
git pull --recurse-submodules
|
||||
nix flake update --commit-lock-file
|
||||
git push
|
||||
'';
|
||||
};
|
||||
|
||||
systemd.timers."nixos-update-flake-timer" = {
|
||||
systemd.timers."nixos-upgrade-flake-timer" = {
|
||||
wants = [ "network-online.target" ];
|
||||
after = [ "network-online.target" ];
|
||||
wantedBy = [ "timers.target" ];
|
||||
timerConfig = {
|
||||
OnCalendar = "daily";
|
||||
Persistent = "true";
|
||||
Unit = "nixos-update-flake.service";
|
||||
Unit = "nixos-upgrade-flake.service";
|
||||
};
|
||||
};
|
||||
})
|
||||
|
|
Loading…
Reference in a new issue