Commit 2d21b18e authored by Valentin Reis's avatar Valentin Reis

ci fixes.

parent b615ad17
No preview for this file type
...@@ -19,6 +19,8 @@ in ...@@ -19,6 +19,8 @@ in
environment.argo.provider-tacc.enable=true; environment.argo.provider-tacc.enable=true;
environment.argo.root-access.enable=true; environment.argo.root-access.enable=true;
environment.variables.TERM = "xterm";
imports = [ "${hydraSrc}/hydra-module.nix" ]; imports = [ "${hydraSrc}/hydra-module.nix" ];
networking = { networking = {
firewall = { firewall = {
...@@ -43,7 +45,7 @@ in ...@@ -43,7 +45,7 @@ in
source = keys/id_buildfarm; source = keys/id_buildfarm;
uid = config.users.users.hydra-queue-runner.uid; uid = config.users.users.hydra-queue-runner.uid;
gid = config.users.groups.hydra.gid; gid = config.users.groups.hydra.gid;
mode = "0600"; mode = "0660";
}; };
nix = { nix = {
...@@ -78,14 +80,27 @@ in ...@@ -78,14 +80,27 @@ in
dataDir = "/var/db/postgresql-${config.services.postgresql.package.psqlSchema}"; dataDir = "/var/db/postgresql-${config.services.postgresql.package.psqlSchema}";
}; };
systemd.services.hydra-manual-setup = { systemd.services.hydra-manual-setup = let
hydraEnv =
{ HYDRA_DBI = config.services.hydra.dbi;
HYDRA_CONFIG = "/var/lib/hydra/hydra.conf";
HYDRA_DATA = "/var/lib/hydra";
};
in {
description = "Create Admin User for Hydra"; description = "Create Admin User for Hydra";
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true; serviceConfig.RemainAfterExit = true;
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
requires = [ "hydra-init.service" ]; requires = [ "hydra-init.service" ];
after = [ "hydra-init.service" ]; after = [ "hydra-init.service" ];
environment = config.systemd.services.hydra-init.environment; environment = { NIX_REMOTE = "daemon";
SSL_CERT_FILE = "/etc/ssl/certs/ca-certificates.crt"; # Remove in 16.03
PGPASSFILE = "/var/lib/hydra/pgpass";
NIX_REMOTE_SYSTEMS = pkgs.lib.concatStringsSep ":" config.services.hydra.buildMachinesFiles;
} // pkgs.lib.optionalAttrs (config.services.hydra.smtpHost != null) {
EMAIL_SENDER_TRANSPORT = "SMTP";
EMAIL_SENDER_TRANSPORT_host = config.services.hydrasmtpHost;
} // hydraEnv // config.services.hydra.extraEnv;
script = '' script = ''
if [ ! -e ~hydra/.setup-is-complete ]; then if [ ! -e ~hydra/.setup-is-complete ]; then
# create admin user # create admin user
...@@ -115,8 +130,10 @@ in ...@@ -115,8 +130,10 @@ in
environment.argo.provider-tacc.enable=true; environment.argo.provider-tacc.enable=true;
environment.argo.root-access.enable=true; environment.argo.root-access.enable=true;
environment.variables.TERM = "xterm";
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
nix.useChroot = true; nix.useSandbox = true;
nix.nrBuildUsers = 30; nix.nrBuildUsers = 30;
services.ntp.enable = false; services.ntp.enable = false;
services.openssh.allowSFTP = false; services.openssh.allowSFTP = false;
......
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