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

krebs.users.[mt]v: set mail

Browse Source
This commit is contained in:
tv 2015-07-25 01:06:13 +02:00
parent 939f1b20c2
commit d03dba41d6
6 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
1systems/tv/wu.nix
View File

@ -152,7 +152,7 @@ in
{ {
krebs.urlwatch = { krebs.urlwatch = {
enable = true; enable = true;
mailto = "tv@wu.retiolum"; # TODO mailto = config.krebs.users.tv.mail;
onCalendar = "*-*-* 05:00:00"; onCalendar = "*-*-* 05:00:00";
urls = [ urls = [
## nixpkgs maintenance ## nixpkgs maintenance

2
2configs/tv/base.nix
View File

@ -47,7 +47,7 @@ in
} }
{ {
security.sudo.extraConfig = '' security.sudo.extraConfig = ''
Defaults mailto="tv@wu.retiolum" Defaults mailto="${config.krebs.users.tv.mail}"
''; '';
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
} }

2
2configs/tv/charybdis.nix
View File

@ -170,7 +170,7 @@ let
admin { admin {
name = "tv"; name = "tv";
description = "peer"; description = "peer";
email = "tv@wu.retiolum"; mail = "${config.krebs.users.tv.mail}";
}; };
log { log {

15
2configs/tv/exim-smarthost.nix
View File

@ -11,20 +11,21 @@ in
let let
retiolumHostname = "${config.networking.hostName}.retiolum"; retiolumHostname = "${config.networking.hostName}.retiolum";
internet-aliases = [ internet-aliases = with config.krebs.users; [
{ from = "tomislav@viljetic.de"; to = "tv@wu.retiolum"; } { from = "tomislav@viljetic.de"; to = tv.mail; }
# (mindestens) lisp-stammtisch und elli haben die: # (mindestens) lisp-stammtisch und elli haben die:
{ from = "tv@viljetic.de"; to = "tv@wu.retiolum"; } { from = "tv@viljetic.de"; to = tv.mail; }
{ from = "tv@destroy.dyn.shackspace.de"; to = "tv@wu.retiolum"; } { from = "tv@destroy.dyn.shackspace.de"; to = tv.mail; }
{ from = "mirko@viljetic.de"; to = "mv@cd.retiolum"; } { from = "mirko@viljetic.de"; to = mv.mail; }
# TODO killme (wo wird die benutzt?) # TODO killme (wo wird die benutzt?)
{ from = "tv@cd.retiolum"; to = "tv@wu.retiolum"; } { from = "tv@cd.retiolum"; to = tv.mail; }
{ from = "postmaster@krebsco.de"; to = "tv@wu.retiolum"; } # TODO lists@smtp.retiolum [consul]
{ from = "postmaster@krebsco.de"; to = tv.mail; }
]; ];
system-aliases = [ system-aliases = [

2
2configs/tv/smartd.nix
View File

@ -8,7 +8,7 @@
device = "DEVICESCAN"; device = "DEVICESCAN";
options = toString [ options = toString [
"-a" "-a"
"-m tv@wu.retiolum" "-m ${config.krebs.users.tv.mail}"
"-s (O/../.././09|S/../.././04|L/../../6/05)" "-s (O/../.././09|S/../.././04|L/../../6/05)"
]; ];
} }

2
3modules/krebs/default.nix
View File

@ -309,9 +309,11 @@ let
}; };
users = addNames { users = addNames {
mv = { mv = {
mail = "mv@cd.retiolum";
pubkey = readFile ../../Zpubkeys/mv_vod.ssh.pub; pubkey = readFile ../../Zpubkeys/mv_vod.ssh.pub;
}; };
tv = { tv = {
mail = "tv@wu.retiolum";
pubkey = readFile ../../Zpubkeys/tv_wu.ssh.pub; pubkey = readFile ../../Zpubkeys/tv_wu.ssh.pub;
}; };
}; };