Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'lass/master'

Browse Source
This commit is contained in:
makefu 2017-05-16 14:30:26 +02:00
commit 05fd51d991
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
3 changed files with 22 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
krebs/5pkgs/weechat/default.nix
View File

@ -21,12 +21,12 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.7.1"; version = "1.8";
name = "weechat-${version}"; name = "weechat-${version}";
src = fetchurl { src = fetchurl {
url = "http://weechat.org/files/src/weechat-${version}.tar.bz2"; url = "http://weechat.org/files/src/weechat-${version}.tar.bz2";
sha256 = "1020m1lsm8lg9n0dlxgp2wbn9b0r11g8r0namnzi2x6gvxn7iyf0"; sha256 = "10km0437lg9ms6f16h20s89l2w9f9g597rykybxb16s95ql48z08";
}; };
outputs = [ "out" "doc" ]; outputs = [ "out" "doc" ];

53
lass/2configs/buildbot-standalone.nix
View File

@ -92,7 +92,6 @@ in {
nixshell = [ nixshell = [
"nix-shell", "nix-shell",
"-I", "stockholm=.", "-I", "stockholm=.",
"-I", "nixpkgs=/var/src/nixpkgs",
"-p" "-p"
] + deps + [ "--run" ] ] + deps + [ "--run" ]
@ -107,11 +106,9 @@ in {
for i in [ "test-minimal-deploy", "test-all-krebs-modules", "wolf", "test-centos7" ]: for i in [ "test-minimal-deploy", "test-all-krebs-modules", "wolf", "test-centos7" ]:
addShell(f,name="build-{}".format(i),env=env_shared, addShell(f,name="build-{}".format(i),env=env_shared,
command=nixshell + \ command=nixshell + \
["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \ ["mkdir -p $HOME/$LOGNAME && touch $HOME/$LOGNAME/.populate; \
make \ make NIX_PATH=$HOME/$LOGNAME test method=build \
test \ target=buildbotworker@${config.krebs.build.host.name}$HOME/$LOGNAME \
target=$LOGNAME@${config.krebs.build.host.name}/tmp/testbuild/$LOGNAME \
method=build \
system={}".format(i) system={}".format(i)
] ]
) )
@ -119,11 +116,9 @@ in {
for i in [ "mors", "uriel", "shodan", "helios", "icarus", "cloudkrebs", "echelon", "dishfire", "prism" ]: for i in [ "mors", "uriel", "shodan", "helios", "icarus", "cloudkrebs", "echelon", "dishfire", "prism" ]:
addShell(f,name="build-{}".format(i),env=env_lass, addShell(f,name="build-{}".format(i),env=env_lass,
command=nixshell + \ command=nixshell + \
["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \ ["mkdir -p $HOME/$LOGNAME && touch $HOME/$LOGNAME/.populate; \
make \ make NIX_PATH=$HOME/$LOGNAME test method=build \
test \ target=buildbotworker@${config.krebs.build.host.name}$HOME/$LOGNAME \
target=$LOGNAME@${config.krebs.build.host.name}/tmp/testbuild/$LOGNAME \
method=build \
system={}".format(i) system={}".format(i)
] ]
) )
@ -131,11 +126,9 @@ in {
for i in [ "x", "wry", "vbob", "wbob", "shoney" ]: for i in [ "x", "wry", "vbob", "wbob", "shoney" ]:
addShell(f,name="build-{}".format(i),env=env_makefu, addShell(f,name="build-{}".format(i),env=env_makefu,
command=nixshell + \ command=nixshell + \
["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \ ["mkdir -p $HOME/$LOGNAME && touch $HOME/$LOGNAME/.populate; \
make \ make NIX_PATH=$HOME/$LOGNAME test method=build \
test \ target=buildbotworker@${config.krebs.build.host.name}$HOME/$LOGNAME \
target=$LOGNAME@${config.krebs.build.host.name}/tmp/testbuild/$LOGNAME \
method=build \
system={}".format(i) system={}".format(i)
] ]
) )
@ -143,11 +136,9 @@ in {
for i in [ "hiawatha", "onondaga" ]: for i in [ "hiawatha", "onondaga" ]:
addShell(f,name="build-{}".format(i),env=env_nin, addShell(f,name="build-{}".format(i),env=env_nin,
command=nixshell + \ command=nixshell + \
["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \ ["mkdir -p $HOME/$LOGNAME && touch $HOME/$LOGNAME/.populate; \
make \ make NIX_PATH=$HOME/$LOGNAME test method=build \
test \ target=buildbotworker@${config.krebs.build.host.name}$HOME/$LOGNAME \
target=$LOGNAME@${config.krebs.build.host.name}/tmp/testbuild/$LOGNAME \
method=build \
system={}".format(i) system={}".format(i)
] ]
) )
@ -211,7 +202,7 @@ in {
]: ]:
addShell(f,name="build-{}".format(i),env=env_lass, addShell(f,name="build-{}".format(i),env=env_lass,
command=nixshell + \ command=nixshell + \
["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \ ["mkdir -p $HOME/$LOGNAME && touch $HOME/$LOGNAME/.populate; \
make system=prism pkgs.{}".format(i)]) make system=prism pkgs.{}".format(i)])
bu.append(util.BuilderConfig(name="build-pkgs", bu.append(util.BuilderConfig(name="build-pkgs",
@ -255,7 +246,7 @@ in {
options.lass.build-ssh-privkey = mkOption { options.lass.build-ssh-privkey = mkOption {
type = types.secret-file; type = types.secret-file;
default = { default = {
path = "${config.users.users.buildbotworker.home}/ssh.privkey"; path = "${config.users.users.buildbotworker.home}/.ssh/id_rsa";
owner = { inherit (config.users.users.buildbotworker ) name uid;}; owner = { inherit (config.users.users.buildbotworker ) name uid;};
source-path = toString <secrets> + "/build.ssh.key"; source-path = toString <secrets> + "/build.ssh.key";
}; };
@ -263,16 +254,10 @@ in {
config.krebs.secret.files = { config.krebs.secret.files = {
build-ssh-privkey = config.lass.build-ssh-privkey; build-ssh-privkey = config.lass.build-ssh-privkey;
}; };
config.users.users = { config.users.users.buildbotworker = {
build = { useDefaultShell = true;
name = "build"; openssh.authorizedKeys.keys = [
uid = genid "build"; "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiV0Xn60aVLHC/jGJknlrcxSvKd/MVeh2tjBpxSBT3II9XQGZhID2Gdh84eAtoWyxGVFQx96zCHSuc7tfE2YP2LhXnwaxHTeDc8nlMsdww53lRkxihZIEV7QHc/3LRcFMkFyxdszeUfhWz8PbJGL2GYT+s6CqoPwwa68zF33U1wrMOAPsf/NdpSN4alsqmjFc2STBjnOd9dXNQn1VEJQqGLG3kR3WkCuwMcTLS5eu0KLwG4i89Twjy+TGp2QsF5K6pNE+ZepwaycRgfYzGcPTn5d6YQXBgcKgHMoSJsK8wqpr0+eFPCDiEA3HDnf76E4mX4t6/9QkMXCLmvs0IO/WP"
home = "/home/build"; ];
useDefaultShell = true;
createHome = true;
openssh.authorizedKeys.keys = [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiV0Xn60aVLHC/jGJknlrcxSvKd/MVeh2tjBpxSBT3II9XQGZhID2Gdh84eAtoWyxGVFQx96zCHSuc7tfE2YP2LhXnwaxHTeDc8nlMsdww53lRkxihZIEV7QHc/3LRcFMkFyxdszeUfhWz8PbJGL2GYT+s6CqoPwwa68zF33U1wrMOAPsf/NdpSN4alsqmjFc2STBjnOd9dXNQn1VEJQqGLG3kR3WkCuwMcTLS5eu0KLwG4i89Twjy+TGp2QsF5K6pNE+ZepwaycRgfYzGcPTn5d6YQXBgcKgHMoSJsK8wqpr0+eFPCDiEA3HDnf76E4mX4t6/9QkMXCLmvs0IO/WP lass@mors"
];
};
}; };
} }

2
lass/3modules/news.nix
View File

@ -11,7 +11,7 @@ let
}; };
api = { api = {
enable = mkEnableOption "umts"; enable = mkEnableOption "news";
feeds = mkOption { feeds = mkOption {
type = types.listOf (types.submodule { options = { type = types.listOf (types.submodule { options = {
nick = mkOption { nick = mkOption {