diff --git a/modules/services/default.nix b/modules/services/default.nix index b52b22c..142c6f2 100644 --- a/modules/services/default.nix +++ b/modules/services/default.nix @@ -3,7 +3,6 @@ { imports = [ ./agenix.nix - ./diskstation ./dunst.nix ./gpg.nix ./kdeconnect.nix diff --git a/modules/services/diskstation/default.nix b/modules/services/diskstation/default.nix deleted file mode 100644 index 3a734b5..0000000 --- a/modules/services/diskstation/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - fileSystems."/media/media" = { - device = "//192.168.0.2/media"; - fsType = "cifs"; - options = - let - # this line prevents hanging on network split - automount_opts = - "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s"; - - in - [ - "${automount_opts},credentials=/run/agenix/smbMedia,uid=1000,gid=100" - ]; - }; -} diff --git a/modules/services/diskstation/diskstation.pem b/modules/services/diskstation/diskstation.pem deleted file mode 100644 index ebeaf75..0000000 --- a/modules/services/diskstation/diskstation.pem +++ /dev/null @@ -1,22 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDtjCCAp6gAwIBAgIJAOZN5L9GVaTiMA0GCSqGSIb3DQEBCwUAMFExCzAJBgNV -BAYTAlRXMQ8wDQYDVQQHDAZUYWlwZWkxFjAUBgNVBAoMDVN5bm9sb2d5IEluYy4x -GTAXBgNVBAMMEFN5bm9sb2d5IEluYy4gQ0EwHhcNMjEwNjE4MDkwMzM5WhcNMjIw -NjE5MDkwMzM5WjBJMQswCQYDVQQGEwJUVzEPMA0GA1UEBwwGVGFpcGVpMRYwFAYD -VQQKDA1TeW5vbG9neSBJbmMuMREwDwYDVQQDDAhzeW5vbG9neTCCASIwDQYJKoZI -hvcNAQEBBQADggEPADCCAQoCggEBALrIzrQf022JpvS5Ku8lu3C5G3YzaDXpvLMv -LEHKk3eXKUu2RiyXvrTh3y0ZIW9IuOI5sSCKXlQix7NWIddXPAZkMLObe4qDzp7R -G+fPa5Tec34sphhBVpgjwHdzNRwQxhQDtMRrtMGGHpiZYXjjNDWhm9q/LBl2XBOO -CwHbsBIo8bgd8tPws1zaGtY5CAh4IaPC4lCyktxiwXKbXPBnwkpxGV5gGKIqUS/W -GicrXOxfduWqty+5msBkm/Bagf+lR7hZ1IsXKyAFelyjrfgeBRnn57VkbSlfnq+s -41A0mjGegqD5ZEqe4FPK1WcmRjRDqUuetzEjE4m5AL65/h4CaQcCAwEAAaOBmDCB -lTAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIFoDAgBgNVHSUBAf8EFjAUBggr -BgEFBQcDAQYIKwYBBQUHAwIwEwYDVR0RBAwwCoIIc3lub2xvZ3kwHQYDVR0OBBYE -FGICvrtQkLRMgp1eCbxnq0ww0NL/MB8GA1UdIwQYMBaAFEFKBxQKEgaHDckFtcoU -iVq0AzkVMA0GCSqGSIb3DQEBCwUAA4IBAQBBKyKdRl9n5mGi1uY5qGC4u3fHdXaU -5iQvF22dOT6Z9szivs31x7sNzgpQgm3hWu5wGPHaTYNjkJu3L+IqHsi6wQC4hSV8 -sVc83XDCoes5flMsmwgogzzf3DiIN+kJPiOxgwhRdAHtwpC/BxoLF/j83x8Jt96Q -TVuauRtg/WZTXAmLL/JdbT6UL/l9IigZ3mettD1oLB9ASgk+53w4Jr/CzBaXcVIQ -YLYIK/R5+9gQDYYG6zZMcpIhaj6arJOLkGXT9aBB+GZyAbuDaT48H7by+q372aoL -o/s9ONOUCsM2qNUpMi5cRRfIUlzp79tpem3+KFuc6yM3NxyxkZkHss4w ------END CERTIFICATE----- diff --git a/modules/services/diskstation/getCertificate.sh b/modules/services/diskstation/getCertificate.sh deleted file mode 100755 index ced109b..0000000 --- a/modules/services/diskstation/getCertificate.sh +++ /dev/null @@ -1,5 +0,0 @@ -#! /usr/bin/env bash -set -euo pipefail - -nix-shell -p openssl \ - --command "openssl s_client -showcerts -connect $1 /dev/null|openssl x509 -outform PEM > $2" diff --git a/modules/services/diskstation/home-boehmies-de.pem b/modules/services/diskstation/home-boehmies-de.pem deleted file mode 100644 index a4634ab..0000000 --- a/modules/services/diskstation/home-boehmies-de.pem +++ /dev/null @@ -1,28 +0,0 @@ ------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-----