Skynet/nixos
6
1
Fork 0
Code Issues 43 Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix: git is important enough that it should have its own folder

Browse source
This commit is contained in:
silver 2024-08-06 15:41:59 +01:00
parent 86e0c091fb
commit 98136e802b
Signed by: silver
GPG key ID: 54E2C71918E93B74
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
applications/gitlab.nix → applications/git/gitlab.nix
View file

@ -56,32 +56,32 @@ in {
# grep -r --exclude-dir={docker,containers,log,sys,nix,proc} gitlab / # grep -r --exclude-dir={docker,containers,log,sys,nix,proc} gitlab /
age.secrets.gitlab_pw = { age.secrets.gitlab_pw = {
file = ../secrets/gitlab/pw.age; file = ../../secrets/gitlab/pw.age;
owner = cfg.user; owner = cfg.user;
group = cfg.user; group = cfg.user;
}; };
age.secrets.gitlab_secrets_db = { age.secrets.gitlab_secrets_db = {
file = ../secrets/gitlab/secrets_db.age; file = ../../secrets/gitlab/secrets_db.age;
owner = cfg.user; owner = cfg.user;
group = cfg.user; group = cfg.user;
}; };
age.secrets.gitlab_secrets_secret = { age.secrets.gitlab_secrets_secret = {
file = ../secrets/gitlab/secrets_secret.age; file = ../../secrets/gitlab/secrets_secret.age;
owner = cfg.user; owner = cfg.user;
group = cfg.user; group = cfg.user;
}; };
age.secrets.gitlab_secrets_otp = { age.secrets.gitlab_secrets_otp = {
file = ../secrets/gitlab/secrets_otp.age; file = ../../secrets/gitlab/secrets_otp.age;
owner = cfg.user; owner = cfg.user;
group = cfg.user; group = cfg.user;
}; };
age.secrets.gitlab_secrets_jws = { age.secrets.gitlab_secrets_jws = {
file = ../secrets/gitlab/secrets_jws.age; file = ../../secrets/gitlab/secrets_jws.age;
owner = cfg.user; owner = cfg.user;
group = cfg.user; group = cfg.user;
}; };
age.secrets.gitlab_db_pw = { age.secrets.gitlab_db_pw = {
file = ../secrets/gitlab/db_pw.age; file = ../../secrets/gitlab/db_pw.age;
owner = cfg.user; owner = cfg.user;
group = cfg.user; group = cfg.user;
}; };

4
applications/gitlab_runner.nix → applications/git/gitlab_runner.nix
View file

@ -51,8 +51,8 @@ in {
pkgs.gitlab-runner pkgs.gitlab-runner
]; ];
age.secrets.runner_01_nix.file = ../secrets/gitlab/runners/runner01.age; age.secrets.runner_01_nix.file = ../../secrets/gitlab/runners/runner01.age;
age.secrets.runner_02_general.file = ../secrets/gitlab/runners/runner02.age; age.secrets.runner_02_general.file = ../../secrets/gitlab/runners/runner02.age;
boot.kernel.sysctl."net.ipv4.ip_forward" = true; # 1 boot.kernel.sysctl."net.ipv4.ip_forward" = true; # 1
virtualisation.docker.enable = true; virtualisation.docker.enable = true;

2
machines/glados.nix
View file

@ -26,7 +26,7 @@ Notes: Each user has roughly 20gb os storage
}; };
in { in {
imports = [ imports = [
../applications/gitlab.nix ../applications/git/gitlab.nix
]; ];
deployment = { deployment = {

2
machines/wheatly.nix
View file

@ -25,7 +25,7 @@ Notes:
}; };
in { in {
imports = [ imports = [
../applications/gitlab_runner.nix ../applications/git/gitlab_runner.nix
]; ];
deployment = { deployment = {