diff --git a/hosts/server7/default.nix b/hosts/server7/default.nix index 1d2939aa..be38781e 100644 --- a/hosts/server7/default.nix +++ b/hosts/server7/default.nix @@ -14,7 +14,7 @@ in { ]; security.acme = { - email = " mail@c3d2.de"; + email = "mail@c3d2.de"; acceptTerms = true; }; @@ -31,24 +31,22 @@ in { }; }; - fileSystems."/srv/ceph" = { - device = "172.22.99.13:6789:/"; - fsType = "ceph"; - options = [ - "name=storage2" - "secret=AQAvRhxcaCK0IxAAnoe00oiopcpQeKZgL02RWw==" - "noatime,_netdev" - "noauto" - "x-systemd.automount" - "x-systemd.device-timeout=175" - "users" - ]; - }; - - fileSystems."/var/lib/ceph/osd/ceph-7" = { - fsType = "tmpfs"; - }; + /* fileSystems."/srv/ceph" = { + device = "172.22.99.13:6789:/"; + fsType = "ceph"; + options = [ + "name=storage2" + "secret=AQAvRhxcaCK0IxAAnoe00oiopcpQeKZgL02RWw==" + "noatime,_netdev" + "noauto" + "x-systemd.automount" + "x-systemd.device-timeout=175" + "users" + ]; + }; + */ + fileSystems."/var/lib/ceph/osd/ceph-7" = { fsType = "tmpfs"; }; # Route IPv6 boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1; @@ -116,7 +114,9 @@ in { [ "/dev:/dev" "/etc/ceph:/etc/ceph" "/var/lib/ceph/:/var/lib/ceph" ]; }; systemd.services.docker-ceph-osd-7.serviceConfig = { - ExecStartPre = [''-${pkgs.docker}/bin/docker run --rm --net=host --ipc=host --privileged=true -v /dev:/dev -v /etc/ceph:/etc/ceph -v /var/lib/ceph/:/var/lib/ceph -e OSD_DEVICE=/dev/sdb -it ceph/ceph:v14.2.9 ceph-volume lvm activate --all'']; + ExecStartPre = [ + "-${pkgs.docker}/bin/docker run --rm --net=host --ipc=host --privileged=true -v /dev:/dev -v /etc/ceph:/etc/ceph -v /var/lib/ceph/:/var/lib/ceph -e OSD_DEVICE=/dev/sdb -it ceph/ceph:v14.2.9 ceph-volume lvm activate --all" + ]; }; networking = { @@ -186,4 +186,10 @@ in { # allow the old hydra to build here "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7HuDlyTlPC4rCjwhklY8kiYIxdgPhiu6wxs29ksnpKZmJa2R7qoD02N3ACm9cTb1GVkIWukAXI3KvU9h08+WLQJqUH0cHVBj3V1sDYmkN2QecE59gz3e1gfN3zPtwmQEUe6xvHWK3X3qdH45pGPUtxk1eDTZl45037C0NClWF7RXI4m6UXng4bL9wnPvoVqCI+ySsNWaTkHDLE/D9s/VrqGxJ1w2KiJb1F73g9/x/zjL8Ixb16wkPmLE0e50MQAQa7EMFTyPZoEskFnEviLYXM9pDexABAjJfbfZ39lLyMgVYGwnzEDbjDlm68dE6wQWUY1OV6wbt8uYreB2IRrlb root@hydra" ]; + + services.dhcpd4 = { + enable = false; + interfaces = [ "br0" ]; + extraConfig = "not authoritative;"; + }; }