nebula: revamp share/ into domains/

diff --git a/domains/riseup.net/openvpn/ca.crt b/domains/riseup.net/openvpn/ca.crt
new file mode 100644 (file)
index 0000000..aa626d3
--- /dev/null
+++ b/domains/riseup.net/openvpn/ca.crt
@@ -0,0 +1,34 @@
+-----BEGIN CERTIFICATE-----
+MIIF2jCCA8KgAwIBAgIIVogyQTSIzc8wDQYJKoZIhvcNAQELBQAwgYYxGDAWBgNV
+BAMTD1Jpc2V1cCBOZXR3b3JrczEYMBYGA1UEChMPUmlzZXVwIE5ldHdvcmtzMRAw
+DgYDVQQHEwdTZWF0dGxlMQswCQYDVQQIEwJXQTELMAkGA1UEBhMCVVMxJDAiBgkq
+hkiG9w0BCQEWFWNvbGxlY3RpdmVAcmlzZXVwLm5ldDAiGA8yMDE2MDEwMjIwMjU0
+MFoYDzIwMjYwMzMwMjAyNjAxWjCBhjEYMBYGA1UEAxMPUmlzZXVwIE5ldHdvcmtz
+MRgwFgYDVQQKEw9SaXNldXAgTmV0d29ya3MxEDAOBgNVBAcTB1NlYXR0bGUxCzAJ
+BgNVBAgTAldBMQswCQYDVQQGEwJVUzEkMCIGCSqGSIb3DQEJARYVY29sbGVjdGl2
+ZUByaXNldXAubmV0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAw2VV
+uoz4xqeB1ROIwXBRaj0prOqEFX89A7+2rslGRfjM8NPHyBLGleoHTK3DPwadtQeg
+ulaEOAjM5EMXTEX/o9H46L6h729HUWPCwVssvvOjyxTyGJDf7Ihd/Ab7ODtlJSyc
+g31aXMioA5pGz5QnS3VGz4nE9+NL+jobc/NbhaacsEPR/7xO7meRNu/1S+YiHK1y
+BSVrfap3XItlcNHDGNQkPyyJbS3pAS1lQs2HCBTzcFCamCkDOC7cRh9wZ4GH8U2f
+2s0mDD5zhRpheNW4gFBtGpqHiRXv7WJW612aaXzKQQoIq2loGNvOpnyBPKL3jjUT
+Rxv5IzWMV0nAofMCy25u/S4J65uSEd9mLNXFJ3rl+cFaybcOUXktTbS7bZy6cMyf
+/gO28bEXIWr5WfZf8jCbPyOVfExZquG3aS+0YPWmIJCheXQzgiwplZy93oND1GGQ
+f+1R2F7GPwNXQdefv2xm7PTWhHbSWHHmeY89qYED+yFJrX5ChoFoBbYs1lMmdU/C
+2MnQBFtvcVockXFAUONyMKiq8ZP6sQ1lu0rO9Bvkhx55sJLZOmjN3g4S1K97PbbI
+5DzHKcR0JQSt8ZtCY/MuMbwvlNYo98bFWvlfKET0KPtogNNH0PNfJmStKR8jWGjE
+HnUNXo7YDfK90iEKTjLz2K5CYzH5Dm6iYJNaaykCAwEAAaNGMEQwEgYDVR0TAQH/
+BAgwBgEB/wIBADAPBgNVHQ8BAf8EBQMDBwQAMB0GA1UdDgQWBBTGek7ebtq2Ibm+
+2K6je1IMobvEkzANBgkqhkiG9w0BAQsFAAOCAgEAO2B3jnL+8LeoRkc282qUpHyu
+xYj0Qd68l0CJ0FjfA2OCR/6h1W4gZVH+fTd/mhgrNXj28GRT53JEh1jdRC7ENTXu
+W9O8I9gCbWQ6V4nkZ9lpq8UEmKTFGnngVu8VCmSDF+y0kFuEtmt0jyd2UkJfC/vy
+Gh78OCHEdGAeOTYHXamiuA9Z7wMuncPjP476gSW2kfWTdxV25ad4tT5dA5d42xDm
+YE2UKzHeB9amOmvyh08LPD0idT5oROCIHsHBhQC9oltJXO5j6GyHRg88C1inyv6R
+xk+w9ek4wSBpoJg5t3hdbZr3JTUsuu4WPtAET0fMQpJC+niaBbegwtvdLZFM+d8x
+ead3ZpMO+XrpazDFGtdPTQdi5EIYmr2RL9eTeQbVPwMB9TgFpBXP+iYIuTpNo8jn
+8zS4EcPRmz6PQJVK4zkHczfvquyU9RuOwEgb8qN4tSNxF0Z94uSVUoXCG9WZLf8q
+MfsGesYiR/qLnLn3MfAyWm3OVOUvGzczDE2T8VvY7rXc2+8ra5aK0TNAgEz9ey6D
+/dGzM1JCCe1A08s+2+eRX//pmqmOCoGrY7zwIVS2T249h6iIMM9yT0C3ZXRoTnVN
+osyidOkVuQr0YK6shJ0WaK4F1MktdjOZKPoIc9QLw+TrSU2hfyla36T0bNWMC/TJ
+YtxDI+d1jIFZ7zMmts4=
+-----END CERTIFICATE-----

