summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-08-04 15:21:38 +0200
committermakefu <github@syntax-fehler.de>2015-08-04 15:21:38 +0200
commit393444d5f4edcfdcab4b4e222b2760f39d378ee6 (patch)
treee9de39223aff0e02b880c6695ffd30f58955cfcf
parent7d75cf113fc2ed694e100cd1e6e0f040ef870f19 (diff)
parentb4606691878584d39018834354ef9e4a6048f4c4 (diff)
Merge remote-tracking branch 'cloudkrebs/master'
-rw-r--r--0make/lass/cloudkrebs.makefile4
-rw-r--r--0make/lass/mors.makefile4
-rw-r--r--0make/lass/uriel.makefile4
-rw-r--r--lass/1systems/cloudkrebs.nix12
-rw-r--r--lass/1systems/mors.nix5
-rw-r--r--lass/2configs/fastpoke-pages.nix16
-rw-r--r--tv/2configs/base.nix2
7 files changed, 23 insertions, 24 deletions
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
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;
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";