Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'cloudkrebs/master'

Browse Source
This commit is contained in:
makefu 2015-08-04 15:21:38 +02:00
commit 393444d5f4
7 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
0make/lass/cloudkrebs.makefile
View File

@ -1,4 +0,0 @@
deploy_host := root@cloudkrebs
nixpkgs_url := https://github.com/Lassulus/nixpkgs
nixpkgs_rev := 1879a011925c561f0a7fd4043da0768bbff41d0b
secrets_dir := /home/lass/secrets/cloudkrebs

4
0make/lass/mors.makefile
View File

@ -1,4 +0,0 @@
deploy_host := root@mors
nixpkgs_url := https://github.com/Lassulus/nixpkgs
nixpkgs_rev := 1879a011925c561f0a7fd4043da0768bbff41d0b
secrets_dir := /home/lass/secrets/mors

4
0make/lass/uriel.makefile
View File

@ -1,4 +0,0 @@
deploy_host := root@uriel
nixpkgs_url := https://github.com/Lassulus/nixpkgs
nixpkgs_rev := 961fcbabd7643171ea74bd550fee1ce5c13c2e90
secrets_dir := /home/lass/secrets/uriel

12
lass/1systems/cloudkrebs.nix
View File

@ -2,12 +2,12 @@
{ {
imports = [ imports = [
../../2configs/tv/CAC-Developer-2.nix ../../tv/2configs/CAC-Developer-2.nix
../../2configs/tv/CAC-CentOS-7-64bit.nix ../../tv/2configs/CAC-CentOS-7-64bit.nix
../../2configs/lass/base.nix ../2configs/base.nix
../../2configs/lass/retiolum.nix ../2configs/retiolum.nix
../../2configs/lass/fastpoke-pages.nix ../2configs/fastpoke-pages.nix
../../2configs/lass/new-repos.nix ../2configs/new-repos.nix
{ {
networking.interfaces.enp2s1.ip4 = [ networking.interfaces.enp2s1.ip4 = [
{ {

5
lass/1systems/mors.nix
View File

@ -44,6 +44,11 @@
networking.wireless.enable = true; networking.wireless.enable = true;
networking.extraHosts = '' 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; nix.maxJobs = 4;

16
lass/2configs/fastpoke-pages.nix
View File

@ -19,11 +19,18 @@ let
#networking.extraHosts = '' #networking.extraHosts = ''
# 10.243.206.102 ${domain} # 10.243.206.102 ${domain}
#''; #'';
users.extraUsers = {
"${domain}" = {
name = "${domain}";
home = "/var/lib/http/${domain}";
createHome = true;
};
};
}; };
in { in {
imports = [ imports = [
../../3modules/lass/iptables.nix ../3modules/iptables.nix
] ++ map createStaticPage [ ] ++ map createStaticPage [
"habsys.de" "habsys.de"
"pixelpocket.de" "pixelpocket.de"
@ -44,7 +51,6 @@ in {
krebs.nginx = { krebs.nginx = {
enable = true; enable = true;
servers = { servers = {
#"habsys.de" = { #"habsys.de" = {
# server-names = [ # server-names = [
# "habsys.de" # "habsys.de"
@ -84,9 +90,9 @@ in {
}; };
}; };
#services.postgresql = { services.postgresql = {
# enable = true; enable = true;
#}; };
#config.services.vsftpd = { #config.services.vsftpd = {
# enable = true; # enable = true;

2
tv/2configs/base.nix
View File

@ -90,7 +90,7 @@ in
rxvt_unicode.terminfo rxvt_unicode.terminfo
]; ];
environment.shellAliases = { environment.shellAliases = mkForce {
# alias cal='cal -m3' # alias cal='cal -m3'
gp = "${pkgs.pari}/bin/gp -q"; gp = "${pkgs.pari}/bin/gp -q";
df = "df -h"; df = "df -h";