diff --git a/domains/sourcephile.fr/.gitattributes b/domains/sourcephile.fr/.gitattributes
new file mode 100644 (file)
index 0000000..4aa27b7
--- /dev/null
+++ b/domains/sourcephile.fr/.gitattributes
@@ -0,0 +1,7 @@
+*.clear    filter=git-crypt-sourcephile diff=git-crypt-sourcephile
+*.cred     filter=git-crypt-sourcephile diff=git-crypt-sourcephile
+*.gpg      filter=git-crypt-sourcephile diff=git-crypt-sourcephile
+*.pem      filter=git-crypt-sourcephile diff=git-crypt-sourcephile
+*.pub      filter=git-crypt-sourcephile diff=git-crypt-sourcephile
+*.crt      filter=git-crypt-sourcephile diff=git-crypt-sourcephile
+.gpg-id    filter=git-crypt-sourcephile diff=git-crypt-sourcephile

diff --git a/share/nebula/sourcephile.fr.nix b/domains/sourcephile.fr/nebula.nix
similarity index 94%
rename from share/nebula/sourcephile.fr.nix
rename to domains/sourcephile.fr/nebula.nix
index 0cacbd1cb5889bf3e13a8aecedf378a98b400006..aee39f629f452a6f111439e90bf72a7746e64635 100644 (file)
--- a/share/nebula/sourcephile.fr.nix
+++ b/domains/sourcephile.fr/nebula.nix
@@ -10,7 +10,7 @@ in
   systemd.services."nebula@${domain}" = {
     stopIfChanged = false;
     serviceConfig.LoadCredentialEncrypted = [
-      "${hostName}.key:${builtins.path { path = inputs.self + "/hosts/${hostName}/nebula/${hostName}.key.cred"; }}"
+      "${hostName}.key:${builtins.path { path = inputs.self + "/hosts/${hostName}/nebula/${domain}/${hostName}.key.cred"; }}"
     ];
   };
   install.target = lib.mkDefault "\"\${NIXOS_TARGET:-root@${config.networking.hostName}.sp}\"";
