From e4745d445d4fd4a282a7035699542df2cea1e0c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= <lelgenio@disroot.org>
Date: Sat, 11 May 2024 18:00:19 -0300
Subject: [PATCH] phantom: move from .xyz to .com
---
hosts/phantom/default.nix | 4 ++--
hosts/phantom/email.nix | 13 ++++++++++---
hosts/phantom/forgejo.nix | 8 ++++----
hosts/phantom/mastodon.nix | 2 +-
hosts/phantom/nextcloud.nix | 2 +-
hosts/phantom/syncthing.nix | 2 +-
hosts/phantom/writefreely.nix | 2 +-
7 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/hosts/phantom/default.nix b/hosts/phantom/default.nix
index 919e681..a0e99b7 100644
--- a/hosts/phantom/default.nix
+++ b/hosts/phantom/default.nix
@@ -14,7 +14,7 @@
./forgejo.nix
];
- services.nginx.virtualHosts."lelgenio.xyz" = {
+ services.nginx.virtualHosts."lelgenio.com" = {
enableACME = true;
forceSSL = true;
root = pkgs.runCommand "www-dir" { } ''
@@ -50,7 +50,7 @@
dates = "04:40";
operation = "switch";
flags = [ "--update-input" "nixpkgs" "--no-write-lock-file" "-L" ];
- flake = "git+https://git.lelgenio.xyz/lelgenio/nixos-config#phantom";
+ flake = "git+https://git.lelgenio.com/lelgenio/nixos-config#phantom";
};
system.stateVersion = "23.05"; # Never change this
diff --git a/hosts/phantom/email.nix b/hosts/phantom/email.nix
index e778de4..6c637be 100644
--- a/hosts/phantom/email.nix
+++ b/hosts/phantom/email.nix
@@ -8,20 +8,27 @@
mailserver = {
enable = true;
- fqdn = "lelgenio.xyz";
+ fqdn = "lelgenio.com";
domains = [
"lelgenio.xyz"
"git.lelgenio.xyz"
+ "lelgenio.com"
+ "git.lelgenio.com"
+ "social.lelgenio.com"
];
certificateScheme = "acme-nginx";
# Create passwords with
# nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt'
loginAccounts = {
+ "lelgenio@lelgenio.com" = {
+ hashedPassword = "$2y$05$z5s7QCXcs5uTFsfyYpwNJeWzb3RmzgWxNgcPCr0zjSytkLFF/qZmS";
+ aliases = [ "postmaster@lelgenio.com" ];
+ };
"lelgenio@lelgenio.xyz" = {
hashedPassword = "$2y$05$z5s7QCXcs5uTFsfyYpwNJeWzb3RmzgWxNgcPCr0zjSytkLFF/qZmS";
aliases = [ "postmaster@lelgenio.xyz" ];
};
- "noreply@git.lelgenio.xyz" = {
+ "noreply@git.lelgenio.com" = {
hashedPassword = "$2b$05$TmR1R7ZwXfec7yrOfeBL7u3ZtyXf0up5dEO6uMWSvb/O7LPEm.j0.";
};
};
@@ -36,7 +43,7 @@
services.roundcube = {
enable = true;
package = pkgs.roundcube.withPlugins (p: [ p.carddav ]);
- hostName = "mail.lelgenio.xyz";
+ hostName = "mail.lelgenio.com";
extraConfig = ''
$config['smtp_host'] = "tls://${config.mailserver.fqdn}:587";
$config['smtp_user'] = "%u";
diff --git a/hosts/phantom/forgejo.nix b/hosts/phantom/forgejo.nix
index 4e6327b..61f0a51 100644
--- a/hosts/phantom/forgejo.nix
+++ b/hosts/phantom/forgejo.nix
@@ -26,15 +26,15 @@ in
DEFAULT_ACTIONS_URL = "github";
};
server = {
- DOMAIN = "git.lelgenio.xyz";
+ DOMAIN = "git.lelgenio.com";
HTTP_PORT = 3000;
ROOT_URL = "https://${srv.DOMAIN}/";
};
mailer = {
ENABLED = true;
- SMTP_ADDR = "mail.lelgenio.xyz";
- FROM = "noreply@git.lelgenio.xyz";
- USER = "noreply@git.lelgenio.xyz";
+ SMTP_ADDR = "mail.lelgenio.com";
+ FROM = "noreply@git.lelgenio.com";
+ USER = "noreply@git.lelgenio.com";
};
};
mailerPasswordFile = config.age.secrets.phantom-forgejo-mailer-password.path;
diff --git a/hosts/phantom/mastodon.nix b/hosts/phantom/mastodon.nix
index adfaf0d..3deaee5 100644
--- a/hosts/phantom/mastodon.nix
+++ b/hosts/phantom/mastodon.nix
@@ -2,7 +2,7 @@
services.mastodon = {
enable = true;
configureNginx = true;
- localDomain = "social.lelgenio.xyz";
+ localDomain = "social.lelgenio.com";
smtp.fromAddress = "lelgenio@disroot.org";
streamingProcesses = 2;
extraConfig.SINGLE_USER_MODE = "true";
diff --git a/hosts/phantom/nextcloud.nix b/hosts/phantom/nextcloud.nix
index 5bddece..20c7173 100644
--- a/hosts/phantom/nextcloud.nix
+++ b/hosts/phantom/nextcloud.nix
@@ -2,7 +2,7 @@
services.nextcloud = {
enable = true;
package = pkgs.nextcloud27;
- hostName = "cloud.lelgenio.xyz";
+ hostName = "cloud.lelgenio.com";
https = true;
config = {
adminpassFile = config.age.secrets.phantom-nextcloud.path;
diff --git a/hosts/phantom/syncthing.nix b/hosts/phantom/syncthing.nix
index a971b86..55e4cbc 100644
--- a/hosts/phantom/syncthing.nix
+++ b/hosts/phantom/syncthing.nix
@@ -7,7 +7,7 @@
openDefaultPorts = true;
};
- services.nginx.virtualHosts."syncthing.lelgenio.xyz" = {
+ services.nginx.virtualHosts."syncthing.lelgenio.com" = {
enableACME = true;
forceSSL = true;
locations."/" = {
diff --git a/hosts/phantom/writefreely.nix b/hosts/phantom/writefreely.nix
index 6a2652e..3530e06 100644
--- a/hosts/phantom/writefreely.nix
+++ b/hosts/phantom/writefreely.nix
@@ -4,7 +4,7 @@
acme.enable = true;
nginx.enable = true;
nginx.forceSSL = true;
- host = "blog.lelgenio.xyz";
+ host = "blog.lelgenio.com";
admin.name = "lelgenio";
admin.initialPasswordFile = config.age.secrets.phantom-writefreely.path;
settings.app = {