diff options
| author | makefu <github@syntax-fehler.de> | 2015-08-04 15:21:38 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-08-04 15:21:38 +0200 |
| commit | 393444d5f4edcfdcab4b4e222b2760f39d378ee6 (patch) | |
| tree | e9de39223aff0e02b880c6695ffd30f58955cfcf /lass | |
| parent | 7d75cf113fc2ed694e100cd1e6e0f040ef870f19 (diff) | |
| parent | b4606691878584d39018834354ef9e4a6048f4c4 (diff) | |
Merge remote-tracking branch 'cloudkrebs/master'
Diffstat (limited to 'lass')
| -rw-r--r-- | lass/1systems/cloudkrebs.nix | 12 | ||||
| -rw-r--r-- | lass/1systems/mors.nix | 5 | ||||
| -rw-r--r-- | lass/2configs/fastpoke-pages.nix | 16 |
3 files changed, 22 insertions, 11 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/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 74e92ccc3..9c80fa77a 100644 --- a/lass/2configs/fastpoke-pages.nix +++ b/lass/2configs/fastpoke-pages.nix @@ -19,11 +19,18 @@ let #networking.extraHosts = '' # 10.243.206.102 ${domain} #''; + users.extraUsers = { + "${domain}" = { + name = "${domain}"; + home = "/var/lib/http/${domain}"; + createHome = true; + }; + }; }; in { imports = [ - ../../3modules/lass/iptables.nix + ../3modules/iptables.nix ] ++ map createStaticPage [ "habsys.de" "pixelpocket.de" @@ -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; |