Compare commits

..

No commits in common. "f027fc10c626ddef476e5545a3286939a8391af4" and "30ea33079a567d76f50a4de0e3072f98acfa14e8" have entirely different histories.

8 changed files with 38 additions and 30 deletions

View file

@ -10,11 +10,12 @@
./syncthing.nix ./syncthing.nix
./users.nix ./users.nix
./writefreely.nix ./writefreely.nix
./renawiki.nix
./email.nix ./email.nix
./forgejo.nix ./forgejo.nix
]; ];
services.nginx.virtualHosts."lelgenio.com" = { services.nginx.virtualHosts."lelgenio.xyz" = {
enableACME = true; enableACME = true;
forceSSL = true; forceSSL = true;
root = pkgs.runCommand "www-dir" { } '' root = pkgs.runCommand "www-dir" { } ''
@ -50,7 +51,7 @@
dates = "04:40"; dates = "04:40";
operation = "switch"; operation = "switch";
flags = [ "--update-input" "nixpkgs" "--no-write-lock-file" "-L" ]; flags = [ "--update-input" "nixpkgs" "--no-write-lock-file" "-L" ];
flake = "git+https://git.lelgenio.com/lelgenio/nixos-config#phantom"; flake = "git+https://git.lelgenio.xyz/lelgenio/nixos-config#phantom";
}; };
system.stateVersion = "23.05"; # Never change this system.stateVersion = "23.05"; # Never change this

View file

@ -8,30 +8,20 @@
mailserver = { mailserver = {
enable = true; enable = true;
fqdn = "lelgenio.com"; fqdn = "lelgenio.xyz";
domains = [ domains = [
"lelgenio.xyz" "lelgenio.xyz"
"git.lelgenio.xyz" "git.lelgenio.xyz"
"lelgenio.com"
"git.lelgenio.com"
"social.lelgenio.com"
]; ];
certificateScheme = "acme-nginx"; certificateScheme = "acme-nginx";
# Create passwords with # Create passwords with
# nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt' # nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt'
loginAccounts = { loginAccounts = {
"lelgenio@lelgenio.com" = {
hashedPassword = "$2y$05$z5s7QCXcs5uTFsfyYpwNJeWzb3RmzgWxNgcPCr0zjSytkLFF/qZmS";
aliases = [ "postmaster@lelgenio.com" ];
};
"lelgenio@lelgenio.xyz" = { "lelgenio@lelgenio.xyz" = {
hashedPassword = "$2y$05$z5s7QCXcs5uTFsfyYpwNJeWzb3RmzgWxNgcPCr0zjSytkLFF/qZmS"; hashedPassword = "$2y$05$z5s7QCXcs5uTFsfyYpwNJeWzb3RmzgWxNgcPCr0zjSytkLFF/qZmS";
aliases = [ "postmaster@lelgenio.xyz" ]; aliases = [ "postmaster@lelgenio.xyz" ];
}; };
"noreply@git.lelgenio.com" = { "noreply@git.lelgenio.xyz" = {
hashedPassword = "$2b$05$TmR1R7ZwXfec7yrOfeBL7u3ZtyXf0up5dEO6uMWSvb/O7LPEm.j0.";
};
"noreply@social.lelgenio.com" = {
hashedPassword = "$2b$05$TmR1R7ZwXfec7yrOfeBL7u3ZtyXf0up5dEO6uMWSvb/O7LPEm.j0."; hashedPassword = "$2b$05$TmR1R7ZwXfec7yrOfeBL7u3ZtyXf0up5dEO6uMWSvb/O7LPEm.j0.";
}; };
}; };
@ -46,7 +36,7 @@
services.roundcube = { services.roundcube = {
enable = true; enable = true;
package = pkgs.roundcube.withPlugins (p: [ p.carddav ]); package = pkgs.roundcube.withPlugins (p: [ p.carddav ]);
hostName = "mail.lelgenio.com"; hostName = "mail.lelgenio.xyz";
extraConfig = '' extraConfig = ''
$config['smtp_host'] = "tls://${config.mailserver.fqdn}:587"; $config['smtp_host'] = "tls://${config.mailserver.fqdn}:587";
$config['smtp_user'] = "%u"; $config['smtp_user'] = "%u";

View file

@ -26,15 +26,15 @@ in
DEFAULT_ACTIONS_URL = "github"; DEFAULT_ACTIONS_URL = "github";
}; };
server = { server = {
DOMAIN = "git.lelgenio.com"; DOMAIN = "git.lelgenio.xyz";
HTTP_PORT = 3000; HTTP_PORT = 3000;
ROOT_URL = "https://${srv.DOMAIN}/"; ROOT_URL = "https://${srv.DOMAIN}/";
}; };
mailer = { mailer = {
ENABLED = true; ENABLED = true;
SMTP_ADDR = "mail.lelgenio.com"; SMTP_ADDR = "mail.lelgenio.xyz";
FROM = "noreply@git.lelgenio.com"; FROM = "noreply@git.lelgenio.xyz";
USER = "noreply@git.lelgenio.com"; USER = "noreply@git.lelgenio.xyz";
}; };
}; };
mailerPasswordFile = config.age.secrets.phantom-forgejo-mailer-password.path; mailerPasswordFile = config.age.secrets.phantom-forgejo-mailer-password.path;