@@ -27,8 +27,8 @@ in
   };
   services.nebula.networks.${domain} = {
     enable = true;
-    ca = lib.mkDefault (./. + "/${domain}/ca.crt");
-    cert = lib.mkDefault (builtins.path { path = inputs.self + "/share/nebula/${domain}/${hostName}.crt"; });
+    ca = lib.mkDefault (builtins.path { path = inputs.self + "/domains/${domain}/nebula/ca.crt"; });
+    cert = lib.mkDefault (builtins.path { path = inputs.self + "/hosts/${hostName}/nebula/${domain}/${hostName}.crt"; });
     key = "/run/credentials/nebula@${domain}.service/${hostName}.key";
     listen.host = lib.mkDefault "0.0.0.0";
     tun.device = lib.mkDefault "neb-sourcephile";

diff --git a/domains/sourcephile.fr/nebula/ca.crt b/domains/sourcephile.fr/nebula/ca.crt
new file mode 100644 (file)
index 0000000..29c8063
Binary files /dev/null and b/domains/sourcephile.fr/nebula/ca.crt differ

diff --git a/flake.nix b/flake.nix
index db54b213b80043e16c692a8ce000f3c5cd6dae37..5befd216d2fa126dedf44c37fcf57aaaa3c647a8 100644 (file)
--- a/flake.nix
+++ b/flake.nix
@@ -90,12 +90,12 @@
               ];
             in
             unions [
+              (fileFilter (file: lib.any file.hasExt exts) ./domains)
               (fileFilter (file: lib.any file.hasExt exts) ./home-manager)
               (fileFilter (file: lib.any file.hasExt exts) ./homes)
               (fileFilter (file: lib.any file.hasExt exts) ./hosts)
               (fileFilter (file: lib.any file.hasExt exts) ./nixos)
               (fileFilter (file: lib.any file.hasExt exts) ./nixpkgs)
-              (fileFilter (file: lib.any file.hasExt exts) ./share)
               (fileFilter (file: lib.any file.hasExt exts) ./users)
               ./shell.nix
             ];

