diff --git a/CHANGELOG.md b/CHANGELOG.md index 95ad52e..de5726c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ Added: - Prowlarr - Readarr - Lidarr +- UID/GID's are now static, this should make future backups and migrations more predictable. Migration: - Due to how UID/GID's are handled in this new version, certain services diff --git a/nixarr/nixarr-command/default.nix b/nixarr/nixarr-command/default.nix index 650d708..8108407 100644 --- a/nixarr/nixarr-command/default.nix +++ b/nixarr/nixarr-command/default.nix @@ -172,13 +172,13 @@ with lib; let echo "Backing up /etc/passwd and /etc/group..." - mkdir "${nixarr.stateDir}/migration-backup" + mkdir -p "${nixarr.stateDir}/migration-backup" cp /etc/passwd "${nixarr.stateDir}/migration-backup/passwd.bak" cp /etc/group "${nixarr.stateDir}/migration-backup/group.bak" echo "Wiping all nixarr users and groups from /etc/passwd and /etc/group..." - sed -iE '/^(audiobookshelf|autobrr|bazarr|cross-seed|jellyfin|jellyseerr|lidarr|plex|prowlarr|radarr|readarr|recyclarr|sabnzbd|sonarr|streamer|torrenter|transmission|usenet)/d' /etc/passwd + sed -iE '/^(audiobookshelf|autobrr|bazarr|cross-seed|jellyfin|jellyseerr|lidarr|plex|prowlarr|radarr|readarr|recyclarr|sabnzbd|sonarr|streamer|torrenter|transmission|usenet)/d' /etc/passwd sed -iE '/^(autobrr|cross-seed|jellyseerr|media|prowlarr|recyclarr|sabnzbd|streamer|torrenter|transmission|usenet)/d' /etc/group echo "" diff --git a/nixarr/plex/default.nix b/nixarr/plex/default.nix index 6fbbecd..c331a89 100644 --- a/nixarr/plex/default.nix +++ b/nixarr/plex/default.nix @@ -142,7 +142,7 @@ in { groups.${globals.plex.group}.gid = globals.gids.${globals.plex.group}; users.${globals.plex.user} = { isSystemUser = true; - group = group; + group = globals.plex.group; uid = globals.uids.${globals.plex.user}; }; }; diff --git a/nixarr/sabnzbd/default.nix b/nixarr/sabnzbd/default.nix index ee85606..3a7e635 100644 --- a/nixarr/sabnzbd/default.nix +++ b/nixarr/sabnzbd/default.nix @@ -138,7 +138,7 @@ in { fi chmod 600 ${ini-file-target} - chown usenet:media ${ini-file-target} + chown ${globals.sabnzbd.user}:${globals.sabnzbd.group} ${ini-file-target} ''; }; @@ -189,7 +189,7 @@ in { groups.${globals.sabnzbd.group}.gid = globals.gids.${globals.sabnzbd.group}; users.${globals.sabnzbd.user} = { isSystemUser = true; - group = group; + group = globals.sabnzbd.group; uid = globals.uids.${globals.sabnzbd.user}; }; }; diff --git a/util/globals/default.nix b/util/globals/default.nix index a7ec655..a0291b9 100644 --- a/util/globals/default.nix +++ b/util/globals/default.nix @@ -25,7 +25,7 @@ in { bazarr = 232; lidarr = 306; prowlarr = 293; - jellyseerr = 250; + jellyseerr = 262; sonarr = 274; radarr = 275; readarr = 250;