diff options
| author | makefu <github@syntax-fehler.de> | 2018-04-04 15:23:44 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2018-04-04 15:23:44 +0200 |
| commit | 3ed84b0b8c063a294e7cb40a786fa7a15ee0e5a4 (patch) | |
| tree | 569658ceb8fc90f640d7ce48357eb84a0383b494 /lass/2configs/websites | |
| parent | 1b740bf9ef32972f7242226699a75b39feeb18b2 (diff) | |
| parent | 1a5b58c828409ce9bf1639f3f26ebeb142e0148a (diff) | |
Merge remote-tracking branch 'lass/staging/18.03' into staging
Diffstat (limited to 'lass/2configs/websites')
| -rw-r--r-- | lass/2configs/websites/domsen.nix | 2 | ||||
| -rw-r--r-- | lass/2configs/websites/fritz.nix | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix index 9ece2af77..7a72499c9 100644 --- a/lass/2configs/websites/domsen.nix +++ b/lass/2configs/websites/domsen.nix @@ -49,6 +49,7 @@ in { "www.ubikmedia.eu" "www.youthtube.xyz" "www.ubikmedia.de" + "www.joemisch.com" "www.weirdwednesday.de" "aldona2.ubikmedia.de" @@ -63,6 +64,7 @@ in { "weirdwednesday.ubikmedia.de" "freemonkey.ubikmedia.de" "jarugadesign.ubikmedia.de" + "crypto4art.ubikmedia.de" ]) ]; diff --git a/lass/2configs/websites/fritz.nix b/lass/2configs/websites/fritz.nix index aa57a9857..14d6ce9ec 100644 --- a/lass/2configs/websites/fritz.nix +++ b/lass/2configs/websites/fritz.nix @@ -12,9 +12,8 @@ let ; msmtprc = pkgs.writeText "msmtprc" '' - account localhost + account default host localhost - account default: localhost ''; sendmail = pkgs.writeDash "msmtp" '' |