From a3a82eb3e0171a60c59ddbd1b276b03ccef54f72 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 5 Aug 2015 15:24:50 +0200 Subject: make eval: don't use $json anymore --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index ca828fd..54656e9 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ deploy:;@ eval: @ ifeq ($(filter),json) - extraArgs=--json + extraArgs='--json --strict' filter() { jq -r .; } else filter() { cat; } @@ -33,8 +33,6 @@ endif NIX_PATH=stockholm=$$PWD:$$NIX_PATH \ nix-instantiate \ $${extraArgs-} \ - $${json+--json} \ - $${json+--strict} \ --eval \ -A "$$get" \ '' \ -- cgit v1.2.3 From 04b4fdfc5c1d1a718adab4309e7ce9dbc6453b18 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 6 Aug 2015 00:11:26 +0200 Subject: tv 2 git: add public repo: cac --- tv/2configs/git.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix index ecb98ce..8d66249 100644 --- a/tv/2configs/git.nix +++ b/tv/2configs/git.nix @@ -20,6 +20,9 @@ let rules = concatMap make-rules (attrValues repos); public-repos = mapAttrs make-public-repo { + cac = { + desc = "CloudAtCost command line interface"; + }; cgserver = {}; crude-mail-setup = {}; dot-xmonad = {}; -- cgit v1.2.3 From ec3e450bfda4a7754f24916c7cd4ddd88e1dbbc4 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 6 Aug 2015 00:21:40 +0200 Subject: krebs pkgs cac: init at 07ef31c --- tv/1systems/wu.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix index 27691ec..ae6ef13 100644 --- a/tv/1systems/wu.nix +++ b/tv/1systems/wu.nix @@ -91,6 +91,7 @@ in sxiv texLive tmux + tvpkgs.cac tvpkgs.dic zathura -- cgit v1.2.3 From 47e8797f9b4715930bb64176d25779f82cfe55d7 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 13 Aug 2015 11:46:09 +0200 Subject: {tv 2 => krebs 3}/exim-retiolum --- tv/1systems/nomic.nix | 4 +- tv/1systems/wu.nix | 4 +- tv/2configs/exim-retiolum.nix | 126 ------------------------------------------ 3 files changed, 6 insertions(+), 128 deletions(-) delete mode 100644 tv/2configs/exim-retiolum.nix diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix index b9a10cb..896c1ad 100644 --- a/tv/1systems/nomic.nix +++ b/tv/1systems/nomic.nix @@ -25,7 +25,6 @@ with lib; ../2configs/AO753.nix ../2configs/base.nix ../2configs/consul-server.nix - ../2configs/exim-retiolum.nix ../2configs/git.nix { tv.iptables = { @@ -38,6 +37,9 @@ with lib; ]; }; } + { + krebs.exim-retiolum = true; + } { krebs.nginx = { enable = true; diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix index ae6ef13..a5cbde3 100644 --- a/tv/1systems/wu.nix +++ b/tv/1systems/wu.nix @@ -29,7 +29,6 @@ in ../2configs/w110er.nix ../2configs/base.nix ../2configs/consul-client.nix - ../2configs/exim-retiolum.nix ../2configs/git.nix ../2configs/mail-client.nix ../2configs/xserver.nix @@ -165,6 +164,9 @@ in ]; }; } + { + krebs.exim-retiolum = true; + } { krebs.nginx = { enable = true; diff --git a/tv/2configs/exim-retiolum.nix b/tv/2configs/exim-retiolum.nix deleted file mode 100644 index 851a0c6..0000000 --- a/tv/2configs/exim-retiolum.nix +++ /dev/null @@ -1,126 +0,0 @@ -{ config, pkgs, ... }: - -{ - services.exim = - # This configuration makes only sense for retiolum-enabled hosts. - # TODO modular configuration - assert config.krebs.retiolum.enable; - let - # TODO get the hostname from config.krebs.retiolum. - retiolumHostname = "${config.networking.hostName}.retiolum"; - in - { enable = true; - config = '' - primary_hostname = ${retiolumHostname} - domainlist local_domains = @ : localhost - domainlist relay_to_domains = *.retiolum - hostlist relay_from_hosts = <; 127.0.0.1 ; ::1 - - acl_smtp_rcpt = acl_check_rcpt - acl_smtp_data = acl_check_data - - host_lookup = * - rfc1413_hosts = * - rfc1413_query_timeout = 5s - - log_file_path = syslog - syslog_timestamp = false - syslog_duplication = false - - begin acl - - acl_check_rcpt: - accept hosts = : - control = dkim_disable_verify - - deny message = Restricted characters in address - domains = +local_domains - local_parts = ^[.] : ^.*[@%!/|] - - deny message = Restricted characters in address - domains = !+local_domains - local_parts = ^[./|] : ^.*[@%!] : ^.*/\\.\\./ - - accept local_parts = postmaster - domains = +local_domains - - #accept - # hosts = *.retiolum - # domains = *.retiolum - # control = dkim_disable_verify - - #require verify = sender - - accept hosts = +relay_from_hosts - control = submission - control = dkim_disable_verify - - accept authenticated = * - control = submission - control = dkim_disable_verify - - require message = relay not permitted - domains = +local_domains : +relay_to_domains - - require verify = recipient - - accept - - - acl_check_data: - accept - - - begin routers - - retiolum: - driver = manualroute - domains = ! ${retiolumHostname} : *.retiolum - transport = remote_smtp - route_list = ^.* $0 byname - no_more - - nonlocal: - debug_print = "R: nonlocal for $local_part@$domain" - driver = redirect - domains = ! +local_domains - allow_fail - data = :fail: Mailing to remote domains not supported - no_more - - local_user: - # debug_print = "R: local_user for $local_part@$domain" - driver = accept - check_local_user - # local_part_suffix = +* : -* - # local_part_suffix_optional - transport = home_maildir - cannot_route_message = Unknown user - - - begin transports - - remote_smtp: - driver = smtp - - home_maildir: - driver = appendfile - maildir_format - directory = $home/Maildir - directory_mode = 0700 - delivery_date_add - envelope_to_add - return_path_add - # group = mail - # mode = 0660 - - begin retry - *.retiolum * F,42d,1m - * * F,2h,15m; G,16h,1h,1.5; F,4d,6h - - begin rewrite - - begin authenticators - ''; - }; -} -- cgit v1.2.3