diff --git a/base.yml b/base.yml index b237090..b6bc7b3 100644 --- a/base.yml +++ b/base.yml @@ -105,7 +105,32 @@ - name: Install msmtp apt: - name: [msmtp, msmtp-mta] + name: [msmtp, msmtp-mta, bsd-mailx] + + - name: Ensure root crontab sends email from me + community.general.cronvar: + user: root + name: MAILFROM + value: "{{ vault_smtp_username }}" + + - name: Ensure my crontab sends email from me + community.general.cronvar: + user: mdk + name: MAILFROM + value: "{{ vault_smtp_username }}" + + - name: Ensure root crontab sends email to me + community.general.cronvar: + user: root + name: MAILTO + value: "{{ vault_smtp_username }}" + + - name: Ensure my crontab sends email to me + community.general.cronvar: + user: root + name: MAILTO + value: "{{ vault_smtp_username }}" + handlers: - name: reload fail2ban diff --git a/files/.urlwatch/urls.yaml b/files/.urlwatch/urls.yaml new file mode 100644 index 0000000..1e8b1d9 --- /dev/null +++ b/files/.urlwatch/urls.yaml @@ -0,0 +1,56 @@ +--- +url: https://mdk.fr/ +filter: + - html2text: + method: pyhtml2text + unicode_snob: true + ignore_images: true + single_line_break: true +--- +url: https://carrieres-sur-seine.fr/actualites +filter: + - re.sub: 'index\.php/' + - html2text: + method: pyhtml2text + unicode_snob: true + ignore_images: true + single_line_break: true + body_width: 0 +--- +url: https://carrieres-sur-seine.fr/menus-scolaires +filter: + - re.sub: 'index\.php/' + - html2text: + method: pyhtml2text + unicode_snob: true + ignore_images: true + single_line_break: true + body_width: 0 +--- +url: https://www.tiobe.com/tiobe-index/ +filter: + - html2text: + method: pyhtml2text + unicode_snob: true + ignore_images: true + single_line_break: true +--- +url: https://mdk.fr/x/ +--- +url: https://wyz.fr +filter: + - html2text: + method: pyhtml2text + unicode_snob: true + ignore_images: true + single_line_break: true +--- +url: https://cdimage.debian.org/debian-cd/current/amd64/bt-cd/ +filter: + - html2text: + method: pyhtml2text + unicode_snob: true + ignore_images: true + single_line_break: true + + diff --git a/files/.urlwatch/urlwatch.yaml b/files/.urlwatch/urlwatch.yaml new file mode 100644 index 0000000..3b85b41 --- /dev/null +++ b/files/.urlwatch/urlwatch.yaml @@ -0,0 +1,28 @@ +--- + +display: + error: true + new: true + unchanged: false +job_defaults: + all: {} + browser: {} + shell: {} + url: {} +report: + email: + enabled: true + from: 'mdk@mdk.fr' + html: false + method: sendmail + sendmail: + path: /usr/sbin/sendmail + subject: '{count} changes: {jobs}' + to: 'julien@palard.fr' + html: + diff: unified + text: + details: true + footer: true + line_length: 75 + minimal: false diff --git a/files/rss2email.cfg b/files/rss2email.cfg index 58b9950..f5dda9a 100644 --- a/files/rss2email.cfg +++ b/files/rss2email.cfg @@ -1,25 +1,25 @@ [DEFAULT] -from = user@rss2email.invalid +from = mdk@mdk.fr user-agent = rss2email/__VERSION__ (__URL__) use-8bit = False force-from = False use-publisher-email = False name-format = {feed-title}: {author} -to = julien@palard.fr -proxy = +to = mdk+r2e@mdk.fr +proxy = feed-timeout = 60 same-server-fetch-interval = 0 active = True digest = False date-header = False date-header-order = modified, issued, created, expired -bonus-header = +bonus-header = trust-guid = True trust-link = False reply-changes = False encodings = US-ASCII, ISO-8859-1, UTF-8, BIG5, ISO-2022-JP -post-process = -digest-post-process = +post-process = +digest-post-process = html-mail = True multipart-html = False use-css = False @@ -66,22 +66,7 @@ wrap-links = True body-width = 0 email-protocol = sendmail sendmail = /usr/sbin/sendmail -sendmail_config = -smtp-auth = False -smtp-username = username -smtp-password = password -smtp-server = smtp.yourisp.net:25 -smtp-port = 465 -smtp-ssl = False -imap-auth = False -imap-username = username -imap-password = password -imap-server = imap.yourisp.net -imap-port = 143 -imap-ssl = False -imap-mailbox = INBOX -maildir-path = ~/Maildir -maildir-mailbox = INBOX +sendmail_config = verbose = warning [feed.Agarri-Sécurité-informatique-offensive] @@ -154,8 +139,10 @@ url = https://pidgin.im/post/index.xml url = https://code.gouv.fr/feed/feed.xml [feed.krebsonsecurity] -url = https://krebsonsecurity.com/ +url = https://krebsonsecurity.com/feed/ [feed.ycombinator] -url = https://hnrss.org/newest?points=300 +url = https://hnrss.org/newest?points=400 +[feed.framework] +url = https://frame.work/fr/fr/blog.rss \ No newline at end of file diff --git a/requirements.yml b/requirements.yml index bb2ff69..af6b8b9 100644 --- a/requirements.yml +++ b/requirements.yml @@ -2,5 +2,3 @@ roles: - src: julienpalard.nginx version: master - - src: julienpalard.ctfd - version: master diff --git a/urlwatch.yml b/urlwatch.yml new file mode 100644 index 0000000..009d64c --- /dev/null +++ b/urlwatch.yml @@ -0,0 +1,31 @@ +--- + +- hosts: mdk + tasks: + - name: Install urlwatch + apt: name=urlwatch state=present + + - name: urlwatch cron + cron: + user: mdk + name: "urlwatch" + minute: "3" + job: "/usr/bin/urlwatch >/dev/null" + + - name: Configure urlwatch + copy: + src: .urlwatch/urlwatch.yaml + dest: /home/mdk/.urlwatch/urlwatch.yaml + owner: mdk + group: mdk + mode: 0644 + backup: true + + - name: Configure urlwatch urls + copy: + src: .urlwatch/urls.yaml + dest: /home/mdk/.urlwatch/urls.yaml + owner: mdk + group: mdk + mode: 0644 + backup: true