diff options
Diffstat (limited to 'makefu')
| -rw-r--r-- | makefu/1systems/omo/config.nix | 2 | ||||
| -rw-r--r-- | makefu/2configs/bgt/social-to-irc.nix | 8 | ||||
| -rw-r--r-- | makefu/2configs/binary-cache/server.nix | 15 | ||||
| -rw-r--r-- | makefu/2configs/home/ham/mqtt.nix | 6 | ||||
| -rw-r--r-- | makefu/2configs/home/music.nix (renamed from makefu/2configs/home/airsonic.nix) | 20 | ||||
| -rw-r--r-- | makefu/2configs/systemdultras/ircbot.nix | 11 |
6 files changed, 19 insertions, 43 deletions
diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix index 0b4aaacb3..3a216ea76 100644 --- a/makefu/1systems/omo/config.nix +++ b/makefu/1systems/omo/config.nix @@ -94,7 +94,7 @@ in { <stockholm/makefu/2configs/virtualisation/docker.nix> <stockholm/makefu/2configs/bluetooth-mpd.nix> - <stockholm/makefu/2configs/home/airsonic.nix> + <stockholm/makefu/2configs/home/music.nix> <stockholm/makefu/2configs/home/photoprism.nix> # <stockholm/makefu/2configs/home/metube.nix> <stockholm/makefu/2configs/home/ham> diff --git a/makefu/2configs/bgt/social-to-irc.nix b/makefu/2configs/bgt/social-to-irc.nix index e0898193b..9d9640a9f 100644 --- a/makefu/2configs/bgt/social-to-irc.nix +++ b/makefu/2configs/bgt/social-to-irc.nix @@ -1,12 +1,6 @@ { pkgs, ... }: { systemd.services.brockman.environment."BROCKMAN_LOG_LEVEL" = "DEBUG"; - systemd.services.restart-brockman = { - after = [ "brockman.service" ]; - wantedBy = [ "multi-user.target" ]; - startAt = "daily"; - script = "${pkgs.systemd}/bin/systemctl try-restart brockman.service"; - }; krebs.brockman = { enable = true; config = { @@ -34,7 +28,7 @@ bgt-twitter = { feed = "http://rss.makefu.r/?action=display&bridge=Twitter&context=By+username&u=binaergewitter&format=Atom"; #extraChannels = [ "#binaergewitter" ]; - delay = 180; + delay = 280; }; }; }; diff --git a/makefu/2configs/binary-cache/server.nix b/makefu/2configs/binary-cache/server.nix index 2e05fd52e..c1ae16e29 100644 --- a/makefu/2configs/binary-cache/server.nix +++ b/makefu/2configs/binary-cache/server.nix @@ -6,22 +6,9 @@ services.nix-serve = { enable = true; port = 5001; - secretKeyFile = config.krebs.secret.files.nix-serve-key.path; + secretKeyFile = toString <secrets> + "/nix-serve.key"; }; - systemd.services.nix-serve = { - after = [ - config.krebs.secret.files.nix-serve-key.service - ]; - partOf = [ - config.krebs.secret.files.nix-serve-key.service - ]; - }; - krebs.secret.files.nix-serve-key = { - path = "/run/secret/nix-serve.key"; - owner.name = "nix-serve"; - source-path = toString <secrets> + "/nix-serve.key"; - }; services.nginx = { enable = true; virtualHosts."cache.euer.krebsco.de" = { diff --git a/makefu/2configs/home/ham/mqtt.nix b/makefu/2configs/home/ham/mqtt.nix index c90afff4a..5e668e7a0 100644 --- a/makefu/2configs/home/ham/mqtt.nix +++ b/makefu/2configs/home/ham/mqtt.nix @@ -12,15 +12,15 @@ omitPasswordAuth = false; users.sensor = { hashedPassword = "$6$2DXU7W1bvqXPqxkF$vtdz5KTd/T09hmoc9LjgEGFjvpwQbQth6vlVcr5hJNLgcBHv4U03YCKC8TKXbmQAa8xiJ76xJIg25kcL+KI3tg=="; - acl = [ "topic readwrite #" ]; + acl = [ "readwrite #" ]; }; users.hass = { hashedPassword = "$6$SHuYGrE5kPSUc/hu$EomZ0KBy+vkxLt/6eJkrSBjYblCCeMjhDfUd2mwqXYJ4XsP8hGmZ59mMlmBCd3AvlFYQxb4DT/j3TYlrqo7cDA=="; - acl = [ "topic readwrite #" ]; + acl = [ "readwrite #" ]; }; users.stats = { hashedPassword = "$6$j4H7KXD/YZgvgNmL$8e9sUKRXowDqJLOVgzCdDrvDE3+4dGgU6AngfAeN/rleGOgaMhee2Mbg2KS5TC1TOW3tYbk9NhjLYtjBgfRkoA=="; - acl = [ "topic read #" ]; + acl = [ "read #" ]; }; settings = { allow_anonymous = false; diff --git a/makefu/2configs/home/airsonic.nix b/makefu/2configs/home/music.nix index c6112be26..59f6d9170 100644 --- a/makefu/2configs/home/airsonic.nix +++ b/makefu/2configs/home/music.nix @@ -1,19 +1,21 @@ { config, ... }: let internal-ip = "192.168.111.11"; - port = 4040; + port = 4533; in { - # networking.firewall.allowedTCPPorts = [ 4040 ]; - services.airsonic = { - enable = true; - listenAddress = "0.0.0.0"; - inherit port; + services.navidrome.enable = true; + services.navidrome.settings = { + MusicFolder = "/media/cryptX/music"; + Address = "0.0.0.0"; }; - state = [ config.services.airsonic.home ]; - services.nginx.virtualHosts."airsonic" = { + + state = [ "/var/lib/navidrome" ]; + # networking.firewall.allowedTCPPorts = [ 4040 ]; + # state = [ config.services.airsonic.home ]; + services.nginx.virtualHosts."navidrome" = { serverAliases = [ - "airsonic.lan" + "navidrome.lan" "music" "music.lan" "musik" "musik.lan" ]; diff --git a/makefu/2configs/systemdultras/ircbot.nix b/makefu/2configs/systemdultras/ircbot.nix index 65583b9ac..df9741d9c 100644 --- a/makefu/2configs/systemdultras/ircbot.nix +++ b/makefu/2configs/systemdultras/ircbot.nix @@ -7,13 +7,6 @@ virtualHost = "rss.makefu.r"; }; - systemd.services.restart-brockman = { - after = [ "brockman.service" ]; - wantedBy = [ "multi-user.target" ]; - startAt = "daily"; - script = "${pkgs.systemd}/bin/systemctl try-restart brockman.service"; - }; - krebs.brockman = { enable = true; config = { @@ -27,11 +20,11 @@ bots = { r-systemdultras-rss = { feed = "https://www.reddit.com/r/systemdultras/.rss"; - delay = 136; + delay = 236; }; r-systemd-rss = { feed = "https://www.reddit.com/r/systemd/.rss"; - delay = 172; + delay = 272; }; r-pid_eins-twitter = { feed = "http://rss.makefu.r/?action=display&bridge=Twitter&context=By+username&u=pid_eins&format=Atom"; |