From c58ab1ba4978aae8200bc840fbfe6d9d62a0759d Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 29 Jul 2015 14:54:23 +0200 Subject: [PATCH 1/4] lass cloudkrebs: change imports to user-toplevel --- lass/1systems/cloudkrebs.nix | 12 ++++++------ lass/2configs/fastpoke-pages.nix | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lass/1systems/cloudkrebs.nix b/lass/1systems/cloudkrebs.nix index a60024b03..515810e44 100644 --- a/lass/1systems/cloudkrebs.nix +++ b/lass/1systems/cloudkrebs.nix @@ -2,12 +2,12 @@ { imports = [ - ../../2configs/tv/CAC-Developer-2.nix - ../../2configs/tv/CAC-CentOS-7-64bit.nix - ../../2configs/lass/base.nix - ../../2configs/lass/retiolum.nix - ../../2configs/lass/fastpoke-pages.nix - ../../2configs/lass/new-repos.nix + ../../tv/2configs/CAC-Developer-2.nix + ../../tv/2configs/CAC-CentOS-7-64bit.nix + ../2configs/base.nix + ../2configs/retiolum.nix + ../2configs/fastpoke-pages.nix + ../2configs/new-repos.nix { networking.interfaces.enp2s1.ip4 = [ { diff --git a/lass/2configs/fastpoke-pages.nix b/lass/2configs/fastpoke-pages.nix index 74e92ccc3..1f997eb6a 100644 --- a/lass/2configs/fastpoke-pages.nix +++ b/lass/2configs/fastpoke-pages.nix @@ -23,7 +23,7 @@ let in { imports = [ - ../../3modules/lass/iptables.nix + ../3modules/iptables.nix ] ++ map createStaticPage [ "habsys.de" "pixelpocket.de" From 8d84ec693ff5015d42b829236495dcf6c3735fe7 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 29 Jul 2015 15:09:54 +0200 Subject: [PATCH 2/4] remove legacy 0make --- 0make/lass/cloudkrebs.makefile | 4 ---- 0make/lass/mors.makefile | 4 ---- 0make/lass/uriel.makefile | 4 ---- 3 files changed, 12 deletions(-) delete mode 100644 0make/lass/cloudkrebs.makefile delete mode 100644 0make/lass/mors.makefile delete mode 100644 0make/lass/uriel.makefile diff --git a/0make/lass/cloudkrebs.makefile b/0make/lass/cloudkrebs.makefile deleted file mode 100644 index baf7660b4..000000000 --- a/0make/lass/cloudkrebs.makefile +++ /dev/null @@ -1,4 +0,0 @@ -deploy_host := root@cloudkrebs -nixpkgs_url := https://github.com/Lassulus/nixpkgs -nixpkgs_rev := 1879a011925c561f0a7fd4043da0768bbff41d0b -secrets_dir := /home/lass/secrets/cloudkrebs diff --git a/0make/lass/mors.makefile b/0make/lass/mors.makefile deleted file mode 100644 index 896466a6f..000000000 --- a/0make/lass/mors.makefile +++ /dev/null @@ -1,4 +0,0 @@ -deploy_host := root@mors -nixpkgs_url := https://github.com/Lassulus/nixpkgs -nixpkgs_rev := 1879a011925c561f0a7fd4043da0768bbff41d0b -secrets_dir := /home/lass/secrets/mors diff --git a/0make/lass/uriel.makefile b/0make/lass/uriel.makefile deleted file mode 100644 index 9762e8ed4..000000000 --- a/0make/lass/uriel.makefile +++ /dev/null @@ -1,4 +0,0 @@ -deploy_host := root@uriel -nixpkgs_url := https://github.com/Lassulus/nixpkgs -nixpkgs_rev := 961fcbabd7643171ea74bd550fee1ce5c13c2e90 -secrets_dir := /home/lass/secrets/uriel From 5b25d459ecbd5cb4f7b6338f6f6f530357fdb01d Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 29 Jul 2015 15:31:34 +0200 Subject: [PATCH 3/4] tv 2 base: define shellAliases with mkForce --- tv/2configs/base.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tv/2configs/base.nix b/tv/2configs/base.nix index 997d4c235..89a66115a 100644 --- a/tv/2configs/base.nix +++ b/tv/2configs/base.nix @@ -90,7 +90,7 @@ in rxvt_unicode.terminfo ]; - environment.shellAliases = { + environment.shellAliases = mkForce { # alias cal='cal -m3' gp = "${pkgs.pari}/bin/gp -q"; df = "df -h"; From 9756bedf5286fe716740d8f224b5c4094843f984 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 2 Aug 2015 21:13:06 +0200 Subject: [PATCH 4/4] lass 1&2: extend fastpoke pages. --- lass/1systems/mors.nix | 5 +++++ lass/2configs/fastpoke-pages.nix | 14 ++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index 5bef56682..e7edcccea 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -44,6 +44,11 @@ networking.wireless.enable = true; networking.extraHosts = '' + 10.243.206.102 habsys.de + 10.243.206.102 pixelpocket.de + 10.243.206.102 karlaskop.de + 10.243.206.102 ubikmedia.de + 10.243.206.102 apanowicz.de ''; nix.maxJobs = 4; diff --git a/lass/2configs/fastpoke-pages.nix b/lass/2configs/fastpoke-pages.nix index 1f997eb6a..9c80fa77a 100644 --- a/lass/2configs/fastpoke-pages.nix +++ b/lass/2configs/fastpoke-pages.nix @@ -19,6 +19,13 @@ let #networking.extraHosts = '' # 10.243.206.102 ${domain} #''; + users.extraUsers = { + "${domain}" = { + name = "${domain}"; + home = "/var/lib/http/${domain}"; + createHome = true; + }; + }; }; in { @@ -44,7 +51,6 @@ in { krebs.nginx = { enable = true; servers = { - #"habsys.de" = { # server-names = [ # "habsys.de" @@ -84,9 +90,9 @@ in { }; }; - #services.postgresql = { - # enable = true; - #}; + services.postgresql = { + enable = true; + }; #config.services.vsftpd = { # enable = true;