diff options
| author | jeschli <jeschli@gmail.com> | 2018-07-09 14:31:18 +0200 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2018-07-09 14:31:18 +0200 |
| commit | d1c6baf00e98a0229fc7fd96874623efc8417b05 (patch) | |
| tree | eaba9481ed208af1086690a9c07ca948b047389a /lass/2configs/websites | |
| parent | b439342e7533e3f695db8a46576c54d180f56a58 (diff) | |
| parent | d6df7ae483b984b90bdc8d4540301ef394885a98 (diff) | |
Merge remote-tracking branch 'origin/staging/jeschli'
Diffstat (limited to 'lass/2configs/websites')
| -rw-r--r-- | lass/2configs/websites/lassulus.nix | 16 | ||||
| -rw-r--r-- | lass/2configs/websites/util.nix | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/lass/2configs/websites/lassulus.nix b/lass/2configs/websites/lassulus.nix index 53f1eea5c..f60a66952 100644 --- a/lass/2configs/websites/lassulus.nix +++ b/lass/2configs/websites/lassulus.nix @@ -66,6 +66,22 @@ in { locations."/tinc".extraConfig = '' alias ${config.krebs.tinc_graphs.workingDir}/external; ''; + locations."/urlaubyay2018".extraConfig = '' + autoindex on; + alias /srv/http/lassul.us-media/india2018; + auth_basic "Restricted Content"; + auth_basic_user_file ${pkgs.writeText "pics-user-pass" '' + paolo:$apr1$aQ6mYNR3$ho.aJ7icqSO.y.xKo3GQf0 + ''}; + ''; + locations."/heilstadt".extraConfig = '' + autoindex on; + alias /srv/http/lassul.us-media/grabowsee2018; + auth_basic "Restricted Content"; + auth_basic_user_file ${pkgs.writeText "pics-user-pass" '' + c-base:$apr1$aQ6mYNR3$ho.aJ7icqSO.y.xKo3GQf0 + ''}; + ''; # TODO make this work! locations."= /ddate".extraConfig = let script = pkgs.writeBash "test" '' diff --git a/lass/2configs/websites/util.nix b/lass/2configs/websites/util.nix index 816449c14..a807f7160 100644 --- a/lass/2configs/websites/util.nix +++ b/lass/2configs/websites/util.nix @@ -194,7 +194,7 @@ rec { in { services.nginx.virtualHosts."${domain}" = { enableACME = true; - addSSL = true; + forceSSL = true; serverAliases = domains; extraConfig = '' root /srv/http/${domain}/; |