Commit e0b763a5 authored by Valentin Reis's avatar Valentin Reis

release.nix fix for hydra.

parent 7467c2e5
No preview for this file type
......@@ -25,6 +25,8 @@ in
permissions = "600";
};
time.timeZone = "America/Chicago";
require=argomodules;
environment.argo.known-hosts.enable=true;
environment.argo.provider-tacc.enable=true;
......@@ -93,7 +95,7 @@ in
locations."/cache".root="/var/lib/hydra";
locations."/cache".extraConfig="autoindex on;";
locations."/"= {
proxyPass="http://localhost:6080/";
proxyPass="http://127.0.0.1:6080/";
extraConfig = ''
proxy_redirect http://127.0.0.1:6080 https://argo.freux.fr;
proxy_set_header Host $host;
......@@ -104,7 +106,7 @@ in
'';
};
locations."/hydra"= {
proxyPass="http://localhost:8080/";
proxyPass="http://127.0.0.1:8080/";
extraConfig = ''
proxy_redirect http://127.0.0.1:8080 https://argo.freux.fr/hydra;
proxy_set_header Host $host;
......@@ -221,6 +223,8 @@ in
deployment.targetEnv = "none";
deployment.targetHost = "140.221.10.9";
time.timeZone = "America/Chicago";
deployment.keys."id_buildfarm" = {
destDir = "/run";
keyFile = ./id_buildfarm.secret;
......
{
hostPkgs ? import <nixpkgs> {},
system ? builtins.currentSystem,
pkgs ? import ../pin.nix { inherit hostPkgs; jsonpath=../nixpkgs-18.03.json; depset = {inherit system;}; },
kapack ? import ../pin.nix { hostPkgs = pkgs ; jsonpath=../kapack.json; depset = {hostPkgs=pkgs;};},
hostPkgs ? import <nixpkgs> {},
system ? builtins.currentSystem,
pkgs ? import ../pin.nix { inherit hostPkgs; jsonpath=../nixpkgs-18.03.json; depset = {inherit system;}; },
kapack ? import ../pin.nix { hostPkgs = pkgs ; jsonpath=../kapack.json; depset = {hostPkgs=pkgs;};},
supportedSystems ? [ "x86_64-linux" "i686-linux" ]
}:
let
......@@ -90,29 +90,6 @@ let
cc = icc;
});
};
argopkgs = pkgs.releaseTools.channel {
name = "argopkgs";
src = ../.;
constituents = [ ];
};
argobase = pkgs.releaseTools.aggregate {
name = "tested";
constituents = [ nodelevel.libnrm ];
};
nixpkgs-argobase = (pkgs.releaseTools.channel {
name = "nixpkgs-argobase-channel";
src = "${pkgs}";
constituents = [ argobase ]; });
config-argobase = pkgs.releaseTools.channel {
name = "config-argobase-channel";
src = pkgs.lib.cleanSource ./.;
constituents = [ argobase ];
};
};
in argopkgs
import ./pkgs/default.nix
let argopkgs = import ./pkgs/default.nix {};
in {
inherit (argopkgs) nodelevel;
inherit (argopkgs.applications) raw;
}
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