b12f restructure #1

Merged
teutat3s merged 218 commits from b12f into main 2020-11-24 18:27:01 +00:00
3 changed files with 36 additions and 8 deletions
Showing only changes of commit d25308c87a - Show all commits

View file

@ -23,7 +23,7 @@ in
pub-solar.core.hibernation.resumeOffset = 115075072; pub-solar.core.hibernation.resumeOffset = 115075072;
services.openssh.openFirewall = true; services.openssh.openFirewall = true;
networking.firewall.allowedTCPPorts = mkIf psCfg.sway.vnc.enable [ 5901 ]; networking.firewall.allowedTCPPorts = [ 443 ] ++ (if psCfg.sway.vnc.enable then [ 5901 ] else [ ]);
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
wayvnc wayvnc
@ -55,5 +55,10 @@ in
NIX_CC = "${pkgs.stdenv.cc}"; NIX_CC = "${pkgs.stdenv.cc}";
}; };
}; };
# For OpenProject development with https
security.pki.certificates = [
(builtins.readFile ./step-roots.pem)
];
}; };
} }

View file

@ -0,0 +1,13 @@
-----BEGIN CERTIFICATE-----
MIIB6DCCAY2gAwIBAgIQD4Q4blCl/ZrTIRU2QpqEOTAKBggqhkjOPQQDAjBSMSMw
IQYDVQQKExpPcGVuUHJvamVjdCBEZXZlbG9wbWVudCBDQTErMCkGA1UEAxMiT3Bl
blByb2plY3QgRGV2ZWxvcG1lbnQgQ0EgUm9vdCBDQTAeFw0yMjEwMTgxMTE1NDBa
Fw0zMjEwMTUxMTE1NDBaMFIxIzAhBgNVBAoTGk9wZW5Qcm9qZWN0IERldmVsb3Bt
ZW50IENBMSswKQYDVQQDEyJPcGVuUHJvamVjdCBEZXZlbG9wbWVudCBDQSBSb290
IENBMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEu4rN0lOtgxoC83UKONMy2Ns7
tI0/u6qPp/Cw92xhaTdh/X9ZWKqIhp2VGj2HUJOOfQXrFew7jbLGOvvoXib0Y6NF
MEMwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQEwHQYDVR0OBBYE
FPjV1zK2GZu8x4uR0QDotk5kNinEMAoGCCqGSM49BAMCA0kAMEYCIQDS2OpCnHM7
RV7fFHT3KsG3q4lA3dJUKGighQaQ2qOwNwIhAOMmWGWd3EaD87q4RROyVt3h7vIN
nMJRu7L9il84hFF2
-----END CERTIFICATE-----

View file

@ -38,12 +38,22 @@ in
audio.spotify.username = "spotify@benjaminbaedorf.eu"; audio.spotify.username = "spotify@benjaminbaedorf.eu";
}; };
networking.hosts = { # Needed for the udev rules for solaar
"127.0.0.1" = [ hardware.logitech.wireless.enable = true;
"openproject.local" networking.hosts =
"saas-1.openproject.local" let
"transmission.local" localDomains = [
]; "openproject.local"
}; "traefik.local"
"nextcloud.local"
"step.local"
"saas-1.openproject.local"
"transmission.local"
];
in
{
"127.0.0.1" = localDomains;
"::1" = localDomains;
};
}; };
} }