diff --git a/hosts/aubergine/nebula.nix b/hosts/aubergine/nebula.nix
index 2a62fb1eef9c73ee68a837f07e5de0e3b6e4699e..279c3b25b928050440743be1a111b9467c7b1d0e 100644 (file)
--- a/hosts/aubergine/nebula.nix
+++ b/hosts/aubergine/nebula.nix
@@ -5,7 +5,7 @@ let
 in
 {
   imports = [
-    ../../share/nebula/sourcephile.fr.nix
+    ../../domains/sourcephile.fr/nebula.nix
   ];
   services.nebula.networks.${domain} = {
     listen.port = 10006;

diff --git a/hosts/aubergine/nebula/sourcephile.fr/aubergine.crt b/hosts/aubergine/nebula/sourcephile.fr/aubergine.crt
new file mode 100644 (file)
index 0000000..2b068ab
Binary files /dev/null and b/hosts/aubergine/nebula/sourcephile.fr/aubergine.crt differ

diff --git a/hosts/aubergine/nebula/aubergine.key.cred b/hosts/aubergine/nebula/sourcephile.fr/aubergine.key.cred
similarity index 100%
rename from hosts/aubergine/nebula/aubergine.key.cred
rename to hosts/aubergine/nebula/sourcephile.fr/aubergine.key.cred

diff --git a/hosts/aubergine/nebula/aubergine.key.gpg b/hosts/aubergine/nebula/sourcephile.fr/aubergine.key.gpg
similarity index 100%
rename from hosts/aubergine/nebula/aubergine.key.gpg
rename to hosts/aubergine/nebula/sourcephile.fr/aubergine.key.gpg

diff --git a/hosts/aubergine/nebula/aubergine.pub b/hosts/aubergine/nebula/sourcephile.fr/aubergine.pub
similarity index 100%
rename from hosts/aubergine/nebula/aubergine.pub
rename to hosts/aubergine/nebula/sourcephile.fr/aubergine.pub

diff --git a/hosts/blackberry/nebula.nix b/hosts/blackberry/nebula.nix
index 18423711fed4aa3affbdc6331eff2f2ab158a8e3..0774762770bbe0d50447132b00aa8088fb37d744 100644 (file)
--- a/hosts/blackberry/nebula.nix
+++ b/hosts/blackberry/nebula.nix
@@ -6,7 +6,7 @@ let
 in
 {
   imports = [
-    ../../share/nebula/sourcephile.fr.nix
+    ../../domains/sourcephile.fr/nebula.nix
   ];
   services.nebula.networks.${domain} = {
     listen.port = 10008;

diff --git a/hosts/blackberry/nebula/sourcephile.fr/blackberry.crt b/hosts/blackberry/nebula/sourcephile.fr/blackberry.crt
new file mode 100644 (file)
index 0000000..9123ddb
Binary files /dev/null and b/hosts/blackberry/nebula/sourcephile.fr/blackberry.crt differ

diff --git a/hosts/blackberry/nebula/blackberry.key.cred b/hosts/blackberry/nebula/sourcephile.fr/blackberry.key.cred
similarity index 100%
rename from hosts/blackberry/nebula/blackberry.key.cred
rename to hosts/blackberry/nebula/sourcephile.fr/blackberry.key.cred

diff --git a/hosts/blackberry/nebula/blackberry.key.gpg b/hosts/blackberry/nebula/sourcephile.fr/blackberry.key.gpg
similarity index 100%
rename from hosts/blackberry/nebula/blackberry.key.gpg
rename to hosts/blackberry/nebula/sourcephile.fr/blackberry.key.gpg

diff --git a/hosts/blackberry/nebula/blackberry.pub b/hosts/blackberry/nebula/sourcephile.fr/blackberry.pub
similarity index 100%
rename from hosts/blackberry/nebula/blackberry.pub
rename to hosts/blackberry/nebula/sourcephile.fr/blackberry.pub

diff --git a/hosts/courge/nebula.nix b/hosts/courge/nebula.nix
index 0c3123b01b7a2041e9f92493a50293e5cb92b154..4f5db9da88941dc5fb7501d075e6cd59caa75da0 100644 (file)
--- a/hosts/courge/nebula.nix
+++ b/hosts/courge/nebula.nix
@@ -5,7 +5,7 @@ let
 in
 {
   imports = [
-    ../../share/nebula/sourcephile.fr.nix
+    ../../domains/sourcephile.fr/nebula.nix
   ];
   services.nebula.networks.${domain} = {
     listen.port = 10007;

diff --git a/hosts/courge/nebula/sourcephile.fr/courge.crt b/hosts/courge/nebula/sourcephile.fr/courge.crt
new file mode 100644 (file)
index 0000000..96ce14f
Binary files /dev/null and b/hosts/courge/nebula/sourcephile.fr/courge.crt differ

diff --git a/hosts/courge/nebula/courge.key.cred b/hosts/courge/nebula/sourcephile.fr/courge.key.cred
similarity index 100%
rename from hosts/courge/nebula/courge.key.cred
rename to hosts/courge/nebula/sourcephile.fr/courge.key.cred

diff --git a/hosts/courge/nebula/courge.key.gpg b/hosts/courge/nebula/sourcephile.fr/courge.key.gpg
similarity index 100%
rename from hosts/courge/nebula/courge.key.gpg
rename to hosts/courge/nebula/sourcephile.fr/courge.key.gpg

diff --git a/hosts/courge/nebula/courge.pub b/hosts/courge/nebula/sourcephile.fr/courge.pub
similarity index 100%
rename from hosts/courge/nebula/courge.pub
rename to hosts/courge/nebula/sourcephile.fr/courge.pub

diff --git a/hosts/oignon/nebula.nix b/hosts/oignon/nebula.nix
index cdbbf34228a8d121b99d809d455805bfc7556c99..abd9dab53a888850c1640a83e1d1af501825141a 100644 (file)
--- a/hosts/oignon/nebula.nix
+++ b/hosts/oignon/nebula.nix
@@ -5,7 +5,7 @@ let
 in
 {
   imports = [
-    ../../share/nebula/sourcephile.fr.nix
+    ../../domains/sourcephile.fr/nebula.nix
   ];
   services.nebula.networks.${domain} = {
     listen.port = 10003;

diff --git a/hosts/oignon/nebula/sourcephile.fr/oignon.crt b/hosts/oignon/nebula/sourcephile.fr/oignon.crt
new file mode 100644 (file)
index 0000000..0cd34aa
Binary files /dev/null and b/hosts/oignon/nebula/sourcephile.fr/oignon.crt differ

diff --git a/hosts/oignon/nebula/oignon.key.cred b/hosts/oignon/nebula/sourcephile.fr/oignon.key.cred
similarity index 100%
rename from hosts/oignon/nebula/oignon.key.cred
rename to hosts/oignon/nebula/sourcephile.fr/oignon.key.cred

diff --git a/hosts/oignon/nebula/oignon.key.gpg b/hosts/oignon/nebula/sourcephile.fr/oignon.key.gpg
similarity index 100%
rename from hosts/oignon/nebula/oignon.key.gpg
rename to hosts/oignon/nebula/sourcephile.fr/oignon.key.gpg

diff --git a/hosts/oignon/nebula/oignon.pub b/hosts/oignon/nebula/sourcephile.fr/oignon.pub
similarity index 100%
rename from hosts/oignon/nebula/oignon.pub
rename to hosts/oignon/nebula/sourcephile.fr/oignon.pub

diff --git a/hosts/patate/nebula.nix b/hosts/patate/nebula.nix
index 5719b5f53208ba8c60485c69fa08e2d301265281..9ca4f32928d9a8a47e36f753e74d1197d3da2160 100644 (file)
--- a/hosts/patate/nebula.nix
+++ b/hosts/patate/nebula.nix
@@ -5,7 +5,7 @@ let
 in
 {
   imports = [
-    ../../share/nebula/sourcephile.fr.nix
+    ../../domains/sourcephile.fr/nebula.nix
   ];
   services.nebula.networks.${domain} = {
     listen.port = 10004;

diff --git a/share/nebula/sourcephile.fr/patate.crt b/hosts/patate/nebula/sourcephile.fr/patate.crt
similarity index 100%
rename from share/nebula/sourcephile.fr/patate.crt
rename to hosts/patate/nebula/sourcephile.fr/patate.crt

diff --git a/hosts/patate/nebula/patate.key.cred b/hosts/patate/nebula/sourcephile.fr/patate.key.cred
similarity index 100%
rename from hosts/patate/nebula/patate.key.cred
rename to hosts/patate/nebula/sourcephile.fr/patate.key.cred

diff --git a/hosts/patate/nebula/patate.key.gpg b/hosts/patate/nebula/sourcephile.fr/patate.key.gpg
similarity index 100%
rename from hosts/patate/nebula/patate.key.gpg
rename to hosts/patate/nebula/sourcephile.fr/patate.key.gpg

diff --git a/hosts/patate/nebula/patate.pub b/hosts/patate/nebula/sourcephile.fr/patate.pub
similarity index 100%
rename from hosts/patate/nebula/patate.pub
rename to hosts/patate/nebula/sourcephile.fr/patate.pub

diff --git a/share/.gitattributes b/share/.gitattributes
deleted file mode 100644 (file)
index e739d41..0000000
--- a/share/.gitattributes
+++ /dev/null
@@ -1,7 +0,0 @@
-*.clear    filter=git-crypt-share diff=git-crypt-share
-*.cred     filter=git-crypt-share diff=git-crypt-share
-*.gpg      filter=git-crypt-share diff=git-crypt-share
-*.pem      filter=git-crypt-share diff=git-crypt-share
-*.pub      filter=git-crypt-share diff=git-crypt-share
-*.crt      filter=git-crypt-share diff=git-crypt-share
-.gpg-id    filter=git-crypt-share diff=git-crypt-share

diff --git a/share/nebula/sourcephile.fr/aubergine.crt b/share/nebula/sourcephile.fr/aubergine.crt
deleted file mode 100644 (file)
index 494a805..0000000
--- a/share/nebula/sourcephile.fr/aubergine.crt
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN NEBULA CERTIFICATE-----
-CokBChhhdWJlcmdpbmUuc291cmNlcGhpbGUuZnISCYaAgFCAgPz/DyILc291cmNl
-cGhpbGUiBWludHJhKLWO3K8GMO/ouI8SOiAccxX8Jzi9FI2e/Yh5VkURDdELD4Nf
-nHrUlz/g7zSDW0ogT12XQtGmo1KYFJld9fyI2ODJNOU53FVGucTkOsv4w+MSQOjA
-LfKVl+3/oc+n4dAcfL8pShHYjhMLjBQYEUko8ULDvva+3pBMu3krz+vd1r87AKTI
-m3PUaTpgoGERoiNUXAc=
------END NEBULA CERTIFICATE-----

diff --git a/share/nebula/sourcephile.fr/blackberry.crt b/share/nebula/sourcephile.fr/blackberry.crt
deleted file mode 100644 (file)
index fc3452a..0000000
--- a/share/nebula/sourcephile.fr/blackberry.crt
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN NEBULA CERTIFICATE-----
-CooBChlibGFja2JlcnJ5LnNvdXJjZXBoaWxlLmZyEgmIgIBQgID8/w8iC3NvdXJj
-ZXBoaWxlIgVpbnRyYSj1g/i1BjDv6LiPEjogx+muhsdSLTpROSA5kOcRpWSACdW7
-90+ue4gxz7wSPVhKIE9dl0LRpqNSmBSZXfX8iNjgyTTlOdxVRrnE5DrL+MPjEkBu
-HbCVxDIxAAALUPFKBdmEk4xcQwAfWqOr3EQSDGF1KKBsVv7Hq10REcPySLchivrR
-CjKWCKUA6rYrr3FUyWYK
------END NEBULA CERTIFICATE-----

diff --git a/share/nebula/sourcephile.fr/ca.crt b/share/nebula/sourcephile.fr/ca.crt
deleted file mode 100644 (file)
index b4250bf..0000000
--- a/share/nebula/sourcephile.fr/ca.crt
+++ /dev/null
@@ -1,5 +0,0 @@
------BEGIN NEBULA CERTIFICATE-----
-CkAKDnNvdXJjZXBoaWxlLmZyKPCs2K8GMPDouI8SOiD4GC2UVf1R5eLLNEFlmHof
-sp4byvgQMM59Ri2wnbHvYUABEkBX2XOp6Pcnc4PuYqsHCHK7Tq4IcpFrBx5HfnRB
-/glWVOZ0Hi+ArCpAhmmB1eKUoFipLHNSi9LzWoCx76Phcx8H
------END NEBULA CERTIFICATE-----

diff --git a/share/nebula/sourcephile.fr/courge.crt b/share/nebula/sourcephile.fr/courge.crt
deleted file mode 100644 (file)
index 6311cba..0000000
--- a/share/nebula/sourcephile.fr/courge.crt
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN NEBULA CERTIFICATE-----
-CoYBChVjb3VyZ2Uuc291cmNlcGhpbGUuZnISCYeAgFCAgPz/DyILc291cmNlcGhp
-bGUiBWludHJhKPiE3q8GMO/ouI8SOiCdZFVrNr9Ah4qHKcdbqwZBsShwfNYDVfuQ
-OS4BI9LASEogT12XQtGmo1KYFJld9fyI2ODJNOU53FVGucTkOsv4w+MSQP9BwoV6
-2YaWOU5rAZgkykk3+4MqXttJXO5qiKEb677N201Y4S0FoCHKYZQSfhqBNBaZlB1q
-ZZW9kNEJpEfalQ0=
------END NEBULA CERTIFICATE-----

diff --git a/share/nebula/sourcephile.fr/oignon.crt b/share/nebula/sourcephile.fr/oignon.crt
deleted file mode 100644 (file)
index 28c77ea..0000000
--- a/share/nebula/sourcephile.fr/oignon.crt
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN NEBULA CERTIFICATE-----
-CoYBChVvaWdub24uc291cmNlcGhpbGUuZnISCYOAgFCAgPz/DyILc291cmNlcGhp
-bGUiBWludHJhKPyd2a8GMO/ouI8SOiDHOKijOiCGarZ3vs5L9FFx2p+KRuOSRdpu
-6TrD+X8yFEogT12XQtGmo1KYFJld9fyI2ODJNOU53FVGucTkOsv4w+MSQGO+sm1Q
-tCt+mvE7KTuwPfxHZeBr3NF4FbFeQ/m3Lp2BxfLABc8ApbVtN1PmZYCeZxaQDVZe
-/SItzcNjsNGa0A8=
------END NEBULA CERTIFICATE-----