diff options
| author | tv <tv@krebsco.de> | 2017-05-24 01:31:22 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2017-05-24 01:31:22 +0200 |
| commit | 46d6506916f699e3b707dc41cd68c92b98e50e5a (patch) | |
| tree | 1d43d0072fc479c7022e3cd3b9810aa7b90e1db3 /lass/2configs/websites | |
| parent | 061e702a6fc0e6046d39c3975c9034a69499c45f (diff) | |
| parent | 90f6d9f228029233d38a86a520a0e532cc5e499f (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/2configs/websites')
| -rw-r--r-- | lass/2configs/websites/domsen.nix | 5 | ||||
| -rw-r--r-- | lass/2configs/websites/fritz.nix | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix index 581b37d91..b0d28d4da 100644 --- a/lass/2configs/websites/domsen.nix +++ b/lass/2configs/websites/domsen.nix @@ -25,9 +25,10 @@ in { imports = [ ./sqlBackup.nix (servePage [ "reich-gebaeudereinigung.de" "www.reich-gebaeudereinigung.de" ]) - (servePage [ "karlaskop.de" "www.karlaskop.de" ]) - (servePage [ "makeup.apanowicz.de" "www.makeup.apanowicz.de" ]) + (servePage [ "karlaskop.de" ]) + (servePage [ "makeup.apanowicz.de" ]) (servePage [ "pixelpocket.de" ]) + (servePage [ "habsys.de" "habsys.eu" ]) (serveOwncloud [ "o.ubikmedia.de" ]) (serveWordpress [ "ubikmedia.de" diff --git a/lass/2configs/websites/fritz.nix b/lass/2configs/websites/fritz.nix index 9bf7e4a9c..45927b102 100644 --- a/lass/2configs/websites/fritz.nix +++ b/lass/2configs/websites/fritz.nix @@ -40,8 +40,6 @@ in { (serveWordpress [ "eastuttgart.de" "www.eastuttgart.de" ]) - (servePage [ "habsys.de" "www.habsys.de" "habsys.eu" "www.habsys.eu" ]) - (serveWordpress [ "goldbarrendiebstahl.radical-dreamers.de" ]) ]; |