summaryrefslogtreecommitdiffstats
path: root/lass/2configs/websites
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-09-19 16:38:07 +0200
committermakefu <github@syntax-fehler.de>2017-09-19 16:38:07 +0200
commitcfca733473620e1b7be7e62a96f20958fedf9068 (patch)
tree4d69217c6c292e6524c05ce0ffa36ac209c6cad9 /lass/2configs/websites
parent21c284a2c7b4fcb330f0c90ccd773f65f78721aa (diff)
parente822f88199f11fe75e2a38a0e5f9806a8c9ba5cf (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'lass/2configs/websites')
-rw-r--r--lass/2configs/websites/lassulus.nix12
1 files changed, 1 insertions, 11 deletions
diff --git a/lass/2configs/websites/lassulus.nix b/lass/2configs/websites/lassulus.nix
index 93b817c3b..d37dd5301 100644
--- a/lass/2configs/websites/lassulus.nix
+++ b/lass/2configs/websites/lassulus.nix
@@ -14,14 +14,6 @@ in {
security.acme = {
certs."lassul.us" = {
- email = "lass@lassul.us";
- webroot = "/var/lib/acme/acme-challenges";
- plugins = [
- "account_key.json"
- "key.pem"
- "fullchain.pem"
- "full.pem"
- ];
allowKeysForGroup = true;
group = "lasscert";
};
@@ -71,13 +63,11 @@ in {
];
services.nginx.virtualHosts."lassul.us" = {
+ enableACME = true;
serverAliases = [ "lassul.us" ];
locations."/".extraConfig = ''
root /srv/http/lassul.us;
'';
- locations."/.well-known/acme-challenge".extraConfig = ''
- root /var/lib/acme/challenges/lassul.us/;
- '';
locations."= /retiolum-hosts.tar.bz2".extraConfig = ''
alias ${config.krebs.tinc.retiolum.hostsArchive};
'';