Merge remote-tracking branch 'lass/master'

lass/2configs/default.nix

@@ -149,6 +149,7 @@ with import <stockholm/lib>;
     tmux
     untilport
     usbutils
+    logify
 
   #unpack stuff
     p7zip

lass/2configs/nixpkgs.nix

@@ -3,6 +3,6 @@
 {
   krebs.build.source.nixpkgs.git = {
     url = https://cgit.lassul.us/nixpkgs;
-    ref = "992b6da";
+    ref = "aa03833";
   };
 }

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")

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
-  ];
-
 }