Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions .github/workflows/build-hosts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,25 +63,35 @@ jobs:
attic-push-token: ${{ secrets.ATTIC_PUSH_TOKEN }}
github-token: ${{ secrets.GITHUB_TOKEN }}

- name: Tailscale
if: ${{ startsWith(matrix.host.os, 'macos') }}
uses: tailscale/github-action@v4
with:
oauth-client-id: ${{ secrets.TS_OAUTH_CLIENT_ID }}
oauth-secret: ${{ secrets.TS_OAUTH_SECRET }}
tags: tag:ci
ping: tl-mm4

- name: Create aarch64-linux builder
if: ${{ startsWith(matrix.host.os, 'macos') }}
env:
BUILDER_PK: ${{secrets.AARCH64_BUILDER_PK}}
BUILDER_HOST: ${{secrets.AARCH64_BUILDER_HOSTNAME}}
BUILDER_HOST: tl-mm4
BUILDER_PORT: 3022
run: |
echo "$BUILDER_PK" | sudo tee /etc/nix/builder_ed25519 > /dev/null
sudo chmod 600 /etc/nix/builder_ed25519

sudo mkdir -p /var/root/.ssh
ssh-keyscan -H "$BUILDER_HOST" | sudo tee -a /var/root/.ssh/known_hosts > /dev/null
ssh-keyscan -H -p "$BUILDER_PORT" "$BUILDER_HOST" | sudo tee -a /var/root/.ssh/known_hosts > /dev/null

mkdir -p /etc/ssh/
echo "Host linux-builder" | sudo tee -a /etc/ssh/ssh_config
echo " Hostname $BUILDER_HOST" | sudo tee -a /etc/ssh/ssh_config > /dev/null
echo " Port 22" | sudo tee -a /etc/ssh/ssh_config
echo " HostKeyAlias $BUILDER_HOST" | sudo tee -a /etc/ssh/ssh_config > /dev/null
echo " IdentityFile /etc/nix/builder_ed25519" | sudo tee -a /etc/ssh/ssh_config
echo " User gha-builder" | sudo tee -a /etc/ssh/ssh_config
echo "Host linux-builder" | sudo tee -a /etc/ssh/ssh_config
echo " Hostname $BUILDER_HOST" | sudo tee -a /etc/ssh/ssh_config > /dev/null
echo " Port $BUILDER_PORT" | sudo tee -a /etc/ssh/ssh_config
echo " HostKeyAlias [$BUILDER_HOST]:$BUILDER_PORT" | sudo tee -a /etc/ssh/ssh_config > /dev/null
echo " IdentityFile /etc/nix/builder_ed25519" | sudo tee -a /etc/ssh/ssh_config
echo " User gha-builder" | sudo tee -a /etc/ssh/ssh_config

echo "ssh://linux-builder aarch64-linux /etc/nix/builder_ed25519 4 40 nixos-test,benchmark,kvm,big-parallel - -" | sudo tee /etc/nix/machines

Expand Down
1 change: 1 addition & 0 deletions darwin/hosts/tl-mm4/aarch-builder.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
}
profiles.common.remote-builder
profiles.nixos.faster-linux
profiles.common.github-actions-builder
];
};
in {
Expand Down
101 changes: 40 additions & 61 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -188,11 +188,6 @@
nixpkgs.follows = "nixpkgs";
};
};

zsh-patina = {
url = "github:michel-kraemer/zsh-patina";
inputs.nixpkgs.follows = "nixpkgs";
};
};

nixConfig = {
Expand Down
2 changes: 1 addition & 1 deletion nixos/hosts/aarch64/oracle/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
++ suites.minecraft-server
++ [
profiles.common.remote-builder
profiles.common.github-actions-builder

./hardware-configuration.nix
./minecraft-servers
./github-actions-builder.nix
];

systemd.services.NetworkManager-wait-online.enable = false;
Expand Down
56 changes: 32 additions & 24 deletions nixos/hosts/x86_64/nas/media-server/arr-oauth.nix
Original file line number Diff line number Diff line change
Expand Up @@ -74,30 +74,38 @@ in {
};

nixflix = {
radarr.settings = {
auth = {
required = lib.mkForce "Enabled";
method = lib.mkForce "External";
};
};
sonarr.settings = {
auth = {
required = lib.mkForce "Enabled";
method = lib.mkForce "External";
};
};
sonarr-anime.settings = {
auth = {
required = lib.mkForce "Enabled";
method = lib.mkForce "External";
};
};
prowlarr.settings = {
auth = {
required = lib.mkForce "Enabled";
method = lib.mkForce "External";
};
};
radarr.config.hostConfig.authenticationMethod = "external";

sonarr.config.hostConfig.authenticationMethod = "external";

sonarr-anime.config.hostConfig.authenticationMethod = "external";

prowlarr.config.hostConfig.authenticationMethod = "external";

# radarr.settings = {
# auth = {
# required = lib.mkForce "Enabled";
# method = lib.mkForce "External";
# };
# };
# sonarr.settings = {
# auth = {
# required = lib.mkForce "Enabled";
# method = lib.mkForce "External";
# };
# };
# sonarr-anime.settings = {
# auth = {
# required = lib.mkForce "Enabled";
# method = lib.mkForce "External";
# };
# };
# prowlarr.settings = {
# auth = {
# required = lib.mkForce "Enabled";
# method = lib.mkForce "External";
# };
# };

torrentClients.qbittorrent.serverConfig.Preferences.WebUI = {
LocalHostAuth = lib.mkForce false;
Expand Down
Loading
Loading