From 408b016b04fce6a45631a668d7136296b28e751e Mon Sep 17 00:00:00 2001 From: MoritzBoehme Date: Tue, 21 Sep 2021 17:48:34 +0200 Subject: [PATCH] added certificate --- modules/services/diskstation/default.nix | 36 +++++++++---------- .../services/diskstation/home-boehmies-de.pem | 28 +++++++++++++++ 2 files changed, 46 insertions(+), 18 deletions(-) create mode 100644 modules/services/diskstation/home-boehmies-de.pem diff --git a/modules/services/diskstation/default.nix b/modules/services/diskstation/default.nix index 57937da..7b22b86 100644 --- a/modules/services/diskstation/default.nix +++ b/modules/services/diskstation/default.nix @@ -3,38 +3,38 @@ { services.davfs2 = { enable = true; - extraConfig = "trust_server_cert diskstation.pem"; + extraConfig = '' + [/auto/diskstation] + trust_server_cert diskstation.pem + [/auto/keepass] + trust_server_cert home-boehmies-de.pem + ''; }; services.autofs = { enable = true; - autoMaster = - let - mapConf = pkgs.writeText "auto" '' - keepass -fstype=davfs,uid=1000 :https\://davs.home.boehmies.de/home/Drive/ - diskstation -fstype=davfs,uid=1000 :https\://192.168.0.2\:5006/home/Drive/ - ''; - in - '' - /auto file:${mapConf} + autoMaster = let + mapConf = pkgs.writeText "auto" '' + keepass -fstype=davfs,uid=1000 :https\://davs.home.boehmies.de/home/Drive/ + diskstation -fstype=davfs,uid=1000 :https\://192.168.0.2\:5006/home/Drive/ ''; + in '' + /auto file:${mapConf} + ''; debug = true; }; environment.etc."davfs2/certs/diskstation.pem" = { text = builtins.readFile ./diskstation.pem; }; + environment.etc."davfs2/certs/home-boehmies-de.pem" = { + text = builtins.readFile ./home-boehmies-de.pem; + }; home-manager.users.moritz = { services.unison = { enable = true; pairs = { - keepass.roots = [ - "/home/moritz/Keepass" - "/auto/keepass" - ]; - diskstation.roots = [ - "/home/moritz/Documents" - "/auto/diskstation" - ]; + keepass.roots = [ "/home/moritz/Keepass" "/auto/keepass" ]; + diskstation.roots = [ "/home/moritz/Documents" "/auto/diskstation" ]; }; }; }; diff --git a/modules/services/diskstation/home-boehmies-de.pem b/modules/services/diskstation/home-boehmies-de.pem new file mode 100644 index 0000000..a4634ab --- /dev/null +++ b/modules/services/diskstation/home-boehmies-de.pem @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIEtjCCA56gAwIBAgISA8o1gHk+xEd8nnsAKlt3V+jBMA0GCSqGSIb3DQEBCwUA +MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD +EwJSMzAeFw0yMTA5MDMyMzMyMjJaFw0yMTEyMDIyMzMyMjFaMBsxGTAXBgNVBAMT +EGhvbWUuYm9laG1pZXMuZGUwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARPY6D0 +/y3gL88epmDlzYsdD7DIi7auIBVDVjRP5CATgYrHsb+xQeCp9G3buWqV+ywGOoTa +JPO9dFZ1W426EJgPo4ICpjCCAqIwDgYDVR0PAQH/BAQDAgeAMB0GA1UdJQQWMBQG +CCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQ59g+B +soozRU6WlvC0yC0DCG95AzAfBgNVHSMEGDAWgBQULrMXt1hWy65QCUDmH6+dixTC +xjBVBggrBgEFBQcBAQRJMEcwIQYIKwYBBQUHMAGGFWh0dHA6Ly9yMy5vLmxlbmNy +Lm9yZzAiBggrBgEFBQcwAoYWaHR0cDovL3IzLmkubGVuY3Iub3JnLzB1BgNVHREE +bjBsghVkYXZzLmhvbWUuYm9laG1pZXMuZGWCFGRzMS5ob21lLmJvZWhtaWVzLmRl +ghBob21lLmJvZWhtaWVzLmRlghVtYWlsLmhvbWUuYm9laG1pZXMuZGWCFHd3dy5o +b21lLmJvZWhtaWVzLmRlMEwGA1UdIARFMEMwCAYGZ4EMAQIBMDcGCysGAQQBgt8T +AQEBMCgwJgYIKwYBBQUHAgEWGmh0dHA6Ly9jcHMubGV0c2VuY3J5cHQub3JnMIIB +BQYKKwYBBAHWeQIEAgSB9gSB8wDxAHYAfT7y+I//iFVoJMLAyp5SiXkrxQ54CX8u +apdomX4i8NcAAAF7rjh7AQAABAMARzBFAiBdO24BNNGbMS7iKk9T1ttkwPKUprOT +SrD6EwKYOFlQ2gIhALfdzk1awsE0kZxLZBb5UX/epXgW2dM1dH/9Vq6pT0MhAHcA +b1N2rDHwMRnYmQCkURX/dxUcEdkCwQApBo2yCJo32RMAAAF7rjh72AAABAMASDBG +AiEA/uLW8sJ04LIw4v1VEssPkxhP1X9YmrRBxI4hEJhnZW0CIQDfjVNiu2Sqdrco +EC7SOJ0RcqlRQBqNnIGEU9PLg/wV9zANBgkqhkiG9w0BAQsFAAOCAQEAkC3uofas +X1v0tb4i/Zh9IWznTl0VzBJutJDzfqz3X2EDbVGG6c8V00vIybg2AqDxtvex6BEw +7RWIjySoUvRoSW+sVS3AmXD/4Hwawg1SQt/6R1TQYVvMET3EdAphGezkZ6dRh+EC +4EwAvEZErw6ylGg1McggXSY9sDFHAI2OHB2tbsNnka4xLNHsv9Vx46UT6UTV8oxy +LjhWQyJ/Yq2AjyHzQE5CETufxIqOwNhWC/Sy40RqY9kzeruzY/xHa7zg3Vz/Q+UO +1wh+XzKj0VZXkgfbuH9RtMLq/e75rLGSa2Aj7lu/OI0N3giwu1M6P7ToW0YVXo4w +IFxtRrJu+T8yrQ== +-----END CERTIFICATE-----