From 843a0baa38ad2f321546e383ba423f9b9818e46a Mon Sep 17 00:00:00 2001 From: Patryk Niedźwiedziński Date: Wed, 6 Oct 2021 10:09:41 +0200 Subject: Noip --- machines/srv1/configuration.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/machines/srv1/configuration.nix b/machines/srv1/configuration.nix index b0c130f..fe6ade0 100644 --- a/machines/srv1/configuration.nix +++ b/machines/srv1/configuration.nix @@ -45,7 +45,7 @@ in networking.hostName = "srv1"; networking.extraHosts = '' - 192.168.1.136 srv1.niedzwiedzinski.cyou git.niedzwiedzinski.cyou tmp.niedzwiedzinski.cyou zhr.niedzwiedzinski.cyou help.niedzwiedzinski.cyou niedzwiedzinski.cyou + 192.168.1.136 srv1.niedzwiedzinski.cyou git.niedzwiedzinski.cyou tmp.niedzwiedzinski.cyou zhr.niedzwiedzinski.cyou help.niedzwiedzinski.cyou niedzwiedzinski.cyou pics.niedzwiedzinski.cyou '' + pkgs.stdenv.lib.readFile ( pkgs.fetchurl { url = "https://raw.githubusercontent.com/StevenBlack/hosts/d2be343994aacdec74865ff8d159cf6e46359adf/alternates/fakenews-gambling-porn/hosts"; sha256 = "1la5rd0znc25q8yd1iwbx22zzqi6941vyzmgar32jx568j856s8j"; @@ -109,6 +109,7 @@ in nvim lm_sensors mirror newrepo + noip ]; services.openssh.enable = true; @@ -155,6 +156,11 @@ in forceSSL = true; root = "${www}/pics.srv1.niedzwiedzinski.cyou"; }; + "pics.niedzwiedzinski.cyou" = { + enableACME = true; + forceSSL = true; + root = "${www}/pics.srv1.niedzwiedzinski.cyou"; + }; "rss.srv1.niedzwiedzinski.cyou" = { enableACME = true; forceSSL = true; @@ -229,10 +235,9 @@ in keyPath = "/var/lib/acme/niedzwiedzinski.cyou/key.pem"; docBase = "${www}/niedzwiedzinski.cyou"; }; - security.acme.certs."niedzwiedzinski.cyou".allowKeysForGroup = true; - systemd.services.molly-brown.serviceConfig.SupplementaryGroups = [ config.security.acme.certs."niedzwiedzinski.cyou".group ]; systemd = { + services.molly-brown.serviceConfig.SupplementaryGroups = [ config.security.acme.certs."niedzwiedzinski.cyou".group ]; services.git-fetch = { script = '' #!/bin/sh -- cgit 1.4.1