diff options
author | lassulus <lassulus@lassul.us> | 2022-03-02 16:37:48 +0100 |
---|---|---|
committer | lassulus <lassulus@lassul.us> | 2022-03-02 16:37:48 +0100 |
commit | 44a42bb268e163e3fa43fe6ea6c4b979da0f49e9 (patch) | |
tree | 0e9475b0a40464b8122ac19ddcc63fe0daab3cd4 /makefu/1systems | |
parent | 6002189225e347418f07a99d6a85b033fa0edaf7 (diff) | |
parent | 81817007edda4601c95a8f95aa99ce15320e224a (diff) |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems')
-rw-r--r-- | makefu/1systems/gum/config.nix | 34 | ||||
-rw-r--r-- | makefu/1systems/latte/config.nix | 28 | ||||
-rw-r--r-- | makefu/1systems/omo/config.nix | 7 | ||||
-rw-r--r-- | makefu/1systems/x/config.nix | 12 |
4 files changed, 57 insertions, 24 deletions
diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix index a9d9b661..089fc8e9 100644 --- a/makefu/1systems/gum/config.nix +++ b/makefu/1systems/gum/config.nix @@ -23,11 +23,12 @@ in { } <stockholm/makefu/2configs/nur.nix> <stockholm/makefu/2configs/support-nixos.nix> - <stockholm/makefu/2configs/nix-community/mediawiki-matrix-bot.nix> <stockholm/makefu/2configs/nix-community/supervision.nix> <stockholm/makefu/2configs/home-manager> <stockholm/makefu/2configs/home-manager/cli.nix> # <stockholm/makefu/2configs/stats/client.nix> + <stockholm/makefu/2configs/share> + <stockholm/makefu/2configs/share/hetzner-client.nix> # <stockholm/makefu/2configs/stats/netdata-server.nix> <stockholm/makefu/2configs/headless.nix> @@ -56,13 +57,13 @@ in { <stockholm/makefu/2configs/tinc/retiolum.nix> { # bonus retiolum config for connecting more hosts krebs.tinc.retiolum = { - extraConfig = lib.mkForce '' - ListenAddress = ${external-ip} 53 - ListenAddress = ${external-ip} 655 - ListenAddress = ${external-ip} 21031 - StrictSubnets = yes - LocalDiscovery = no - ''; + #extraConfig = lib.mkForce '' + # ListenAddress = ${external-ip} 53 + # ListenAddress = ${external-ip} 655 + # ListenAddress = ${external-ip} 21031 + # StrictSubnets = yes + # LocalDiscovery = no + #''; connectTo = [ "prism" "ni" "enklave" "eve" "dishfire" ]; @@ -106,7 +107,7 @@ in { # sharing <stockholm/makefu/2configs/share/gum.nix> # samba sahre - <stockholm/makefu/2configs/torrent.nix> + <stockholm/makefu/2configs/torrent/rtorrent.nix> # <stockholm/makefu/2configs/sickbeard> <stockholm/makefu/2configs/bitwarden.nix> @@ -114,7 +115,7 @@ in { #<stockholm/makefu/2configs/retroshare.nix> ## <stockholm/makefu/2configs/ipfs.nix> #<stockholm/makefu/2configs/syncthing.nix> - <stockholm/makefu/2configs/sync> + # <stockholm/makefu/2configs/sync> # <stockholm/makefu/2configs/opentracker.nix> @@ -125,9 +126,8 @@ in { { makefu.backup.server.repo = "/var/backup/borg"; } <stockholm/makefu/2configs/backup/server.nix> <stockholm/makefu/2configs/backup/state.nix> - <stockholm/makefu/2configs/bitlbee.nix> <stockholm/makefu/2configs/wireguard/server.nix> - <stockholm/makefu/2configs/wireguard/wiregrill.nix> + # <stockholm/makefu/2configs/wireguard/wiregrill.nix> { # recent changes mediawiki bot networking.firewall.allowedUDPPorts = [ 5005 5006 ]; @@ -150,13 +150,12 @@ in { # <stockholm/makefu/2configs/deployment/photostore.krebsco.de.nix> <stockholm/makefu/2configs/deployment/graphs.nix> - <stockholm/makefu/2configs/deployment/owncloud.nix> + #<stockholm/makefu/2configs/deployment/owncloud.nix> <stockholm/makefu/2configs/deployment/board.euer.krebsco.de.nix> - <stockholm/makefu/2configs/deployment/rss.euer.krebsco.de.nix> #<stockholm/makefu/2configs/deployment/feed.euer.krebsco.de> <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/archiveteam-warrior.nix> <stockholm/makefu/2configs/deployment/mediengewitter.de.nix> <stockholm/makefu/2configs/bgt/etherpad.euer.krebsco.de.nix> # <stockholm/makefu/2configs/deployment/systemdultras-rss.nix> @@ -182,14 +181,15 @@ in { ## Temporary: # <stockholm/makefu/2configs/temp/rst-issue.nix> - <stockholm/makefu/2configs/virtualisation/docker.nix> + # <stockholm/makefu/2configs/virtualisation/docker.nix> #<stockholm/makefu/2configs/virtualisation/libvirt.nix> # krebs infrastructure services # <stockholm/makefu/2configs/stats/server.nix> ]; - makefu.dl-dir = "/var/download"; + # makefu.dl-dir = "/var/download"; + makefu.dl-dir = "/media/cloud/download"; services.openssh.hostKeys = lib.mkForce [ { bits = 4096; path = (toString <secrets/ssh_host_rsa_key>); type = "rsa"; } diff --git a/makefu/1systems/latte/config.nix b/makefu/1systems/latte/config.nix index fdd3df19..2828aea0 100644 --- a/makefu/1systems/latte/config.nix +++ b/makefu/1systems/latte/config.nix @@ -29,10 +29,29 @@ in { <stockholm/makefu/2configs/remote-build/slave.nix> # Storage + <stockholm/makefu/2configs/share> <stockholm/makefu/2configs/share/hetzner-client.nix> # Services: <stockholm/makefu/2configs/nix-community/mediawiki-matrix-bot.nix> + <stockholm/makefu/2configs/torrent/rtorrent.nix> + ## Web + <stockholm/makefu/2configs/deployment/rss.euer.krebsco.de.nix> + <stockholm/makefu/2configs/deployment/owncloud.nix> + ### Moving owncloud data dir to /media/cloud/nextcloud-data + { + users.users.nextcloud.extraGroups = [ "download" ]; + # nextcloud-setup fails as it cannot set permissions for nextcloud + systemd.services.nextcloud-setup.serviceConfig.SuccessExitStatus = "0 1"; + fileSystems."/var/lib/nextcloud/data" = { + device = "/media/cloud/nextcloud-data"; + options = [ "bind" ]; + }; + } + + # local usage: + <stockholm/makefu/2configs/mosh.nix> + <stockholm/makefu/2configs/bitlbee.nix> # Supervision <stockholm/makefu/2configs/nix-community/supervision.nix> @@ -40,9 +59,9 @@ in { # Krebs <stockholm/makefu/2configs/tinc/retiolum.nix> - #<stockholm/makefu/2configs/home-manager> - # configure your hw: - # <stockholm/makefu/2configs/torrent.nix> + # backup + <stockholm/makefu/2configs/backup/state.nix> + ]; krebs = { @@ -50,4 +69,7 @@ in { build.host = config.krebs.hosts.latte; }; + makefu.dl-dir = "/media/cloud/download"; + networking.firewall.allowedTCPPorts = [ 80 443 ]; + } diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix index 3a216ea7..42f33526 100644 --- a/makefu/1systems/omo/config.nix +++ b/makefu/1systems/omo/config.nix @@ -43,14 +43,18 @@ in { <stockholm/makefu/2configs/tools/dev.nix> <stockholm/makefu/2configs/tools/desktop.nix> <stockholm/makefu/2configs/tools/mobility.nix> + <stockholm/makefu/2configs/tools/consoles.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> <stockholm/makefu/2configs/share/omo.nix> <stockholm/makefu/2configs/share/gum-client.nix> + <stockholm/makefu/2configs/share/hetzner-client.nix> + <stockholm/makefu/2configs/sync> <stockholm/makefu/2configs/dcpp/airdcpp.nix> { krebs.airdcpp.dcpp.shares = let d = path: "/media/cryptX/${path}"; @@ -96,6 +100,8 @@ in { <stockholm/makefu/2configs/home/music.nix> <stockholm/makefu/2configs/home/photoprism.nix> + <stockholm/makefu/2configs/home/tonie.nix> + <stockholm/makefu/2configs/home/ps4srv.nix> # <stockholm/makefu/2configs/home/metube.nix> <stockholm/makefu/2configs/home/ham> <stockholm/makefu/2configs/home/zigbee2mqtt> @@ -104,6 +110,7 @@ in { enable = true; servedir = "/media/cryptX/emu/ps3"; }; + users.users.makefu.packages = [ pkgs.pkgrename ]; } diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix index 22427786..3edfcecc 100644 --- a/makefu/1systems/x/config.nix +++ b/makefu/1systems/x/config.nix @@ -137,6 +137,8 @@ # <stockholm/makefu/2configs/share/anon-ftp.nix> # <stockholm/makefu/2configs/share/anon-sftp.nix> <stockholm/makefu/2configs/share/gum-client.nix> + <stockholm/makefu/2configs/share/hetzner-client.nix> + <stockholm/makefu/2configs/share> # <stockholm/makefu/2configs/share/temp-share-samba.nix> @@ -145,6 +147,7 @@ <stockholm/makefu/2configs/mail-client.nix> <stockholm/makefu/2configs/printer.nix> # <stockholm/makefu/2configs/syncthing.nix> + <stockholm/makefu/2configs/sync> # Virtualization # <stockholm/makefu/2configs/virtualisation/libvirt.nix> @@ -167,7 +170,7 @@ # <stockholm/makefu/2configs/remote-build/gum.nix> # { nixpkgs.overlays = [ (self: super: super.prefer-remote-fetch self super) ]; } - <stockholm/makefu/2configs/binary-cache/gum.nix> + # <stockholm/makefu/2configs/binary-cache/gum.nix> <stockholm/makefu/2configs/binary-cache/lass.nix> @@ -223,7 +226,8 @@ krebs.build.host = config.krebs.hosts.x; - krebs.tinc.retiolum.connectTo = [ "omo" "prism" "nextgum" "wbob" ]; + #krebs.tinc.retiolum.connectTo = lib.mkForce [ "gum" ]; + #krebs.tinc.retiolum.extraConfig = "AutoConnect = no"; environment.systemPackages = [ pkgs.passwdqc-utils ]; @@ -245,6 +249,6 @@ "/home/makefu/.config/syncthing" ]; - services.syncthing.user = lib.mkForce "makefu"; - services.syncthing.dataDir = lib.mkForce "/home/makefu/.config/syncthing/"; + # services.syncthing.user = lib.mkForce "makefu"; + # services.syncthing.dataDir = lib.mkForce "/home/makefu/.config/syncthing/"; } |