aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/nix.org15
-rw-r--r--nix/topology/default.nix4
2 files changed, 8 insertions, 11 deletions
diff --git a/config/nix.org b/config/nix.org
index 6ac9619..52e1e5f 100644
--- a/config/nix.org
+++ b/config/nix.org
@@ -113,7 +113,8 @@ creation_rules:
also note that you will have to write your own secrets.yaml file, with an entry called ~mail~,
which is used for the imaps and smtps password.
* Nix Topology
-Nix Topology generates a nice graph of all my hosts.
+Nix Topology generates a nice graph of all my hosts. You can view this
+graph by running ~nix build .#topology.x86_64-linux.config.output~.
#+begin_src nix :tangle ../nix/topology/default.nix
{ config, ... }:
let
@@ -488,7 +489,7 @@ Use postfix as an smtps server.
# Add HSTS header with preloading to HTTPS requests.
# Adding this header to HTTP requests is discouraged
map $scheme $hsts_header {
- https "max-age=31536000; includeSubdomains; preload";
+ https "max-age=31536000; includeSubdomains; preload";
}
add_header Strict-Transport-Security $hsts_header;
@@ -509,11 +510,11 @@ Use postfix as an smtps server.
'';
virtualHosts = {
- "ret2pop.net" = {
- # addSSL = true;
- # enableACME = true;
- root = "/home/preston/ret2pop-website/";
- };
+ "ret2pop.nullring.xyz" = {
+ # addSSL = true;
+ # enableACME = true;
+ root = "/home/preston/ret2pop-website/";
+ };
};
};
}
diff --git a/nix/topology/default.nix b/nix/topology/default.nix
index ce0b3a4..ce4fedd 100644
--- a/nix/topology/default.nix
+++ b/nix/topology/default.nix
@@ -4,16 +4,13 @@ let
(config.lib.topology);
in
{
- # Connect node1.lan -> node2.wan
nodes = {
spontaneity = {
interfaces.wan.network = "remote";
};
-
installer = {
interfaces.lan.network = "home";
};
-
affinity = {
interfaces.lan = {
network = "home";
@@ -45,7 +42,6 @@ in
};
};
};
-
networks = {
home = {
name = "Home Network";