More TODO cleanup

diff --git a/TODO.md b/TODO.md
index eb2ac2e30f21e8b75732cb4d408f8a9a183ce601..e1c23c4417855bcb9b7bbe873151f479a12eb23d 100644 (file)
--- a/TODO.md
+++ b/TODO.md
@@ -66,7 +66,6 @@ Low priority
 
 - nodo: solve network-manager / wicd conflict.
 - merge, review, pull requests for all modules.
-- munin: lvm monitoring.
 - pyroscope: torrent workflow: torrent-maker, magnet2torrent and torrent-reseed:
   - http://wiki.rtorrent.org/MagnetUri
   - http://dan.folkes.me/2012/04/19/converting-a-magnet-link-into-a-torrent/
@@ -81,23 +80,10 @@ Low priority
   - make all apache sites listen to 8080.
 - syslog-ng: use conf.d.
 - knock integration via https://github.com/juasiepo/knockd
-- apache / websites:
-  - try libapache2-mod-security2.
-  - deploy https://git.immerda.ch/csp-report/
-- ssh access restrictions:
-  - using shorewall: http://www.debian-administration.org/articles/250#comment_16
-  - alowed users / groups.
+- drupal/wordpress: cronjobs: switch to site user.
 - mail:
-  - review dovecot recipient delimiter handling: to which mailbox messages should be sent?
-- drupal/wordpress:
-  - cronjob/cli: switch to site user.
-- mail:
-  - schleuder: manage `/etc/schleuder/schleuder.conf`, using `superadminaddr: root` or other recipient, to avoid mails.
-    sent as `root@localhost`.
-  - mlmmj:
-    - lists with hyphens are not working when mails are sent directly, but work when sent to an alias.
-    - `mail::mlmmj::domain` needs updating or additional domains should be added into `relay_domains`.
   - support for [preventing SPAM connections with bird](http://www.debian-administration.org/article/715/Preventing_SPAM_connections_with_bird.).
+  - review dovecot recipient delimiter handling: to which mailbox messages should be sent?
   - deploy https://git.autistici.org/ale/smtp-fp/tree/master (use cert from ca.autistici.org/ca.pem).
            https://github.com/EFForg/starttls-everywhere
   - deploy https://developer.mozilla.org/en-US/docs/Mozilla/Thunderbird/Autoconfiguration#Configuration_server_at_ISP