View file

@ -2,14 +2,8 @@
services.mastodon = { services.mastodon = {
enable = true; enable = true;
configureNginx = true; configureNginx = true;
localDomain = "social.lelgenio.com"; localDomain = "social.lelgenio.xyz";
smtp = { smtp.fromAddress = "lelgenio@disroot.org";
authenticate = true;
host = "lelgenio.com";
fromAddress = "noreply@social.lelgenio.com";
user = "noreply@social.lelgenio.com";
passwordFile = config.age.secrets.phantom-forgejo-mailer-password.path;
};
streamingProcesses = 2; streamingProcesses = 2;
extraConfig.SINGLE_USER_MODE = "true"; extraConfig.SINGLE_USER_MODE = "true";
mediaAutoRemove.olderThanDays = 10; mediaAutoRemove.olderThanDays = 10;

View file

@ -2,7 +2,7 @@
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
package = pkgs.nextcloud27; package = pkgs.nextcloud27;
hostName = "cloud.lelgenio.com"; hostName = "cloud.lelgenio.xyz";
https = true; https = true;
config = { config = {
adminpassFile = config.age.secrets.phantom-nextcloud.path; adminpassFile = config.age.secrets.phantom-nextcloud.path;

View file

@ -0,0 +1,23 @@
{ config, pkgs, inputs, ... }: {
services.mediawiki = {
enable = true;
name = "Rena Wiki";
webserver = "nginx";
nginx.hostName = "renawiki.lelgenio.xyz";
passwordFile = config.age.secrets.phantom-renawiki.path;
extensions.VisualEditor = null;
};
services.nginx.virtualHosts."renawiki.lelgenio.xyz" = {
enableACME = true;
forceSSL = true;
};
age.secrets.phantom-renawiki = {
file = ../../secrets/phantom-renawiki.age;
mode = "400";
owner = "mediawiki";
};
}

View file

@ -7,7 +7,7 @@
openDefaultPorts = true; openDefaultPorts = true;
}; };
services.nginx.virtualHosts."syncthing.lelgenio.com" = { services.nginx.virtualHosts."syncthing.lelgenio.xyz" = {
enableACME = true; enableACME = true;
forceSSL = true; forceSSL = true;
locations."/" = { locations."/" = {

View file

@ -4,7 +4,7 @@
acme.enable = true; acme.enable = true;
nginx.enable = true; nginx.enable = true;
nginx.forceSSL = true; nginx.forceSSL = true;
host = "blog.lelgenio.com"; host = "blog.lelgenio.xyz";
admin.name = "lelgenio"; admin.name = "lelgenio";
admin.initialPasswordFile = config.age.secrets.phantom-writefreely.path; admin.initialPasswordFile = config.age.secrets.phantom-writefreely.path;
settings.app = { settings.app = {