Merge pull request 'test' (#2) from test into main
All checks were successful
build / test (push) Successful in 1m13s

Reviewed-on: #2
This commit is contained in:
Mic92 2023-07-13 09:37:56 +00:00
commit 5d496726ff
7 changed files with 38 additions and 29 deletions

View File

@ -6,4 +6,4 @@ jobs:
runs-on: nix runs-on: nix
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- run: nix flake check -vL - run: nix flake check -L

View File

@ -4,8 +4,8 @@ This repository contains nixos modules and terraform code that powers clan.lol.
The website and git hosting is currently on [hetzner](https://www.hetzner.com/). The website and git hosting is currently on [hetzner](https://www.hetzner.com/).
## Servers ## Servers
- web01: - web01:
- soon to be replaced by baremetal hardware
- Instance type: CPX42 - Instance type: CPX42
- CPU: 8 vCPUs on AMD - CPU: 8 vCPUs on AMD
- RAM: 16GB - RAM: 16GB

View File

@ -37,7 +37,12 @@
outputs = inputs@{ flake-parts, ... }: outputs = inputs@{ flake-parts, ... }:
flake-parts.lib.mkFlake { inherit inputs; } ({ lib, ... }: { flake-parts.lib.mkFlake { inherit inputs; } ({ lib, ... }: {
systems = lib.systems.flakeExposed; systems = [
"x86_64-linux"
"aarch64-linux"
"aarch64-darwin"
"x86_64-darwin"
];
imports = [ imports = [
inputs.treefmt-nix.flakeModule inputs.treefmt-nix.flakeModule
./targets/flake-module.nix ./targets/flake-module.nix
@ -49,11 +54,8 @@
programs.terraform.enable = true; programs.terraform.enable = true;
programs.nixpkgs-fmt.enable = true; programs.nixpkgs-fmt.enable = true;
}; };
packages.actions-runner = pkgs.callPackage ./pkgs/actions-runner.nix { packages = {
inherit inputs; default = pkgs.mkShell {
};
packages.gitea = pkgs.callPackage ./pkgs/gitea {};
packages.default = pkgs.mkShell {
packages = [ packages = [
pkgs.bashInteractive pkgs.bashInteractive
pkgs.sops pkgs.sops
@ -67,6 +69,12 @@
])) ]))
]; ];
}; };
} // lib.optionalAttrs (!pkgs.stdenv.isDarwin) {
gitea = pkgs.callPackage ./pkgs/gitea { };
actions-runner = pkgs.callPackage ./pkgs/actions-runner.nix {
inherit inputs;
};
};
}; };
}); });
} }

View File

@ -2,7 +2,8 @@
let let
inherit (self.packages.${pkgs.hostPlatform.system}) actions-runner; inherit (self.packages.${pkgs.hostPlatform.system}) actions-runner;
in { in
{
systemd.services.gitea-actions-runner-nix-image = { systemd.services.gitea-actions-runner-nix-image = {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
script = '' script = ''