Merge remote-tracking branch 'cloudkrebs/master'
This commit is contained in:
commit
393444d5f4
|
@ -1,4 +0,0 @@
|
||||||
deploy_host := root@cloudkrebs
|
|
||||||
nixpkgs_url := https://github.com/Lassulus/nixpkgs
|
|
||||||
nixpkgs_rev := 1879a011925c561f0a7fd4043da0768bbff41d0b
|
|
||||||
secrets_dir := /home/lass/secrets/cloudkrebs
|
|
|
@ -1,4 +0,0 @@
|
||||||
deploy_host := root@mors
|
|
||||||
nixpkgs_url := https://github.com/Lassulus/nixpkgs
|
|
||||||
nixpkgs_rev := 1879a011925c561f0a7fd4043da0768bbff41d0b
|
|
||||||
secrets_dir := /home/lass/secrets/mors
|
|
|
@ -1,4 +0,0 @@
|
||||||
deploy_host := root@uriel
|
|
||||||
nixpkgs_url := https://github.com/Lassulus/nixpkgs
|
|
||||||
nixpkgs_rev := 961fcbabd7643171ea74bd550fee1ce5c13c2e90
|
|
||||||
secrets_dir := /home/lass/secrets/uriel
|
|
|
@ -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 = [
|
||||||
{
|
{
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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";
|
||||||
|
|
Loading…
Reference in New Issue
Block a user