diff options
| author | makefu <github@syntax-fehler.de> | 2019-09-25 14:54:55 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2019-09-25 15:04:42 +0200 |
| commit | 911b3c20299b11a3d87ae0a4f1f66626c79e9d1f (patch) | |
| tree | d5def5628025615d5dd5cbb5e7044a02b50d8b08 /makefu/2configs | |
| parent | c232f2dc25e4f0096b31e7d756b236662081f836 (diff) | |
ma shiori: force ssl
Diffstat (limited to 'makefu/2configs')
| -rw-r--r-- | makefu/2configs/gui/base.nix | 3 | ||||
| -rw-r--r-- | makefu/2configs/shiori.nix | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/makefu/2configs/gui/base.nix b/makefu/2configs/gui/base.nix index 9984856be..5b46c7e2d 100644 --- a/makefu/2configs/gui/base.nix +++ b/makefu/2configs/gui/base.nix @@ -11,7 +11,6 @@ # if this is not enough, check out main-laptop.nix -with import <stockholm/lib>; let mainUser = config.krebs.build.user.name; in @@ -39,7 +38,7 @@ in }; environment.systemPackages = [ pkgs.gnome3.defaultIconTheme ]; # lid switch is handled via button presses - services.logind.lidSwitch = "ignore"; + services.logind.lidSwitch = lib.mkDefault "ignore"; makefu.awesome.enable = true; i18n.consoleFont = "Lat2-Terminus16"; diff --git a/makefu/2configs/shiori.nix b/makefu/2configs/shiori.nix index 539d11f87..fd6bc9aad 100644 --- a/makefu/2configs/shiori.nix +++ b/makefu/2configs/shiori.nix @@ -18,7 +18,12 @@ in { PrivateTmp = true; }; }; - services.nginx.virtualHosts."bookmark.euer.krebsco.de".locations."/" = { + services.nginx.virtualHosts."bookmark.euer.krebsco.de" = { + forceSSL = true; + enableACME = true; + + locations."/" = { proxyPass = "http://127.0.0.1:${toString web_port}/"; }; + }; } |