Added simple website; removed transfer-sh; Cleaned up code from mail.
This commit is contained in:
Jurn Wubben
parent
f07a1852b5
commit
1495d308dd
5 changed files with 124 additions and 137 deletions
|
|
@ -1,4 +1,4 @@
|
||||||
{lib, ...}: {
|
{lib, ...}: {
|
||||||
imports = [./caddy.nix ./transfer-sh.nix ./seafile.nix ./bot.nix ./immich.nix ./matrix.nix ./mail.nix];
|
imports = [./caddy.nix ./index ./seafile.nix ./bot.nix ./immich.nix ./matrix.nix ./mail.nix];
|
||||||
options.niksos.server = lib.mkEnableOption "server servcies (such as caddy)."; #TODO: per service option.
|
options.niksos.server = lib.mkEnableOption "server servcies (such as caddy)."; #TODO: per service option.
|
||||||
}
|
}
|
||||||
|
|
|
||||||
14
system/server/index/default.nix
Normal file
14
system/server/index/default.nix
Normal file
|
|
@ -0,0 +1,14 @@
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
services.caddy.virtualHosts."jsw.tf" = lib.mkIf config.niksos.server {
|
||||||
|
extraConfig = ''
|
||||||
|
header Content-Type text/html
|
||||||
|
respond <<HTML
|
||||||
|
${builtins.readFile ./index.html}
|
||||||
|
HTML 200
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
}
|
||||||
86
system/server/index/index.html
Normal file
86
system/server/index/index.html
Normal file
|
|
@ -0,0 +1,86 @@
|
||||||
|
<!-- Yes. As you might see, this site is AI generated. Don't feel like writing anything proper until I start making something proper.-->
|
||||||
|
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
|
<title>Under Construction</title>
|
||||||
|
<style>
|
||||||
|
body {
|
||||||
|
font-family: Arial, sans-serif;
|
||||||
|
background-color: #f4f4f4;
|
||||||
|
color: #333;
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
height: 100vh;
|
||||||
|
margin: 0;
|
||||||
|
text-align: center;
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
|
||||||
|
h1 {
|
||||||
|
font-size: 3em;
|
||||||
|
margin-bottom: 0.5em;
|
||||||
|
color: #ff5722;
|
||||||
|
}
|
||||||
|
|
||||||
|
.fence {
|
||||||
|
font-size: 1.5em;
|
||||||
|
}
|
||||||
|
|
||||||
|
p {
|
||||||
|
font-size: 1.2em;
|
||||||
|
margin-bottom: 1em;
|
||||||
|
max-width: 600px;
|
||||||
|
}
|
||||||
|
|
||||||
|
a {
|
||||||
|
text-decoration: none;
|
||||||
|
color: #fff;
|
||||||
|
background-color: #007bff;
|
||||||
|
padding: 8px 15px;
|
||||||
|
border-radius: 5px;
|
||||||
|
transition: background-color 0.3s;
|
||||||
|
font-size: 1em;
|
||||||
|
}
|
||||||
|
|
||||||
|
a:hover {
|
||||||
|
background-color: #0056b3;
|
||||||
|
}
|
||||||
|
|
||||||
|
footer {
|
||||||
|
position: absolute;
|
||||||
|
bottom: 20px;
|
||||||
|
font-size: 0.9em;
|
||||||
|
color: #777;
|
||||||
|
}
|
||||||
|
|
||||||
|
.contact {
|
||||||
|
font-size: 1.2em;
|
||||||
|
}
|
||||||
|
.contact > p {
|
||||||
|
display: inline-block;
|
||||||
|
margin: 1em;
|
||||||
|
display: block;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
.emoji {
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<h1 class="fence">🚧🚧 This Site is Under Construction 🚧🚧</h1>
|
||||||
|
<p>Hello! I'm <b>jsw</b>, a frontend web developer with experience in <b>Svelte + TS</b>, <b>Nix(OS)</b> and currently learning <b>Rust</b>. This site is still under development, so please bear with me. In the meantime, feel free to reach out via email or explore my projects on GitHub.</p>
|
||||||
|
<div class="contact">
|
||||||
|
<p class="emoji">📧 <a href="mailto:info@jsw.tf">info@jsw.tf</a></p>
|
||||||
|
<p class="emoji">🐙 <a href="https://github.com/jsw08" target="_blank">GitHub</a></p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<footer>
|
||||||
|
© 2025 @jsw08. Source visible.
|
||||||
|
</footer>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
|
@ -1,91 +1,11 @@
|
||||||
{config, ...}: {
|
{
|
||||||
# nixpkgs.overlays = [
|
config,
|
||||||
# (final: prev: let
|
lib,
|
||||||
# version = "0.12.4";
|
...
|
||||||
# hash = "sha256-MUbWGBbb8+b5cp+M5w27A/cHHkMcoEtkN13++FyBvbM=";
|
}: {
|
||||||
# cargoHash = "sha256-G1c7hh0nScc4Cx7A1UUXv6slA6pP0fC6h00zR71BJIo=";
|
#FIXME: revert when stopped using docker for stalwart. https://github.com/NixOS/nixpkgs/issues/416091 (look at older commits for previous code.)
|
||||||
# in {
|
|
||||||
# stalwart-mail = prev.stalwart-mail.overrideAttrs (new: old: rec {
|
|
||||||
# inherit cargoHash version;
|
|
||||||
# src = prev.fetchFromGitHub {
|
|
||||||
# inherit version hash;
|
|
||||||
# inherit (old.src) owner repo;
|
|
||||||
# tag = "v${version}";
|
|
||||||
# };
|
|
||||||
# cargoDeps = prev.rustPlatform.fetchCargoVendor {
|
|
||||||
# inherit src;
|
|
||||||
# hash = cargoHash;
|
|
||||||
# };
|
|
||||||
# });
|
|
||||||
# })
|
|
||||||
# ];
|
|
||||||
# services.stalwart-mail = {
|
|
||||||
# enable = true;
|
|
||||||
# openFirewall = false; # Don't want to open port 8080, will leave that for caddy.
|
|
||||||
# credentials = {
|
|
||||||
# user_admin_password = config.age.secrets.mail-admin.path;
|
|
||||||
# };
|
|
||||||
# settings = {
|
|
||||||
# authentication.fallback-admin = {
|
|
||||||
# secret = "%{file:/run/credentials/stalwart-mail.service/user_admin_password}%";
|
|
||||||
# user = "admin";
|
|
||||||
# };
|
|
||||||
# server = {
|
|
||||||
# tracer."log" = {
|
|
||||||
# ansi = false;
|
|
||||||
# enable = true;
|
|
||||||
# level = "info";
|
|
||||||
# path = "./stalwart/logs";
|
|
||||||
# prefix = "stalwart.log";
|
|
||||||
# rotate = "daily";
|
|
||||||
# type = "log";
|
|
||||||
# };
|
|
||||||
# listener = {
|
|
||||||
# bind = "127.0.0.1:9003";
|
|
||||||
# protocol = "http";
|
|
||||||
# };
|
|
||||||
# imaptls = {
|
|
||||||
# bind = "[::]:993";
|
|
||||||
# protocol = "imap";
|
|
||||||
# tls.implicit = true;
|
|
||||||
# };
|
|
||||||
# smtp = {
|
|
||||||
# bind = "[::]:25";
|
|
||||||
# protocol = "smtp";
|
|
||||||
# };
|
|
||||||
# submissions = {
|
|
||||||
# bind = "[::]:465";
|
|
||||||
# protocol = "smtp";
|
|
||||||
# tls.implicit = true;
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
#
|
|
||||||
# hostname = "mx1.jsw.tf";
|
|
||||||
# lookup.default.domain = "jsw.tf";
|
|
||||||
# acme."letsencrypt" = {
|
|
||||||
# directory = "https://acme-v02.api.letsencrypt.org/directory";
|
|
||||||
# challenge = "tls-alpn-01";
|
|
||||||
# contact = ["jurnwubben@gmail.com"];
|
|
||||||
# domains = ["jsw.tf" "mx1.jsw.tf"];
|
|
||||||
# renew-before = "30d";
|
|
||||||
# };
|
|
||||||
# directory."imap".lookup.domains = ["jsw.tf"];
|
|
||||||
# # directory."in-memory" = {
|
|
||||||
# # type = "memory";
|
|
||||||
# # principals = [
|
|
||||||
# # {
|
|
||||||
# # class = "individual";
|
|
||||||
# # name = "User 1";
|
|
||||||
# # secret = "%{file:/etc/stalwart/mail-pw1}%";
|
|
||||||
# # email = [""];
|
|
||||||
# # }
|
|
||||||
# # ];
|
|
||||||
# # };
|
|
||||||
# };
|
|
||||||
|
|
||||||
#FIXME: revert when stopped using docker for stalwart. https://github.com/NixOS/nixpkgs/issues/416091
|
|
||||||
|
|
||||||
|
config = lib.mkIf config.niksos.server {
|
||||||
virtualisation.oci-containers.containers.stalwart = {
|
virtualisation.oci-containers.containers.stalwart = {
|
||||||
image = "docker.io/stalwartlabs/stalwart:latest";
|
image = "docker.io/stalwartlabs/stalwart:latest";
|
||||||
labels = {
|
labels = {
|
||||||
|
|
@ -102,16 +22,8 @@
|
||||||
465
|
465
|
||||||
];
|
];
|
||||||
|
|
||||||
services.caddy.virtualHosts = {
|
services.caddy.virtualHosts."mail.jsw.tf".extraConfig = ''
|
||||||
"mail.jsw.tf" = {
|
|
||||||
extraConfig = ''
|
|
||||||
reverse_proxy http://127.0.0.1:9003
|
reverse_proxy http://127.0.0.1:9003
|
||||||
'';
|
'';
|
||||||
# serverAliases = [
|
|
||||||
# "mta-sts.jsw.tf"
|
|
||||||
# "autoconfig.jsw.tf"
|
|
||||||
# "autodiscover.jsw.tf"
|
|
||||||
# ];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
||||||
{config, ...}: {
|
|
||||||
services.transfer-sh = {
|
|
||||||
enable = config.niksos.server;
|
|
||||||
settings = {
|
|
||||||
PURGE_DAYS = 7;
|
|
||||||
MAX_UPLOAD_SIZE = 4 * 1000 * 1000; # 4gb
|
|
||||||
# CORS_DOMAINS = "transfer.jsw.tf"; #FIXME: open it to the world wide web.
|
|
||||||
BASEDIR = "/var/lib/transfer.sh";
|
|
||||||
LISTENER = ":9000";
|
|
||||||
HTTP_AUTH_USER = "jsw";
|
|
||||||
EMAIL_CONTACT = "jurnwubben@gmail.com";
|
|
||||||
};
|
|
||||||
secretFile = config.age.secrets.transferSh.path;
|
|
||||||
};
|
|
||||||
systemd.services.transfer-sh.serviceConfig = {
|
|
||||||
StateDirectory = "transfer.sh";
|
|
||||||
StateDirectoryMode = "0750";
|
|
||||||
};
|
|
||||||
|
|
||||||
services.caddy.virtualHosts."share.jsw.tf" = {
|
|
||||||
extraConfig = ''
|
|
||||||
reverse_proxy :9000
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
}
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue