diff options
| -rw-r--r-- | secrets/redis-website.age | 7 | ||||
| -rw-r--r-- | secrets/secrets.nix | 2 | ||||
| -rw-r--r-- | system/linde.nix | 16 |
3 files changed, 25 insertions, 0 deletions
diff --git a/secrets/redis-website.age b/secrets/redis-website.age new file mode 100644 index 00000000..c28e4d49 --- /dev/null +++ b/secrets/redis-website.age @@ -0,0 +1,7 @@ +age-encryption.org/v1 +-> ssh-ed25519 cvV2sw WjKi0Y30MLKz+gFIJq5Lnie/aODMvzrDX+hiHfaPXUs +9vRdGtOho2jLMFezA4+6w9v3yySe9nHFcaDqBJi0ZGE +-> piv-p256 VBDKjg A+wOv0SEzn47kbJhQMWWTcOcRV/aB6UAOX0xdcz3d8Wo +SlCae0RyX188XcgHlQOa/1jpzqaaYq6w2m+FCaXa4qU +--- aEDkTWQh00KXlzeyGew4qTnFyjvhmSubgUWnonUAJP0 +L\V7{uCf#1𖽃M/vUn-}CL-vcANSYq \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index be2acf14..3cfcf017 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -13,6 +13,8 @@ let secrets = with machines; { acme = [ linde nanopi ]; + redis-website = [ linde ]; + binarycache = [ linde ]; paperless = [ linde ]; powerdns = [ linde ]; diff --git a/system/linde.nix b/system/linde.nix index bffa2645..482b5a3a 100644 --- a/system/linde.nix +++ b/system/linde.nix @@ -13,6 +13,7 @@ let net-gw = "172.31.1.1"; net-ip6 = "2a01:4f8:c012:23a4::1"; net-rdnsip = "2a01:4f8:c012:23a4::53"; + net-redisip = "2a01:4f8:c012:23a4::6379"; net-mask6 = "64"; net-gw6 = "fe80::1"; domain = "alanpearce.eu"; @@ -42,6 +43,7 @@ in binarycache.file = ../secrets/binarycache.age; dex.file = ../secrets/dex.age; powerdns.file = ../secrets/powerdns.age; + redis-website.file = ../secrets/redis-website.age; golink = let golink = config.services.golink; in { # hope this doesn't collide... path = "${golink.dataDir}/.config/tsnet-golink/auth.key"; @@ -162,6 +164,7 @@ in ${net-ip4} = [ "${hostname}.alanpearce.eu" hostname ]; ${net-ip6} = [ "${hostname}.alanpearce.eu" hostname ]; ${net-rdnsip} = [ "dns" ]; + ${net-redisip} = [ "redis" ]; }; firewall = { enable = true; @@ -219,6 +222,7 @@ in address = [ "${net-ip6}/${net-mask6}" "${net-rdnsip}/${net-mask6}" + "${net-redisip}/${net-mask6}" ]; addresses = [{ Address = "${net-ip4}/${net-mask4}"; @@ -959,6 +963,18 @@ in Requires = [ "etcd.service" ]; }; + services.redis = { + servers = { + website = { + port = 6379; + bind = net-redisip; + openFirewall = true; + databases = 1; + maxclients = 6; + requirePassFile = config.age.secrets.redis-website.path; + }; + }; + }; services.syncthing = { enable = true; |