diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/common.nix | 3 | ||||
| -rw-r--r-- | config/hydra.nix | 2 | ||||
| -rw-r--r-- | config/mail-server.nix | 32 | ||||
| -rw-r--r-- | config/web-server.nix | 8 |
4 files changed, 25 insertions, 20 deletions
diff --git a/config/common.nix b/config/common.nix index 2da919d..fbfe28f 100644 --- a/config/common.nix +++ b/config/common.nix @@ -39,7 +39,8 @@ gc.automatic = lib.mkDefault true; nixPath = lib.mkBefore [ "orbekk=https://hydra.orbekk.com/project/orbekk-projects/channel/latest/nixexprs.tar.bz2" - "nixpkgs-stable=https://nixos.org/channels/nixos-17.03/nixexprs.tar.xz" + "nixpkgs-stable=https://nixos.org/channels/nixos-18.03/nixexprs.tar.xz" + "nixpkgs-unstable=https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz" "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs" "nixos-config=/etc/nixos/configuration.nix" "/nix/var/nix/profiles/per-user/root/channels" diff --git a/config/hydra.nix b/config/hydra.nix index 0f79533..cb9c8e6 100644 --- a/config/hydra.nix +++ b/config/hydra.nix @@ -27,7 +27,7 @@ in wantedBy = [ "multi-user.target" ]; requires = [ "hydra-init.service" ]; after = [ "hydra-init.service" ]; - environment = config.systemd.services.hydra-init.environment; + environment = lib.mkForce config.systemd.services.hydra-init.environment; script = '' if [ ! -e /opt/secret/hydra_key/initialized ]; then # create signing keys diff --git a/config/mail-server.nix b/config/mail-server.nix index cb74b72..97682d2 100644 --- a/config/mail-server.nix +++ b/config/mail-server.nix @@ -34,8 +34,8 @@ domain = "orbekk.com"; destination = ["orbekk.com" "kj.orbekk.com" "orbekk.no" "kj.orbekk.no" "kufieta.net"]; - lookupMX = true; # This causes it to use the relayhost verbatim. - relayHost = "[smtp.sendgrid.net]:2525"; + relayHost = "smtp.sendgrid.net"; + relayPort = 587; enableSubmission = true; submissionOptions = { @@ -61,21 +61,19 @@ lise = "lise.orbekk@gmail.com"; katharina = "katharina.kufieta@gmail.com"; in '' - eo: ${erik} - erik: ${erik} - - orbekk: ${kjetil} - k: ${kjetil} - kj: ${kjetil} - kjetil: ${kjetil} - root: ${kjetil} - postmaster: ${kjetil} - - katharina: ${katharina} - kathi: ${katharina} - kasiunia: ${katharina} - - lise: ${lise} +eo: ${erik} +erik: ${erik} +orbekk: ${kjetil} +k: ${kjetil} +kj: ${kjetil} +kjetil: ${kjetil} +root: ${kjetil} +postmaster: ${kjetil} +katharina: ${katharina} +kathi: ${katharina} +kasiunia: ${katharina} +kat: ${katharina} +lise: ${lise} ''; sslCert = "${config.security.acme.directory}/shape.orbekk.com/fullchain.pem"; sslCACert = "${config.security.acme.directory}/shape.orbekk.com/fullchain.pem"; diff --git a/config/web-server.nix b/config/web-server.nix index 4d5f5f1..9dfe528 100644 --- a/config/web-server.nix +++ b/config/web-server.nix @@ -30,10 +30,16 @@ root = "/storage/srv/orbekk.com"; }; "kj.orbekk.com" = template // { - root = "${pkgs.www-orbekk}"; + root = "/home/orbekk/www-public"; locations."/" = { extraConfig = '' try_files $uri @storage; + # kill cache + add_header Last-Modified $date_gmt; + add_header Cache-Control 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0'; + if_modified_since off; + expires off; + etag off; ''; }; locations."@storage" = { |