Commit af51c570 authored by Valentin Reis's avatar Valentin Reis

fix deployment

parent 5bce51cb
Pipeline #9475 passed with stages
in 10 minutes and 27 seconds
No preview for this file type
......@@ -22,7 +22,7 @@ let
keyFile = ./keys/id_buildfarm.secret;
user = "fre";
group = "users";
permissions = "600";
permissions = "666";
};
deployment.keys."gitlab.cfg" = {
......@@ -83,7 +83,6 @@ in {
gitlab-runner-2 = mkChameleonRunner "129.114.24.194";
gitlab-runner-3 = mkChameleonRunner "129.114.24.215";
gitlab-runner-4 = mkChameleonRunner "129.114.24.218";
#gitlab-runner-5 = mkChameleonRunner "129.114.24.212";
nix-store = { config, services, networking, ... }:
let ip = "129.114.24.212";
......@@ -93,6 +92,8 @@ in {
time.timeZone = "America/Chicago";
i18n.defaultLocale = "en_US.UTF-8";
require = argomodules;
environment.argo.known-hosts.enable = true;
environment.argo.provider-openspace.enable = true;
......@@ -109,7 +110,15 @@ in {
keyFile = ./keys/nix-cache-key.sec.secret;
user = "nix-serve";
group = "nogroup";
permissions = "600";
permissions = "666";
};
deployment.keys."id_buildfarm" = {
destDir = "/run";
keyFile = ./keys/id_buildfarm.secret;
user = "fre";
group = "users";
permissions = "666";
};
services.nix-serve = {
......@@ -161,9 +170,11 @@ in {
useSubstitutes = true;
smtpHost = "localhost";
extraConfig = ''
secret-key=/run/nix-cache-key.sec
store_uri = file:///var/lib/hydra/cache?secret-key=/run/nix-cache-key.sec
using_frontend_proxy 1
'';
buildMachinesFiles = [ "/etc/nix/machines" ];
};
systemd.services.hydra-manual-setup = {
......@@ -190,6 +201,26 @@ in {
'';
};
nix = {
useSandbox = true;
extraOptions = "auto-optimise-store = true";
trustedUsers = [ "hydra" "fre" "root" ];
binaryCaches = [ "https://cache.nixos.org" ];
buildMachines = [{
hostName = "localhost";
systems = [ "x86_64-linux" "i686-linux" ];
speedFactor = 1;
maxJobs = 6;
supportedFeatures = [ ];
sshKey = "/run/id_buildfarm";
sshUser = "fre";
}];
nrBuildUsers = 30;
distributedBuilds = true;
};
environment.systemPackages = [ pkgs.unar pkgs.wget pkgs.git pkgs.vim ];
};
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment