From b2c98d92b58c31eb8c5b29d5c33a5a53e343c2ca Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Thu, 27 Apr 2017 18:58:23 +0200
Subject: l 2: add logify to pkgs

---
 lass/2configs/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lass/2configs')

diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index e964704c3..e33514ee0 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -149,6 +149,7 @@ with import <stockholm/lib>;
     tmux
     untilport
     usbutils
+    logify
 
   #unpack stuff
     p7zip
-- 
cgit v1.2.3


From 8943ce794a1e0d185a23d5fbde16fc439b894527 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Thu, 27 Apr 2017 18:58:50 +0200
Subject: l 2 repo-sync: add nixos-wiki

---
 lass/2configs/repo-sync.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lass/2configs')

diff --git a/lass/2configs/repo-sync.nix b/lass/2configs/repo-sync.nix
index 775bd7665..0b6cd8231 100644
--- a/lass/2configs/repo-sync.nix
+++ b/lass/2configs/repo-sync.nix
@@ -106,6 +106,7 @@ in {
     (sync-remote "lassulus-blog" "https://github.com/lassulus/lassulus-blog")
     (sync-remote "painload" "https://github.com/krebscode/painload")
     (sync-remote "Reaktor" "https://github.com/krebscode/Reaktor")
+    (sync-remote "nixos-wiki" "https://github.com/Mic92/nixos-wiki.wiki.git")
     (sync-remote-silent "nixpkgs" "https://github.com/nixos/nixpkgs")
     (sync-retiolum "go")
     (sync-retiolum "much")
-- 
cgit v1.2.3


From eaa6c57cd7aa06311a12cb76fae7e82976c7b865 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Thu, 27 Apr 2017 18:59:15 +0200
Subject: l 2 websites domsen: remove old restart wrappers

---
 lass/2configs/websites/domsen.nix | 27 ---------------------------
 1 file changed, 27 deletions(-)

(limited to 'lass/2configs')

diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index a5c51735a..581b37d91 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -21,22 +21,6 @@ let
     exec ${pkgs.msmtp}/bin/msmtp --read-envelope-from -C ${msmtprc} "$@"
   '';
 
-  restartPhpfpm_o.ubikmedia = pkgs.writeDash "restartPhpfpm_o.ubikmedia.org" ''
-    ${pkgs.systemd}/bin/systemctl restart phpfpm-o.ubikmedia.de.service
-  '';
-
-  restartPhpfpm_o.ubikmedia_wrapper = pkgs.writeDashBin "restartPhpfpm_o.ubikmedia" ''
-    /run/wrappers/bin/sudo ${restartPhpfpm_o.ubikmedia}
-  '';
-
-  restartPhpfpm_ubikmedia = pkgs.writeDash "restartPhpfpm_ubikmedia.org" ''
-    ${pkgs.systemd}/bin/systemctl restart phpfpm-ubikmedia.de.service
-  '';
-
-  restartPhpfpm_ubikmedia_wrapper = pkgs.writeDashBin "restartPhpfpm_ubikmedia" ''
-    /run/wrappers/bin/sudo ${restartPhpfpm_ubikmedia}
-  '';
-
 in {
   imports = [
     ./sqlBackup.nix
@@ -180,16 +164,5 @@ in {
     createHome = true;
   };
 
-  #sudo restart wrappers
-  security.sudo.extraConfig = ''
-    domsen ALL= (root) NOPASSWD: ${restartPhpfpm_o.ubikmedia}
-    domsen ALL= (root) NOPASSWD: ${restartPhpfpm_ubikmedia}
-  '';
-
-  krebs.per-user.domsen.packages = [
-    restartPhpfpm_ubikmedia_wrapper
-    restartPhpfpm_o.ubikmedia_wrapper
-  ];
-
 }
 
-- 
cgit v1.2.3


From 22f019bada5fe9b688b343093a8da15be8787315 Mon Sep 17 00:00:00 2001
From: lassulus <lass@lassul.us>
Date: Thu, 27 Apr 2017 19:05:17 +0200
Subject: l 2 nixpkgs: 992b6da -> aa03833

---
 lass/2configs/nixpkgs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass/2configs')

diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix
index 692e438b5..4f1347b82 100644
--- a/lass/2configs/nixpkgs.nix
+++ b/lass/2configs/nixpkgs.nix
@@ -3,6 +3,6 @@
 {
   krebs.build.source.nixpkgs.git = {
     url = https://cgit.lassul.us/nixpkgs;
-    ref = "992b6da";
+    ref = "aa03833";
   };
 }
-- 
cgit v1.2.3