maralorn/nixos-config
1
0
Fork 0
Code Wiki Activity

New logfeed version

Browse source
This commit is contained in:
Malte Brandy 2020-12-13 21:16:46 +01:00
parent c797628d06
commit 3e09c2c157
5 changed files with 27 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
home-manager/roles/mail2rss.nix
View file

@ -1,15 +1,33 @@
{ lib, pkgs, config, ... }: {
{ lib, pkgs, config, ... }:
let
mail2rss = pkgs.writeHaskellScript {
name = "mail2rss";
bins = [ pkgs.notmuch pkgs.mblaze pkgs.isync pkgs.logfeed ];
imports = [ "System.Environment (setEnv)" ];
} ''
main = do
setEnv "NOTMUCH_CONFIG" "${
config.home.sessionVariables.NOTMUCH_CONFIG or ""
}"
mbsync "-a"
notmuch "new" "--quiet"
mail2rss "${config.accounts.email.maildirBasePath}" "hera/Move/readlater" &> Truncate "/var/www/rss/mails2.xml"
files <- notmuch "search" "--output" "files" "folder:hera/Move/readlater" |> capture
writeOutput files |> mrefile "${config.accounts.email.maildirBasePath}/hera/Archiv/unsortiert"
mbsync "-a"
notmuch "new" "--quiet"
'';
in {
systemd.user = {
timers.mail2rss = {
Timer.OnCalendar = "19:57";
Timer.OnCalendar = "19:58";
Install.WantedBy = [ "timers.target" ];
};
services = {
mail2rss = {
Unit.Description = "Mail to rss exporter";
Service = {
ExecStart = toString (pkgs.writeShellScript "mail2rss"
"${pkgs.logfeed}/bin/mail2rss ${config.accounts.email.maildirBasePath} hera/Move/readlater > /var/www/rss/mails2.xml");
ExecStart = "${mail2rss}/bin/mail2rss";
Type = "oneshot";
};
};

8
home-manager/roles/weechat/default.nix
View file

@ -112,16 +112,16 @@ in {
};
systemd.user = {
timers.logfeed = {
timers.log2rss = {
Timer.OnCalendar = "19:55";
Install.WantedBy = [ "timers.target" ];
};
services = {
logfeed = {
Unit.Description = "Logfeed";
log2rss = {
Unit.Description = "log2rss";
Service = {
ExecStart =
"${pkgs.logfeed}/bin/logfeed /var/www/rss/chats.xml";
"${pkgs.logfeed}/bin/log2rss /var/www/rss/chats.xml";
Type = "oneshot";
};
};

2
nix/sources.json
View file

@ -41,7 +41,7 @@
"branch": "master",
"ref": "master",
"repo": "git@hera.m-0.eu:logfeed",
"rev": "acfbbcc0144dab51f75409adfe24cadb2974c6fa",
"rev": "5de2118aeb0eb4be09a2a825d052a705378d9cc8",
"type": "git"
},
"nixos-20.09": {

1
nixos/machines/apollo/configuration.nix
View file

@ -31,7 +31,6 @@ in {
allowedIPs = [ "::/0" ];
# endpoint =
# "[${hosts.hera-wg-host}]:${builtins.toString wireguard.port}";
# If v6 is not available:
endpoint = "[${hosts.hera-v4}]:${builtins.toString wireguard.port}";
presharedKeyFile = pkgs.privatePath "wireguard/psk";
persistentKeepalive = 25;

15
nixos/machines/hera/mail.nix
View file

@ -29,21 +29,6 @@ in {
imports =
[ ../../roles "${(import ../../../nix/sources.nix).nixos-mailserver}" ];
systemd.services = {
atomail = {
script = let
atomail = pkgs.fetchFromGitHub {
owner = "remko";
repo = "atomail";
rev = "f079966cb808f51fcc67be91b609942cdb49898a";
sha256 = "0a4j4xajn2yysgcb17jmb6ak148kk0kwf7khml7dbnh7807fv9b6";
};
in ''
${pkgs.python}/bin/python ${atomail}/atomail.py --title "Readlater-E-Mails" --uri="http://localhost:8842/mails.xml" /var/www/rss/mails.xml --mode=maildir --file "/var/vmail/maralorn.de/malte.brandy/.Move.readlater/" --max-items=500 --max-time=2880
${pkgs.rsync}/bin/rsync -a /var/vmail/maralorn.de/malte.brandy/.Move.readlater/cur/ /var/vmail/maralorn.de/malte.brandy/.Archiv.unsortiert/cur --remove-source-files
'';
startAt = "19:58:00";
serviceConfig.Type = "oneshot";
};
rspamd = {
serviceConfig = {
Restart = "always";