summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-04-28 12:46:46 +0200
committermakefu <github@syntax-fehler.de>2017-04-28 12:46:46 +0200
commit9ee75566e5ca1a9ef01ab9509ca80ca49c8110d4 (patch)
treeb3f6da9f268a786c13da1bfd2e3b1dd4f7a256cc
parentbf79fec48dfeece40a727deefe1f9825bda2d472 (diff)
parent22f019bada5fe9b688b343093a8da15be8787315 (diff)
Merge remote-tracking branch 'lass/master'
-rw-r--r--lass/2configs/default.nix1
-rw-r--r--lass/2configs/nixpkgs.nix2
-rw-r--r--lass/2configs/repo-sync.nix1
-rw-r--r--lass/2configs/websites/domsen.nix27
4 files changed, 3 insertions, 28 deletions
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
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";
};
}
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")
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
- ];
-
}