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 2018-09-26 11:11:06 +02:00
commit d7ecf1abdc
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
19 changed files with 95 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
krebs/2configs/reaktor-retiolum.nix
View File

@ -4,7 +4,7 @@ with import <stockholm/lib>;
{
krebs.Reaktor.retiolum = {
nickname = "Reaktor|lass";
channels = [ "#xxx" ];
channels = [ "#noise" "#xxx" ];
extraEnviron = {
REAKTOR_HOST = "irc.r";
};

1
krebs/3modules/Reaktor.nix
View File

@ -122,6 +122,7 @@ let
wantedBy = [ "multi-user.target" ];
environment = {
GIT_SSL_CAINFO = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
PYTHONPATH = "${pkgs.Reaktor}/lib/python3.6/site-packages";
REAKTOR_NICKNAME = botcfg.nickname;
REAKTOR_DEBUG = (if botcfg.debug then "True" else "False");
REAKTOR_CHANNELS = lib.concatStringsSep "," botcfg.channels;

2
krebs/3modules/announce-activation.nix
View File

@ -53,7 +53,7 @@ in {
};
};
config = mkIf cfg.enable {
system.activationScripts.announce-activation = ''
system.activationScripts.announce-activation = stringAfter [ "etc" ] ''
${announce-activation}
'';
};

1
krebs/3modules/buildbot/master.nix
View File

@ -82,6 +82,7 @@ let
irc = words.IRC("${cfg.irc.server}", "${cfg.irc.nick}",
channels=${builtins.toJSON cfg.irc.channels},
notify_events={
'started': 1,
'success': 1,
'failure': 1,
'exception': 1,

2
krebs/3modules/buildbot/slave.nix
View File

@ -160,8 +160,6 @@ let
# TODO: maybe also prepare buildbot.tac?
ExecStartPre = pkgs.writeDash "buildbot-master-init" ''
set -efux
#remove garbage from old versions
rm -rf ${workdir}
mkdir -p ${workdir}/info
cp ${buildbot-slave-init} ${workdir}/buildbot.tac
echo ${contact} > ${workdir}/info/admin

6
krebs/3modules/default.nix
View File

@ -183,6 +183,11 @@ let
to = concatMapStringsSep "," (getAttr "mail") (toList to);
};
in mapAttrsToList format (with config.krebs.users; let
brain-ml = [
lass
makefu
tv
];
eloop-ml = spam-ml ++ [ ciko ];
spam-ml = [
lass
@ -192,6 +197,7 @@ let
ciko.mail = "ciko@slash16.net";
in {
"anmeldung@eloop.org" = eloop-ml;
"brain@krebsco.de" = brain-ml;
"cfp@eloop.org" = eloop-ml;
"kontakt@eloop.org" = eloop-ml;
"root@eloop.org" = eloop-ml;

2
krebs/3modules/setuid.nix
View File

@ -58,7 +58,7 @@ let
};
};
config.activate = let
src = pkgs.execve config.name {
src = pkgs.exec config.name {
inherit (config) envp filename;
};
dst = "${wrapperDir}/${config.name}";

2
krebs/5pkgs/simple/Reaktor/plugins.nix
View File

@ -120,7 +120,7 @@ rec {
url-title = (buildSimpleReaktorPlugin "url-title" {
pattern = "^.*(?P<args>http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+).*$$";
path = with pkgs; [ curl perl ];
script = pkgs.writePython3 "url-title" [ "beautifulsoup4" "lxml" ] ''
script = pkgs.writePython3 "url-title" { deps = with pkgs.python3Packages; [ beautifulsoup4 lxml ]; } ''
import cgi
import sys
import urllib.request

12
krebs/5pkgs/simple/Reaktor/scripts/sed-plugin.py
View File

@ -8,9 +8,19 @@ import shelve
from os import environ
from os.path import join
from sys import argv
from time import sleep
import re
d = shelve.open(join(environ['state_dir'], 'sed-plugin.shelve'), writeback=True)
# try to open the shelve file until it succeeds
while True:
try:
d = shelve.open(
join(environ['state_dir'], 'sed-plugin.shelve'),
writeback=True
)
break
except: # noqa: E722
sleep(0.2)
usr = environ['_from']

4
krebs/5pkgs/simple/buildbot-classic/default.nix
View File

@ -2,7 +2,7 @@
python2Packages.buildPythonApplication rec {
name = "buildbot-classic-${version}";
version = "0.8.17";
version = "0.8.18";
namePrefix = "";
patches = [];
@ -10,7 +10,7 @@ python2Packages.buildPythonApplication rec {
owner = "krebs";
repo = "buildbot-classic";
rev = version;
sha256 = "0yn0n37rs2bhz9q0simnvyzz5sfrpqhbdm6pdj6qk7sab4y6xbq8";
sha256 = "0b4y3n9zd2gdy8xwk1vpvs4n9fbg72vi8mx4ydgijwngcmdqkjmq";
};
postUnpack = "sourceRoot=\${sourceRoot}/master";

2
krebs/5pkgs/simple/krebspaste/default.nix
View File

@ -1,6 +1,6 @@
{ writeDashBin, bepasty-client-cli }:
# TODO use `execve` instead?
# TODO use `pkgs.exec` instead?
writeDashBin "krebspaste" ''
exec ${bepasty-client-cli}/bin/bepasty-cli -L 1m --url http://paste.r "$@" | sed '$ s/$/\/+inline/g'
''

2
krebs/krops.nix
View File

@ -2,7 +2,7 @@
krops = builtins.fetchGit {
url = https://cgit.krebsco.de/krops/;
rev = "4e466eaf05861b47365c5ef46a31a188b70f3615";
rev = "c46166d407c7d246112f13346621a3fbdb25889e";
};
lib = import "${krops}/lib";

6
krebs/nixpkgs.json
View File

@ -1,7 +1,7 @@
{
"url": "https://github.com/NixOS/nixpkgs-channels",
"rev": "a37638d46706610d12c9747614fd1b8f8d35ad48",
"date": "2018-08-30T21:03:26+02:00",
"sha256": "0rsdkk4z7pkqr2mw0pq7i6fkqs7gbi5kral3c8smm9bw104sn8v7",
"rev": "d16a7abceb72aac85e0deb8c45fbcb7127baf628",
"date": "2018-09-20T18:31:51-05:00",
"sha256": "0byf6rlwwy70v2sdfmv7mnwd0kvxmlq0pi8ijghg0mcfhcqibgh7",
"fetchSubmodules": true
}

1
lass/1systems/icarus/config.nix
View File

@ -16,6 +16,7 @@
<stockholm/lass/2configs/bitcoin.nix>
<stockholm/lass/2configs/backup.nix>
<stockholm/lass/2configs/wine.nix>
<stockholm/lass/2configs/blue-host.nix>
];
krebs.build.host = config.krebs.hosts.icarus;

81
lass/2configs/radio.nix
View File

@ -131,6 +131,30 @@ in {
};
};
systemd.services.radio-recent = let
recentlyPlayed = pkgs.writeDash "recentlyPlayed" ''
LIMIT=1000 #how many tracks to keep in the history
HISTORY_FILE=/tmp/played
while :; do
${pkgs.mpc_cli}/bin/mpc idle player > /dev/null
${pkgs.mpc_cli}/bin/mpc current -f %file%
done | while read track; do
echo "$(date -Is)" "$track" | tee -a "$HISTORY_FILE"
echo "$(tail -$LIMIT "$HISTORY_FILE")" > "$HISTORY_FILE"
done
'';
in {
description = "radio recently played";
after = [ "mpd.service" "network.target" ];
wantedBy = [ "multi-user.target" ];
restartIfChanged = true;
serviceConfig = {
ExecStart = recentlyPlayed;
};
};
krebs.Reaktor.playlist = {
nickname = "the_playlist|r";
channels = [
@ -157,27 +181,40 @@ in {
})
];
};
services.nginx.virtualHosts."lassul.us".locations."/the_playlist".extraConfig = let
html = pkgs.writeText "index.html" ''
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>lassulus playlist</title>
</head>
<body>
<div style="display:inline-block;margin:0px;padding:0px;overflow:hidden">
<iframe src="https://kiwiirc.com/client/irc.freenode.org/?nick=kiwi_test|?&theme=cli#the_playlist" frameborder="0" style="overflow:hidden;overflow-x:hidden;overflow-y:hidden;height:95%;width:100%;position:absolute;top:0px;left:0px;right:0px;bottom:0px" height="95%" width="100%"></iframe>
</div>
<div style="position:absolute;bottom:1px;display:inline-block;background-color:red;">
<audio controls autoplay="autoplay"><source src="http://lassul.us:8000/radio.ogg" type="audio/ogg">Your browser does not support the audio element.</audio>
</div>
<!-- page content -->
</body>
</html>
services.nginx = {
enable = true;
virtualHosts."radio.lassul.us" = {
forceSSL = true;
enableACME = true;
locations."/".extraConfig = ''
proxy_pass http://localhost:8000;
'';
locations."/recent".extraConfig = ''
alias /tmp/played;
'';
};
virtualHosts."lassul.us".locations."/the_playlist".extraConfig = let
html = pkgs.writeText "index.html" ''
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>lassulus playlist</title>
</head>
<body>
<div style="display:inline-block;margin:0px;padding:0px;overflow:hidden">
<iframe src="https://kiwiirc.com/client/irc.freenode.org/?nick=kiwi_test|?&theme=cli#the_playlist" frameborder="0" style="overflow:hidden;overflow-x:hidden;overflow-y:hidden;height:95%;width:100%;position:absolute;top:0px;left:0px;right:0px;bottom:0px" height="95%" width="100%"></iframe>
</div>
<div style="position:absolute;bottom:1px;display:inline-block;background-color:red;">
<audio controls autoplay="autoplay"><source src="http://lassul.us:8000/radio.ogg" type="audio/ogg">Your browser does not support the audio element.</audio>
</div>
<!-- page content -->
</body>
</html>
'';
in ''
default_type "text/html";
alias ${html};
'';
in ''
default_type "text/html";
alias ${html};
'';
};
}

2
lass/2configs/reaktor-coders.nix
View File

@ -65,7 +65,7 @@ with import <stockholm/lib>;
})
(buildSimpleReaktorPlugin "random-unicorn-porn" {
pattern = "^!rup$$";
script = pkgs.writePython2 "rup" [] ''
script = pkgs.writePython2 "rup" {} ''
t1 = """
_.
;=',_ ()

2
lass/2configs/websites/lassulus.nix
View File

@ -91,7 +91,7 @@ in {
script = pkgs.writeBash "test" ''
echo "hello world"
'';
#script = pkgs.execve "ddate-wrapper" {
#script = pkgs.exec "ddate-wrapper" {
# filename = "${pkgs.ddate}/bin/ddate";
# argv = [];
#};

2
submodules/nix-writers

@ -1 +1 @@
Subproject commit 5d79992262e8f16a3efa985375be74abea3bb392
Subproject commit c27a9416e8ee04d708b11b48f8cf1a055c0cc079

5
tv/1systems/mu/config.nix
View File

@ -2,9 +2,7 @@ with import <stockholm/lib>;
{ config, pkgs, ... }: {
imports = [
<stockholm/krebs>
<stockholm/tv/2configs>
<stockholm/tv/3modules>
<stockholm/tv>
<stockholm/tv/2configs/exim-retiolum.nix>
<stockholm/tv/2configs/retiolum.nix>
];
@ -57,6 +55,7 @@ with import <stockholm/lib>;
gimp
iptables
libreoffice
plasma-pa
(pkgs.pidgin-with-plugins.override {
plugins = [ pkgs.pidginotr ];
})