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

Merge remote-tracking branch 'gum/master'

Browse Source
This commit is contained in:
lassulus 2020-05-25 16:07:42 +02:00
commit 6c8210f93a
13 changed files with 111 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
krebs/3modules/makefu/default.nix
View File

@ -182,7 +182,9 @@ in {
gum IN A ${nets.internet.ip4.addr}
io IN NS gum.krebsco.de.
iso.euer IN A ${nets.internet.ip4.addr}
feed.euer IN A ${nets.internet.ip4.addr}
board.euer IN A ${nets.internet.ip4.addr}
etherpad.euer IN A ${nets.internet.ip4.addr}
rss.euer IN A ${nets.internet.ip4.addr}
mediengewitter IN CNAME over.dose.io.
mon.euer IN A ${nets.internet.ip4.addr}

6
krebs/nixpkgs.json
View File

@ -1,7 +1,7 @@
{
"url": "https://github.com/NixOS/nixpkgs-channels",
"rev": "5adf2a6c11646898742b0c08f7e94101620ba707",
"date": "2020-05-11T09:54:07+01:00",
"sha256": "0wf7pwma2qyfak39b242mcq8z7cdj65sds7hcjxchy0448shapzi",
"rev": "f45ccd9d20b4e90e43c4562b9941ea1dbd8f07a4",
"date": "2020-05-20T11:42:56+02:00",
"sha256": "10476ij19glhs2yy1pmvm0azd75ifjchpfbljn7h1cnnpii1xprc",
"fetchSubmodules": false
}

1
makefu/1systems/gum/config.nix
View File

@ -140,6 +140,7 @@ in {
<stockholm/makefu/2configs/deployment/boot-euer.nix>
<stockholm/makefu/2configs/deployment/gecloudpad>
<stockholm/makefu/2configs/deployment/docker/archiveteam-warrior.nix>
<stockholm/makefu/2configs/deployment/docker/etherpad.euer.krebsco.de.nix>
<stockholm/makefu/2configs/shiori.nix>
<stockholm/makefu/2configs/bgt/download.binaergewitter.de.nix>

24
makefu/1systems/omo/config.nix
View File

@ -26,6 +26,10 @@ in {
# <stockholm/makefu/2configs/disable_v6.nix>
#<stockholm/makefu/2configs/graphite-standalone.nix>
#<stockholm/makefu/2configs/share-user-sftp.nix>
<stockholm/makefu/2configs/urlwatch>
<stockholm/makefu/2configs/legacy_only.nix>
<stockholm/makefu/2configs/share/omo.nix>
<stockholm/makefu/2configs/dcpp/airdcpp.nix>
{ krebs.airdcpp.dcpp.shares = let
@ -125,16 +129,16 @@ in {
zramSwap.enable = true;
krebs.Reaktor.reaktor-shack = {
nickname = "Reaktor|shack";
workdir = "/var/lib/Reaktor/shack";
channels = [ "#shackspace" ];
plugins = with pkgs.ReaktorPlugins;
[ shack-correct
# stockholm-issue
sed-plugin
random-emoji ];
};
#krebs.Reaktor.reaktor-shack = {
# nickname = "Reaktor|shack";
# workdir = "/var/lib/Reaktor/shack";
# channels = [ "#shackspace" ];
# plugins = with pkgs.ReaktorPlugins;
# [ shack-correct
# # stockholm-issue
# sed-plugin
# random-emoji ];
#};
#krebs.Reaktor.reaktor-bgt = {
# nickname = "Reaktor|bgt";
# workdir = "/var/lib/Reaktor/bgt";

2
makefu/1systems/x/config.nix
View File

@ -19,7 +19,9 @@
<stockholm/makefu/2configs/tools/all.nix>
{ programs.adb.enable = true; }
{ systemd.services.docker.wantedBy = lib.mkForce []; }
<stockholm/makefu/2configs/dict.nix>
<stockholm/makefu/2configs/legacy_only.nix>
#<stockholm/makefu/3modules/netboot_server.nix>
#{
# netboot_server = {

1
makefu/2configs/bureautomation/default.nix
View File

@ -41,6 +41,7 @@ in {
};
autoExtraComponents = true;
config = {
config = {};
discovery = {};
homeassistant = {
name = "Bureautomation";

39
makefu/2configs/deployment/docker/etherpad.euer.krebsco.de.nix Normal file
View File

@ -0,0 +1,39 @@
{ lib, ... }:
let
port = 19201;
in {
#services.nginx.virtualHosts."euer.krebsco.de".serverAliases = [ "etherpad.euer.krebsco.de" ];
services.nginx.virtualHosts."etherpad.euer.krebsco.de" = {
# useACMEHost = "euer.krebsco.de";
enableACME = true;
forceSSL = true;
locations."/".proxyPass = "http://localhost:${toString port}";
};
docker-containers."etherpad-lite" = {
image = "makefoo/bgt-etherpad:2020-05-02.5";
ports = [ "127.0.0.1:${toString port}:9001" ];
volumes = [
"/var/src/secrets/etherpad/apikey:/opt/etherpad-lite/APIKEY.txt"
"etherpad_data:/opt/etherpad-lite/var" # persistent dirtydb
];
# for postgres
#DB_TYPE=postgres
#DB_HOST=db.local
#DB_PORT=4321
#DB_NAME=etherpad
#DB_USER=dbusername
#DB_PASS=mypassword
environment = {
# ADMIN_PASSWORD = "auf jeden fall nicht das echte admin passwort";
SUPPRESS_ERRORS_IN_PAD_TEXT = "true";
TITLE = "Binärgewitter Etherpad";
SKIN_NAME = "no-skin";
DEFAULT_PAD_TEXT = builtins.replaceStrings ["\n"] ["\\n"] (builtins.readFile ./template.md);
PAD_OPTIONS_USE_MONOSPACE_FONT = "true";
PAD_OPTIONS_USER_NAME = "true";
PAD_OPTIONS_USER_COLOR = "true";
PAD_OPTIONS_CHAT_AND_USERS = "true";
PAD_OPTIONS_LANG = "en-US";
};
};
}

33
makefu/2configs/deployment/docker/template.md Normal file
View File

@ -0,0 +1,33 @@
# BGT<NUMBER>
1. studio-link aufnehmen drücken (wichtig)
- markus 6407eb63@studio-link.de
- Felix1 1f1021b2@studio-link.de
- L33tFelix 4d47a82a@studio-link.de
- Ingo 03b33b4a@studio-link.de
2. audiocity starten, 48000Hz einstellen, Audio-Device checken und aufnehmen drücken (wichtig)
3. obs starten und aufnehmen drücken (eher unwichtig)
4. darkice starten (wichtig)
4. klatschen
5. Hallo und herzlich Willkommen
## Vorschläge
### Backlog von Picks und Lesefoo aus der letzten Woche
---
## Blast from the Past
## Toter der Woche
## Untoter der Woche
## News
## Themen
## Mimimi der Woche
## Lesefoo
## Picks

5
makefu/2configs/deployment/gecloudpad/default.nix
View File

@ -4,12 +4,14 @@ let
wsgi-sock = "${workdir}/uwsgi-gecloudpad.sock";
workdir = config.services.uwsgi.runDir;
gecloudpad = pkgs.python3Packages.callPackage ./gecloudpad.nix {};
gecloudpad_settings = pkgs.writeText "gecloudpad_settings" ''
BASEURL = "https://etherpad.euer.krebsco.de"
'';
in {
services.uwsgi = {
enable = true;
user = "nginx";
# runDir = "/var/lib/photostore";
plugins = [ "python3" ];
instance = {
type = "emperor";
@ -18,6 +20,7 @@ in {
type = "normal";
pythonPackages = self: with self; [ gecloudpad ];
socket = wsgi-sock;
env = ["GECLOUDPAD_SETTINGS=${gecloudpad_settings}"];
};
};
};

4
makefu/2configs/ham/androidtv/default.nix
View File

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "androidtv";
version = "0.0.38";
version = "0.0.39";
src = fetchPypi {
inherit pname version;
sha256 = "0ri1fnc63zashc667w2mlpb0c7ri3x6wnhnf54klb89v73pdnb8k";
sha256 = "06lrjj74g2f3pkhsn3c8h13mkykgqqf4g9q6x5yv23z6ghjnk2dz";
};
propagatedBuildInputs = [

1
makefu/2configs/ham/default.nix
View File

@ -35,6 +35,7 @@ in {
];
};
config = {
config = {};
input_select = zigbee.input_select; # dict
timer = zigbee.timer // kurzzeitwecker.timer; # dict
homeassistant = {

1
makefu/2configs/ham/zigbee2mqtt/default.nix
View File

@ -17,4 +17,5 @@
volumes = ["/var/lib/zigbee2mqtt:/app/data"];
};
state = [ "/var/lib/zigbee2mqtt/configuration.yaml" "/var/lib/zigbee2mqtt/state.json" ];
systemd.services.docker-zigbee2mqtt.after = [ "home-assistant.service" "docker.service" "network-online.target" ];
}

8
makefu/2configs/legacy_only.nix Normal file
View File

@ -0,0 +1,8 @@
{ networking.enableIPv6 = false;
boot.kernel.sysctl = {
"net.ipv6.conf.all.disable_ipv6" = 1;
"net.ipv6.conf.default.disable_ipv6" = 1;
"net.ipv6.conf.lo.disable_ipv6" = 1;
};
boot.kernelParams = [ "ipv6.disable=1" ];
}