l 1 prism: remove obsolete nin stuff
This commit is contained in:
parent
712b05eb47
commit
fc627d0b99
@ -227,6 +227,7 @@ in {
|
||||
};
|
||||
}
|
||||
{
|
||||
# Nin stuff
|
||||
users.users.nin = {
|
||||
uid = genid "nin";
|
||||
inherit (config.krebs.users.nin) home;
|
||||
@ -240,18 +241,6 @@ in {
|
||||
"libvirtd"
|
||||
];
|
||||
};
|
||||
krebs.git.rules = [
|
||||
{
|
||||
user = [ config.krebs.users.nin ];
|
||||
repo = [ config.krebs.git.repos.stockholm ];
|
||||
perm = with git; push "refs/heads/nin" [ fast-forward non-fast-forward create delete merge ];
|
||||
}
|
||||
];
|
||||
krebs.repo-sync.repos.stockholm.nin = {
|
||||
origin.url = "http://cgit.prism/stockholm";
|
||||
origin.ref = "heads/nin";
|
||||
mirror.url = "git@${config.networking.hostName}:stockholm";
|
||||
};
|
||||
krebs.iptables.tables.nat.PREROUTING.rules = [
|
||||
{ v6 = false; precedence = 1000; predicate = "-d 213.239.205.240 -p tcp --dport 1337"; target = "DNAT --to-destination 192.168.122.24:22"; }
|
||||
];
|
||||
|
@ -58,6 +58,11 @@ in {
|
||||
"NIX_REMOTE": "daemon",
|
||||
"dummy_secrets": "true",
|
||||
}
|
||||
env_nin = {
|
||||
"LOGNAME": "nin",
|
||||
"NIX_REMOTE": "daemon",
|
||||
"dummy_secrets": "true",
|
||||
}
|
||||
env_shared = {
|
||||
"LOGNAME": "shared",
|
||||
"NIX_REMOTE": "daemon",
|
||||
@ -126,6 +131,18 @@ in {
|
||||
]
|
||||
)
|
||||
|
||||
for i in [ "hiawatha", "onondaga" ]:
|
||||
addShell(f,name="build-{}".format(i),env=env_nin,
|
||||
command=nixshell + \
|
||||
["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \
|
||||
make \
|
||||
test \
|
||||
target=$LOGNAME@${config.krebs.build.host.name}/tmp/testbuild/$LOGNAME \
|
||||
method=build \
|
||||
system={}".format(i)
|
||||
]
|
||||
)
|
||||
|
||||
bu.append(
|
||||
util.BuilderConfig(
|
||||
name="build-hosts",
|
||||
|
Loading…
Reference in New Issue
Block a user