diff options
| author | makefu <github@syntax-fehler.de> | 2017-06-01 10:08:56 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2017-06-01 10:08:56 +0200 |
| commit | 772f84305d90380e0d221cf49ae3f1597d0d0510 (patch) | |
| tree | 8d2241648396dc34fa96c8c68e12f832fbc7c308 /lass/2configs/websites | |
| parent | 90822f64e0bf247c5cca2f035077553cac5ceb79 (diff) | |
| parent | 21d92086fe00c7369fde3951f92e9f73f4c05ee9 (diff) | |
Merge remote-tracking branch 'lass/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" ]) ]; |