diff options
| author | makefu <github@syntax-fehler.de> | 2019-01-16 11:43:10 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2019-01-16 11:43:10 +0100 |
| commit | e3851e0c69490d19351e0bcef64c23c9070d1d19 (patch) | |
| tree | a3d1de2957f7c7c2502a399614264852c652cf49 /lass/2configs/websites | |
| parent | 33655bfd89f7ea6f8ab3e3139cd79f4c2d2a0ef6 (diff) | |
| parent | 6cef97deb3a96731a4737f05513e2e5855f60685 (diff) | |
Merge remote-tracking branch 'tv/master'
Diffstat (limited to 'lass/2configs/websites')
| -rw-r--r-- | lass/2configs/websites/domsen.nix | 14 | ||||
| -rw-r--r-- | lass/2configs/websites/lassulus.nix | 3 |
2 files changed, 17 insertions, 0 deletions
diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix index 25dac0ac4..223fc73ba 100644 --- a/lass/2configs/websites/domsen.nix +++ b/lass/2configs/websites/domsen.nix @@ -88,6 +88,20 @@ in { file_uploads = on ''; + services.nextcloud = { + enable = true; + hostName = "o.xanf.org"; + config = { + adminpassFile = toString <secrets> + "/nextcloud_pw"; + }; + #https = true; + nginx.enable = true; + }; + services.nginx.virtualHosts."o.xanf.org" = { + enableACME = true; + forceSSL = true; + }; + # MAIL STUFF # TODO: make into its own module services.dovecot2 = { diff --git a/lass/2configs/websites/lassulus.nix b/lass/2configs/websites/lassulus.nix index 307f1c2b3..27cadd100 100644 --- a/lass/2configs/websites/lassulus.nix +++ b/lass/2configs/websites/lassulus.nix @@ -101,6 +101,9 @@ in { locations."/pub".extraConfig = '' alias ${pkgs.writeText "pub" config.krebs.users.lass.pubkey}; ''; + locations."/pub1".extraConfig = '' + alias ${pkgs.writeText "pub" config.krebs.users.lass-mors.pubkey}; + ''; }; security.acme.certs."cgit.lassul.us" = { |