diff options
| author | makefu <github@syntax-fehler.de> | 2016-12-28 03:40:28 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-12-28 03:40:28 +0100 |
| commit | c422632d0370f15d4f0b0a5ce35e79a90e49740c (patch) | |
| tree | ba271e34c75085970889d62dfc76e12b4c5a1374 /lass/2configs/websites/domsen.nix | |
| parent | 096d83fe893f5134be957bf6dfe3da99e038e8a5 (diff) | |
| parent | 0d61093e18929e48ebfd984c1e0f2b6b1f0c6c58 (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'lass/2configs/websites/domsen.nix')
| -rw-r--r-- | lass/2configs/websites/domsen.nix | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix index 76e13412b..2bbfe7333 100644 --- a/lass/2configs/websites/domsen.nix +++ b/lass/2configs/websites/domsen.nix @@ -35,10 +35,10 @@ in { (servePage [ "makeup.apanowicz.de" "www.makeup.apanowicz.de" ]) (ssl [ "pixelpocket.de" ]) - (servePage [ "pixelpocket.de" "www.pixelpocket.de" ]) + (servePage [ "pixelpocket.de" ]) (ssl [ "o.ubikmedia.de" ]) - (serveOwncloud [ "o.ubikmedia.de" "www.o.ubikmedia.de" ]) + (serveOwncloud [ "o.ubikmedia.de" ]) (ssl [ "ubikmedia.de" @@ -88,15 +88,12 @@ in { "www.illucloud.eu" "www.illucloud.de" "www.illucloud.com" - "*.ubikmedia.de" ]) ]; - krebs.nginx.servers."ubikmedia.de".locations = [ - (lib.nameValuePair "/piwik" '' - try_files $uri $uri/ /index.php?$args; - '') - ]; + services.nginx.virtualHosts."ubikmedia.de".locations."/piwika".extraConfig = '' + try_files $uri $uri/ /index.php?$args; + ''; lass.mysqlBackup.config.all.databases = [ "ubikmedia_de" |