From b2f7c3c3b413d83966121978ea0d177068cfb82f Mon Sep 17 00:00:00 2001 From: Freya Murphy Date: Mon, 9 Dec 2024 09:23:43 -0500 Subject: refactor keys/certs into new `files` folder --- certs/freya_ca.crt | 11 ----------- certs/freya_intermediate.crt | 12 ------------ certs/tinternet.crt | 13 ------------- files/certs/freya_ca.crt | 11 +++++++++++ files/certs/freya_intermediate.crt | 12 ++++++++++++ files/certs/tinternet.crt | 13 +++++++++++++ files/keys/freya-gpg.pub | 28 ++++++++++++++++++++++++++++ files/keys/freya-ssh.pub | 1 + files/keys/nonguix.pub | 6 ++++++ files/keys/sakura.pub | 6 ++++++ home/home.scm | 2 +- keys/freya-gpg.pub | 28 ---------------------------- keys/freya-ssh.pub | 1 - keys/nonguix.pub | 6 ------ keys/sakura.pub | 6 ------ modules/freya/certs.scm | 2 +- modules/freya/system.scm | 8 ++++---- 17 files changed, 83 insertions(+), 83 deletions(-) delete mode 100644 certs/freya_ca.crt delete mode 100644 certs/freya_intermediate.crt delete mode 100644 certs/tinternet.crt create mode 100644 files/certs/freya_ca.crt create mode 100644 files/certs/freya_intermediate.crt create mode 100644 files/certs/tinternet.crt create mode 100644 files/keys/freya-gpg.pub create mode 100644 files/keys/freya-ssh.pub create mode 100644 files/keys/nonguix.pub create mode 100644 files/keys/sakura.pub delete mode 100644 keys/freya-gpg.pub delete mode 100644 keys/freya-ssh.pub delete mode 100644 keys/nonguix.pub delete mode 100644 keys/sakura.pub diff --git a/certs/freya_ca.crt b/certs/freya_ca.crt deleted file mode 100644 index bc0d55a..0000000 --- a/certs/freya_ca.crt +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBnDCCAUKgAwIBAgIRAPVH+EAJd7BV1oocsZ1LQLEwCgYIKoZIzj0EAwIwLDEQ -MA4GA1UEChMHZnJleWFDQTEYMBYGA1UEAxMPZnJleWFDQSBSb290IENBMB4XDTIz -MTAyODEzNDAzNVoXDTMzMTAyNTEzNDAzNVowLDEQMA4GA1UEChMHZnJleWFDQTEY -MBYGA1UEAxMPZnJleWFDQSBSb290IENBMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD -QgAEvVC5H2UQZQxMJxKnWkNF7kKNXVDpY2N81yFXRb+K/MKw3aQTI1ukJ6A3AmZP -P9urbt/wOHI2zBuodGi4gaLBSaNFMEMwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB -/wQIMAYBAf8CAQEwHQYDVR0OBBYEFGYaattGlZxu5noFWxAnLtpMqJvJMAoGCCqG -SM49BAMCA0gAMEUCIQCCyubbf8AUq+PPrnBRQ/WFYKH3mwUXcDT7VZoLm+/q+gIg -YdSLl4AnWfDLlaTTZspft2fq5rEFCB5N+4p/67vSsmY= ------END CERTIFICATE----- diff --git a/certs/freya_intermediate.crt b/certs/freya_intermediate.crt deleted file mode 100644 index 1313322..0000000 --- a/certs/freya_intermediate.crt +++ /dev/null @@ -1,12 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBxjCCAWugAwIBAgIRAKDzyQOSQ6q84fqZBGlmZQ8wCgYIKoZIzj0EAwIwLDEQ -MA4GA1UEChMHZnJleWFDQTEYMBYGA1UEAxMPZnJleWFDQSBSb290IENBMB4XDTIz -MTAyODEzNDAzNloXDTMzMTAyNTEzNDAzNlowNDEQMA4GA1UEChMHZnJleWFDQTEg -MB4GA1UEAxMXZnJleWFDQSBJbnRlcm1lZGlhdGUgQ0EwWTATBgcqhkjOPQIBBggq -hkjOPQMBBwNCAAQnCVugNyAxPBHS8jiF5mJmUvFUbYSL5OWzkSCMjac3FXwLTqe8 -AxPga5jHATf2Kt7laq5BYm7jB4M+TcJsdM3Mo2YwZDAOBgNVHQ8BAf8EBAMCAQYw -EgYDVR0TAQH/BAgwBgEB/wIBADAdBgNVHQ4EFgQUbDJYRGXitoGNJ9r+vbJp0lU5 -4VgwHwYDVR0jBBgwFoAUZhpq20aVnG7megVbECcu2kyom8kwCgYIKoZIzj0EAwID -SQAwRgIhAOZHh1skE3xE9NHpTQS8cUqiJ+cBLwcIGUguKOUf5hj9AiEA3IoFdhsO -hAErELhLd5FM3Yxl3j/TzHslvsD4QyeNhG4= ------END CERTIFICATE----- diff --git a/certs/tinternet.crt b/certs/tinternet.crt deleted file mode 100644 index ddafb1c..0000000 --- a/certs/tinternet.crt +++ /dev/null @@ -1,13 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIB0DCCAXagAwIBAgIRAKk5OC0K/5fULwXrMQuONpIwCgYIKoZIzj0EAwIwRjEd -MBsGA1UEChMUQ2VydGlmaWNhdGVBdXRob3JpdHkxJTAjBgNVBAMTHENlcnRpZmlj -YXRlQXV0aG9yaXR5IFJvb3QgQ0EwHhcNMjMxMTA0MDIwMzU1WhcNMzMxMTAxMDIw -MzU1WjBGMR0wGwYDVQQKExRDZXJ0aWZpY2F0ZUF1dGhvcml0eTElMCMGA1UEAxMc -Q2VydGlmaWNhdGVBdXRob3JpdHkgUm9vdCBDQTBZMBMGByqGSM49AgEGCCqGSM49 -AwEHA0IABKZzRX5AdjTTzkPr3tUw4SiTYI85sDsrvh7qWCSY70htRk/ldo3q1C3+ -Y1h11ZHha9niYPFEQbAyvupM8nw2hrejRTBDMA4GA1UdDwEB/wQEAwIBBjASBgNV -HRMBAf8ECDAGAQH/AgEBMB0GA1UdDgQWBBRPy7zJUi60Mx1uvJVL9rD8+XK+3jAK -BggqhkjOPQQDAgNIADBFAiEAsA5ha5E/pv4UBdIX0XmYqk905hch9YkM0aM1idXK -2/QCIDQMv88O698/domTyYnIHi2qoSyEl3aKTbntgGE/CNHj ------END CERTIFICATE----- - diff --git a/files/certs/freya_ca.crt b/files/certs/freya_ca.crt new file mode 100644 index 0000000..bc0d55a --- /dev/null +++ b/files/certs/freya_ca.crt @@ -0,0 +1,11 @@ +-----BEGIN CERTIFICATE----- +MIIBnDCCAUKgAwIBAgIRAPVH+EAJd7BV1oocsZ1LQLEwCgYIKoZIzj0EAwIwLDEQ +MA4GA1UEChMHZnJleWFDQTEYMBYGA1UEAxMPZnJleWFDQSBSb290IENBMB4XDTIz +MTAyODEzNDAzNVoXDTMzMTAyNTEzNDAzNVowLDEQMA4GA1UEChMHZnJleWFDQTEY +MBYGA1UEAxMPZnJleWFDQSBSb290IENBMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD +QgAEvVC5H2UQZQxMJxKnWkNF7kKNXVDpY2N81yFXRb+K/MKw3aQTI1ukJ6A3AmZP +P9urbt/wOHI2zBuodGi4gaLBSaNFMEMwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB +/wQIMAYBAf8CAQEwHQYDVR0OBBYEFGYaattGlZxu5noFWxAnLtpMqJvJMAoGCCqG +SM49BAMCA0gAMEUCIQCCyubbf8AUq+PPrnBRQ/WFYKH3mwUXcDT7VZoLm+/q+gIg +YdSLl4AnWfDLlaTTZspft2fq5rEFCB5N+4p/67vSsmY= +-----END CERTIFICATE----- diff --git a/files/certs/freya_intermediate.crt b/files/certs/freya_intermediate.crt new file mode 100644 index 0000000..1313322 --- /dev/null +++ b/files/certs/freya_intermediate.crt @@ -0,0 +1,12 @@ +-----BEGIN CERTIFICATE----- +MIIBxjCCAWugAwIBAgIRAKDzyQOSQ6q84fqZBGlmZQ8wCgYIKoZIzj0EAwIwLDEQ +MA4GA1UEChMHZnJleWFDQTEYMBYGA1UEAxMPZnJleWFDQSBSb290IENBMB4XDTIz +MTAyODEzNDAzNloXDTMzMTAyNTEzNDAzNlowNDEQMA4GA1UEChMHZnJleWFDQTEg +MB4GA1UEAxMXZnJleWFDQSBJbnRlcm1lZGlhdGUgQ0EwWTATBgcqhkjOPQIBBggq +hkjOPQMBBwNCAAQnCVugNyAxPBHS8jiF5mJmUvFUbYSL5OWzkSCMjac3FXwLTqe8 +AxPga5jHATf2Kt7laq5BYm7jB4M+TcJsdM3Mo2YwZDAOBgNVHQ8BAf8EBAMCAQYw +EgYDVR0TAQH/BAgwBgEB/wIBADAdBgNVHQ4EFgQUbDJYRGXitoGNJ9r+vbJp0lU5 +4VgwHwYDVR0jBBgwFoAUZhpq20aVnG7megVbECcu2kyom8kwCgYIKoZIzj0EAwID +SQAwRgIhAOZHh1skE3xE9NHpTQS8cUqiJ+cBLwcIGUguKOUf5hj9AiEA3IoFdhsO +hAErELhLd5FM3Yxl3j/TzHslvsD4QyeNhG4= +-----END CERTIFICATE----- diff --git a/files/certs/tinternet.crt b/files/certs/tinternet.crt new file mode 100644 index 0000000..ddafb1c --- /dev/null +++ b/files/certs/tinternet.crt @@ -0,0 +1,13 @@ +-----BEGIN CERTIFICATE----- +MIIB0DCCAXagAwIBAgIRAKk5OC0K/5fULwXrMQuONpIwCgYIKoZIzj0EAwIwRjEd +MBsGA1UEChMUQ2VydGlmaWNhdGVBdXRob3JpdHkxJTAjBgNVBAMTHENlcnRpZmlj +YXRlQXV0aG9yaXR5IFJvb3QgQ0EwHhcNMjMxMTA0MDIwMzU1WhcNMzMxMTAxMDIw +MzU1WjBGMR0wGwYDVQQKExRDZXJ0aWZpY2F0ZUF1dGhvcml0eTElMCMGA1UEAxMc +Q2VydGlmaWNhdGVBdXRob3JpdHkgUm9vdCBDQTBZMBMGByqGSM49AgEGCCqGSM49 +AwEHA0IABKZzRX5AdjTTzkPr3tUw4SiTYI85sDsrvh7qWCSY70htRk/ldo3q1C3+ +Y1h11ZHha9niYPFEQbAyvupM8nw2hrejRTBDMA4GA1UdDwEB/wQEAwIBBjASBgNV +HRMBAf8ECDAGAQH/AgEBMB0GA1UdDgQWBBRPy7zJUi60Mx1uvJVL9rD8+XK+3jAK +BggqhkjOPQQDAgNIADBFAiEAsA5ha5E/pv4UBdIX0XmYqk905hch9YkM0aM1idXK +2/QCIDQMv88O698/domTyYnIHi2qoSyEl3aKTbntgGE/CNHj +-----END CERTIFICATE----- + diff --git a/files/keys/freya-gpg.pub b/files/keys/freya-gpg.pub new file mode 100644 index 0000000..0799334 --- /dev/null +++ b/files/keys/freya-gpg.pub @@ -0,0 +1,28 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mDMEZbQvBxYJKwYBBAHaRw8BAQdA5eYxL7ktSaA/mGdbx6zaVhWkLERUaG0HQ5zQ +7bpTDZG0IUZyZXlhIE11cnBoeSA8ZnJleWFAZnJleWFjYXQub3JnPoiTBBMWCgA7 +FiEEtz9qPIOzjJAzl4DgXWf0mYN7HWAFAmW0LwcCGwEFCwkIBwICIgIGFQoJCAsC +BBYCAwECHgcCF4AACgkQXWf0mYN7HWDRmQEAjcQePcl5UQ1IcSg6tPCnezsIA23S +LH7e3UEVnpecagoA/jcsKimfz5td2PH86FNtCLtvMFq1ztzrw7UqCQBXiiUHmDME +ZxpY/BYJKwYBBAHaRw8BAQdAqxOoScBHGwsgHibO5NYxkl5f8QeIXsIFAM20KVM/ +Uo+0IUZyZXlhIE11cnBoeSA8ZnJleWFAZnJleWFjYXQub3JnPoiQBBMWCAA4FiEE +2a8KQgm3wt4RqIS/rLxVNmDZmT0FAmcaWPwCGwEFCwkIBwIGFQoJCAsCBBYCAwEC +HgECF4AACgkQrLxVNmDZmT17+gEA2QbrA+SQmgAtEwgdlQSRsdK8tfboTBnjeW9T +2j3ArW4BAJetX+1Q6pPXP4FLfZOz0Vu46JCy4DDGS37B89bmgrMOuDMEZxpZzRYJ +KwYBBAHaRw8BAQdAWf1SdS6rK+hXbEcjb0jy+bO9cDhna1khYRbsKcSDqfiI9QQY +FggAJhYhBNmvCkIJt8LeEaiEv6y8VTZg2Zk9BQJnGlnNAhsCBQkFo5qAAIEJEKy8 +VTZg2Zk9diAEGRYIAB0WIQQ802XwNzzrE4U69WifvG/9bS2/FwUCZxpZzQAKCRCf +vG/9bS2/F2DHAQD11yHJC5VlyNtgPyA9SYI0M8clQjldB7O29v8gRGzbIgD/U4Sm +GnuRk2js5ITMmBdG1RGzEmmD1dVNIGGM4FiWdg/fSgEAy6dq/LVYeFRkMJ+Vbb0E +gFD7SnB/PNfrgtR6VS2KWCYA/1v6bblMoT5rNjcSt0i88SPo9n8CXDui1TOoPwLg +21EEuDMEZxpZ5hYJKwYBBAHaRw8BAQdA9NmEhp63hLFv2ftb8sl7OpvleaABdbON +L3TutR166SqIfgQYFggAJhYhBNmvCkIJt8LeEaiEv6y8VTZg2Zk9BQJnGlnmAhsg +BQkFo5qAAAoJEKy8VTZg2Zk9iQkA/iUIRSGElTdKPALKQ9Laf3xgsreEYE25zdAJ +VtvDXd/MAP4/vjrNyFw6k7EPrIx+i9Stw6hPxChH9SwgjcgZdCjWB7g4BGcaWhcS +CisGAQQBl1UBBQEBB0B3JswDVPoc4B5BRt+XNZ4Y+2cT+mzJwBvEeqdkgrJHTgMB +CAeIfgQYFggAJhYhBNmvCkIJt8LeEaiEv6y8VTZg2Zk9BQJnGloXAhsMBQkFo5qA +AAoJEKy8VTZg2Zk9rCIBALM+gv1wcpOzK1AHj2Nx+40Yf3Y3en7Py93lDK/iyWOo +AQCP9rp0XHMqNjiPStbV+cX9dgJym0L6tpuw55sSpWyIDg== +=fQIe +-----END PGP PUBLIC KEY BLOCK----- diff --git a/files/keys/freya-ssh.pub b/files/keys/freya-ssh.pub new file mode 100644 index 0000000..fab26a7 --- /dev/null +++ b/files/keys/freya-ssh.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPTZhIaet4Sxb9n7W/LJezqb5XmgAXWzjS907rUdeukq cardno:24 409 474 diff --git a/files/keys/nonguix.pub b/files/keys/nonguix.pub new file mode 100644 index 0000000..32ddac6 --- /dev/null +++ b/files/keys/nonguix.pub @@ -0,0 +1,6 @@ +(public-key + (ecc + (curve Ed25519) + (q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#) + ) + ) diff --git a/files/keys/sakura.pub b/files/keys/sakura.pub new file mode 100644 index 0000000..9fb52ae --- /dev/null +++ b/files/keys/sakura.pub @@ -0,0 +1,6 @@ +(public-key + (ecc + (curve Ed25519) + (q #3E9614FD06AF20F9534DA0DE64FB9004878789744F26FFF2FF381E2EED1DEAC9#) + ) + ) diff --git a/home/home.scm b/home/home.scm index 5e6a445..72b1d05 100644 --- a/home/home.scm +++ b/home/home.scm @@ -182,7 +182,7 @@ (".gtkrc-2.0" ,(local-file "config/gtk/gtk-2.0/settings")) (".local/share/fonts" ,(local-file "local/fonts" #:recursive? #t)) (".local/share/dbus-1/services" ,(local-file "local/dbus/services" #:recursive? #t)) - (".mozilla/certificates" ,(local-file "../certs" #:recursive? #t)) + (".mozilla/certificates" ,(local-file "../files/certs" #:recursive? #t)) (".nix-channels" ,(local-file "nix/nix-channels")) (".gitconfig" ,(local-file "config/git/gitconfig")))) diff --git a/keys/freya-gpg.pub b/keys/freya-gpg.pub deleted file mode 100644 index 0799334..0000000 --- a/keys/freya-gpg.pub +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -mDMEZbQvBxYJKwYBBAHaRw8BAQdA5eYxL7ktSaA/mGdbx6zaVhWkLERUaG0HQ5zQ -7bpTDZG0IUZyZXlhIE11cnBoeSA8ZnJleWFAZnJleWFjYXQub3JnPoiTBBMWCgA7 -FiEEtz9qPIOzjJAzl4DgXWf0mYN7HWAFAmW0LwcCGwEFCwkIBwICIgIGFQoJCAsC -BBYCAwECHgcCF4AACgkQXWf0mYN7HWDRmQEAjcQePcl5UQ1IcSg6tPCnezsIA23S -LH7e3UEVnpecagoA/jcsKimfz5td2PH86FNtCLtvMFq1ztzrw7UqCQBXiiUHmDME -ZxpY/BYJKwYBBAHaRw8BAQdAqxOoScBHGwsgHibO5NYxkl5f8QeIXsIFAM20KVM/ -Uo+0IUZyZXlhIE11cnBoeSA8ZnJleWFAZnJleWFjYXQub3JnPoiQBBMWCAA4FiEE -2a8KQgm3wt4RqIS/rLxVNmDZmT0FAmcaWPwCGwEFCwkIBwIGFQoJCAsCBBYCAwEC -HgECF4AACgkQrLxVNmDZmT17+gEA2QbrA+SQmgAtEwgdlQSRsdK8tfboTBnjeW9T -2j3ArW4BAJetX+1Q6pPXP4FLfZOz0Vu46JCy4DDGS37B89bmgrMOuDMEZxpZzRYJ -KwYBBAHaRw8BAQdAWf1SdS6rK+hXbEcjb0jy+bO9cDhna1khYRbsKcSDqfiI9QQY -FggAJhYhBNmvCkIJt8LeEaiEv6y8VTZg2Zk9BQJnGlnNAhsCBQkFo5qAAIEJEKy8 -VTZg2Zk9diAEGRYIAB0WIQQ802XwNzzrE4U69WifvG/9bS2/FwUCZxpZzQAKCRCf -vG/9bS2/F2DHAQD11yHJC5VlyNtgPyA9SYI0M8clQjldB7O29v8gRGzbIgD/U4Sm -GnuRk2js5ITMmBdG1RGzEmmD1dVNIGGM4FiWdg/fSgEAy6dq/LVYeFRkMJ+Vbb0E -gFD7SnB/PNfrgtR6VS2KWCYA/1v6bblMoT5rNjcSt0i88SPo9n8CXDui1TOoPwLg -21EEuDMEZxpZ5hYJKwYBBAHaRw8BAQdA9NmEhp63hLFv2ftb8sl7OpvleaABdbON -L3TutR166SqIfgQYFggAJhYhBNmvCkIJt8LeEaiEv6y8VTZg2Zk9BQJnGlnmAhsg -BQkFo5qAAAoJEKy8VTZg2Zk9iQkA/iUIRSGElTdKPALKQ9Laf3xgsreEYE25zdAJ -VtvDXd/MAP4/vjrNyFw6k7EPrIx+i9Stw6hPxChH9SwgjcgZdCjWB7g4BGcaWhcS -CisGAQQBl1UBBQEBB0B3JswDVPoc4B5BRt+XNZ4Y+2cT+mzJwBvEeqdkgrJHTgMB -CAeIfgQYFggAJhYhBNmvCkIJt8LeEaiEv6y8VTZg2Zk9BQJnGloXAhsMBQkFo5qA -AAoJEKy8VTZg2Zk9rCIBALM+gv1wcpOzK1AHj2Nx+40Yf3Y3en7Py93lDK/iyWOo -AQCP9rp0XHMqNjiPStbV+cX9dgJym0L6tpuw55sSpWyIDg== -=fQIe ------END PGP PUBLIC KEY BLOCK----- diff --git a/keys/freya-ssh.pub b/keys/freya-ssh.pub deleted file mode 100644 index fab26a7..0000000 --- a/keys/freya-ssh.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPTZhIaet4Sxb9n7W/LJezqb5XmgAXWzjS907rUdeukq cardno:24 409 474 diff --git a/keys/nonguix.pub b/keys/nonguix.pub deleted file mode 100644 index 32ddac6..0000000 --- a/keys/nonguix.pub +++ /dev/null @@ -1,6 +0,0 @@ -(public-key - (ecc - (curve Ed25519) - (q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#) - ) - ) diff --git a/keys/sakura.pub b/keys/sakura.pub deleted file mode 100644 index 9fb52ae..0000000 --- a/keys/sakura.pub +++ /dev/null @@ -1,6 +0,0 @@ -(public-key - (ecc - (curve Ed25519) - (q #3E9614FD06AF20F9534DA0DE64FB9004878789744F26FFF2FF381E2EED1DEAC9#) - ) - ) diff --git a/modules/freya/certs.scm b/modules/freya/certs.scm index 9ba1fa2..71fa1bd 100644 --- a/modules/freya/certs.scm +++ b/modules/freya/certs.scm @@ -13,7 +13,7 @@ (package (name "freya-ca-certs") (version "1") - (source (local-file "../../certs" + (source (local-file "../../files/certs" #:recursive? #t)) (build-system trivial-build-system) (license license:mpl2.0) diff --git a/modules/freya/system.scm b/modules/freya/system.scm index 03f67b4..002a910 100644 --- a/modules/freya/system.scm +++ b/modules/freya/system.scm @@ -220,8 +220,8 @@ (service openssh-service-type (openssh-configuration (authorized-keys - `(("freya" ,(local-file "../../keys/freya-ssh.pub")) - ("root" ,(local-file "../../keys/freya-ssh.pub")))) + `(("freya" ,(local-file "../../files/keys/freya-ssh.pub")) + ("root" ,(local-file "../../files/keys/freya-ssh.pub")))) (permit-root-login #t) (allow-empty-passwords? #t) (password-authentication? #f) @@ -238,8 +238,8 @@ "https://substitutes.freya.cat") %default-substitute-urls)) (authorized-keys - (append (list (local-file "../../keys/nonguix.pub") - (local-file "../../keys/sakura.pub")) + (append (list (local-file "../../files/keys/nonguix.pub") + (local-file "../../files/keys/sakura.pub")) %default-authorized-guix-keys))))))) (define-public %desktop-freya-services -- cgit v1.2.3-freya