From 949f403a20bf00f07306b0d8cef2fefe8bf43b1e Mon Sep 17 00:00:00 2001 From: sid Date: Mon, 18 May 2026 20:40:38 +0200 Subject: [PATCH] rm custom root ca. add remote journald --- modules/nixos/common/default.nix | 3 +-- modules/nixos/common/journald.nix | 6 ++++++ modules/nixos/default.nix | 1 - modules/nixos/pki/default.nix | 3 --- modules/nixos/pki/root_ca.crt | 12 ------------ 5 files changed, 7 insertions(+), 18 deletions(-) create mode 100644 modules/nixos/common/journald.nix delete mode 100644 modules/nixos/pki/default.nix delete mode 100644 modules/nixos/pki/root_ca.crt diff --git a/modules/nixos/common/default.nix b/modules/nixos/common/default.nix index 0415b9f..10028cd 100644 --- a/modules/nixos/common/default.nix +++ b/modules/nixos/common/default.nix @@ -2,11 +2,10 @@ { imports = [ + ./journald.nix ./nix.nix ./overlays.nix - ../pki - inputs.synix.nixosModules.device.server ]; diff --git a/modules/nixos/common/journald.nix b/modules/nixos/common/journald.nix new file mode 100644 index 0000000..d31ada4 --- /dev/null +++ b/modules/nixos/common/journald.nix @@ -0,0 +1,6 @@ +{ + services.journald.upload = { + enable = true; + settings.Upload.URL = "http://100.64.0.5:19532"; + }; +} diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 540f4ee..f831ea8 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -6,7 +6,6 @@ forgejo-runner = import ./forgejo-runner; gnome = import ./gnome; monero = import ./monero; - pki = import ./pki; rsshub-oci = import ./rsshub-oci; tailscale = import ./tailscale; xfce = import ./xfce; diff --git a/modules/nixos/pki/default.nix b/modules/nixos/pki/default.nix deleted file mode 100644 index 9b849f6..0000000 --- a/modules/nixos/pki/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - security.pki.certificateFiles = [ ./root_ca.crt ]; -} diff --git a/modules/nixos/pki/root_ca.crt b/modules/nixos/pki/root_ca.crt deleted file mode 100644 index 44abf61..0000000 --- a/modules/nixos/pki/root_ca.crt +++ /dev/null @@ -1,12 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBrzCCAVWgAwIBAgIQDV0M0pLkCXvARpa+ipSx8jAKBggqhkjOPQQDAjA2MRUw -EwYDVQQKEwxzaWQtaW50ZXJuYWwxHTAbBgNVBAMTFHNpZC1pbnRlcm5hbCBSb290 -IENBMB4XDTI2MDQxODIwMzkwMloXDTM2MDQxNTIwMzkwMlowNjEVMBMGA1UEChMM -c2lkLWludGVybmFsMR0wGwYDVQQDExRzaWQtaW50ZXJuYWwgUm9vdCBDQTBZMBMG -ByqGSM49AgEGCCqGSM49AwEHA0IABCH2VmIwKEjdma4UymD7RWuGcaT2algrL5nm -TE0NzP8giezdU9bEP487AvUPPibSYDWxdp4ycbl6qNVTiy29xkmjRTBDMA4GA1Ud -DwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEBMB0GA1UdDgQWBBRaiBACRDZk -HZMU9y8YsUF4WPB+5TAKBggqhkjOPQQDAgNIADBFAiAh+b49V2VTnT6nRCRM0Qwq -ruzayrrnmF7pIxi9PVFwBQIhANQsL3ok4gCTRAnT0mUXSyWexzSESZ1lkpLYiyoj -RgLi ------END CERTIFICATE----- -- 2.51.2