makefu/stockholm
1
0
Fork 0
Code Issues Pull requests Actions1 Packages Projects Releases Wiki Activity

l 2: move domes mail stuff to 2/websites

Browse source
This commit is contained in:
lassulus 2016-07-21 19:47:42 +02:00
parent 6bb208cb69
commit d9c6fe8d3a
2 changed files with 35 additions and 9 deletions
lass/2configs
exim-smarthost.nix
websites
domsen.nix

1
lass/2configs/exim-smarthost.nix
View file

@ -27,7 +27,6 @@ with config.krebs.lib;
{ from = "lass@aidsballs.de"; to = lass.mail; } { from = "lass@aidsballs.de"; to = lass.mail; }
{ from = "wordpress@ubikmedia.de"; to = lass.mail; } { from = "wordpress@ubikmedia.de"; to = lass.mail; }
{ from = "finanzamt@lassul.us"; to = lass.mail; } { from = "finanzamt@lassul.us"; to = lass.mail; }
{ from = "dominik@apanowicz.de"; to = "dma@ubikmedia.eu"; }
{ from = "netzclub@lassul.us"; to = lass.mail; } { from = "netzclub@lassul.us"; to = lass.mail; }
{ from = "nebenan@lassul.us"; to = lass.mail; } { from = "nebenan@lassul.us"; to = lass.mail; }
]; ];

43
lass/2configs/websites/domsen.nix
View file

@ -110,14 +110,6 @@ in {
}; };
}; };
users.users.domsen = {
uid = genid "domsen";
description = "maintenance acc for domsen";
home = "/home/domsen";
useDefaultShell = true;
extraGroups = [ "nginx" ];
createHome = true;
};
#services.phpfpm.phpOptions = '' #services.phpfpm.phpOptions = ''
# extension=${pkgs.phpPackages.apcu}/lib/php/extensions/apcu.so # extension=${pkgs.phpPackages.apcu}/lib/php/extensions/apcu.so
@ -133,5 +125,40 @@ in {
cat ${pkgs.php}/etc/php-recommended.ini > $out cat ${pkgs.php}/etc/php-recommended.ini > $out
echo "$options" >> $out echo "$options" >> $out
''; '';
# MAIL STUFF
# TODO: make into its own module
services.dovecot2 = {
enable = true;
mailLocation = "maildir:~/Mail";
};
krebs.iptables.tables.filter.INPUT.rules = [
{ predicate = "-p tcp --dport pop3"; target = "ACCEPT"; }
{ predicate = "-p tcp --dport imap"; target = "ACCEPT"; }
];
krebs.exim-smarthost = {
internet-aliases = [
{ from = "dominik@apanowicz.de"; to = "dma@ubikmedia.eu"; }
{ from = "mail@jla-trading.com"; to = "jla-trading"; }
];
system-aliases = [
];
};
users.users.domsen = {
uid = genid "domsen";
description = "maintenance acc for domsen";
home = "/home/domsen";
useDefaultShell = true;
extraGroups = [ "nginx" ];
createHome = true;
};
users.users.jla-trading = {
uid = genid "jla-trading";
home = "/home/jla-trading";
useDefaultShell = true;
createHome = true;
};
} }