diff options
| author | tv <tv@krebsco.de> | 2016-07-03 20:44:09 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-07-03 20:44:09 +0200 |
| commit | 7f0ea39a978fb02b4b165e82051f83273093a94c (patch) | |
| tree | 45ea0a22523aecad81403d3d20c9f3c69439d307 /lass/2configs | |
| parent | 8822005f00be111186a490934ebb9adbfd7917a2 (diff) | |
| parent | e4f4811fa7a7f3eaa620d2c536d7b74659bd2943 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/2configs')
| -rw-r--r-- | lass/2configs/git.nix | 2 | ||||
| -rw-r--r-- | lass/2configs/websites/domsen.nix | 10 | ||||
| -rw-r--r-- | lass/2configs/xserver/default.nix | 3 |
3 files changed, 8 insertions, 7 deletions
diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix index 381a37e1b..9a1cab176 100644 --- a/lass/2configs/git.nix +++ b/lass/2configs/git.nix @@ -80,7 +80,7 @@ let perm = push "refs/*" [ non-fast-forward create delete merge ]; } ++ optional repo.public { - user = [ tv makefu miefda ]; + user = [ tv makefu ]; repo = [ repo ]; perm = fetch; } ++ diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix index f88dc927e..3c33c0702 100644 --- a/lass/2configs/websites/domsen.nix +++ b/lass/2configs/websites/domsen.nix @@ -32,10 +32,10 @@ in { (ssl [ "makeup.apanowicz.de" "www.makeup.apanowicz.de" ]) (servePage [ "makeup.apanowicz.de" "www.makeup.apanowicz.de" ]) - (ssl [ "pixelpocket.de" "www.pixelpocket.de" ]) + (ssl [ "pixelpocket.de" ]) (servePage [ "pixelpocket.de" "www.pixelpocket.de" ]) - (ssl [ "o.ubikmedia.de" "www.o.ubikmedia.de" ]) + (ssl [ "o.ubikmedia.de" ]) (serveOwncloud [ "o.ubikmedia.de" "www.o.ubikmedia.de" ]) (ssl [ @@ -47,6 +47,7 @@ in { "360gradvideo.tv" "ubikmedia.eu" "facts.cloud" + "youthtube.xyz" "www.ubikmedia.de" "www.aldona.ubikmedia.de" "www.apanowicz.de" @@ -55,6 +56,7 @@ in { "www.360gradvideo.tv" "www.ubikmedia.eu" "www.facts.cloud" + "www.youthtube.xyz" ]) (serveWordpress [ "ubikmedia.de" @@ -64,13 +66,15 @@ in { "360gradvideo.tv" "ubikmedia.eu" "facts.cloud" - "*.ubikmedia.de" + "youthtube.xyz" "www.apanowicz.de" "www.nirwanabluete.de" "www.aldonasiech.com" "www.360gradvideo.tv" "www.ubikmedia.eu" "www.facts.cloud" + "www.youthtube.xyz" + "*.ubikmedia.de" ]) ]; diff --git a/lass/2configs/xserver/default.nix b/lass/2configs/xserver/default.nix index 80c947a7b..73b148bf7 100644 --- a/lass/2configs/xserver/default.nix +++ b/lass/2configs/xserver/default.nix @@ -91,9 +91,6 @@ let set -efu export PATH; PATH=${makeSearchPath "bin" ([ pkgs.rxvt_unicode - pkgs.i3lock - pkgs.pulseaudioLight - pkgs.xorg.xbacklight ] ++ config.environment.systemPackages)}:/var/setuid-wrappers settle() {( # Use PATH for a clean journal |