Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
ansible-warpzone
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
infrastruktur
ansible-warpzone
Commits
b49eee36
Commit
b49eee36
authored
2 years ago
by
speckij
Browse files
Options
Downloads
Patches
Plain Diff
fix missing Date Header in sendmail_plenum.py (closes
#39
)
parent
50459ed9
No related branches found
No related tags found
1 merge request
!21
fix missing Date Header in sendmail_plenum.py (closes #39)
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
webserver/docker_dokuwiki/tasks/main.yml
+1
-1
1 addition, 1 deletion
webserver/docker_dokuwiki/tasks/main.yml
webserver/docker_dokuwiki/templates/sendmail_plenum.py
+4
-2
4 additions, 2 deletions
webserver/docker_dokuwiki/templates/sendmail_plenum.py
with
5 additions
and
3 deletions
webserver/docker_dokuwiki/tasks/main.yml
+
1
−
1
View file @
b49eee36
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
project_src
:
/srv/dokuwiki/
project_src
:
/srv/dokuwiki/
state
:
present
state
:
present
-
name
:
Cronjob für Mailversand Plenumsmail
(disbled until proper fix)
-
name
:
Cronjob für Mailversand Plenumsmail
cron
:
cron
:
name
:
"
sendmail_plenum"
name
:
"
sendmail_plenum"
weekday
:
"
0"
weekday
:
"
0"
...
...
This diff is collapsed.
Click to expand it.
webserver/docker_dokuwiki/templates/sendmail_plenum.py
+
4
−
2
View file @
b49eee36
import
smtplib
import
smtplib
import
datetime
import
datetime
from
email.message
import
EmailMessage
from
email.message
import
EmailMessage
from
email.utils
import
formatdate
with
open
(
"
/srv/dokuwiki/data/data/pages/intern/diskussionsthemen.txt
"
)
as
fp
:
with
open
(
"
/srv/dokuwiki/data/data/pages/intern/diskussionsthemen.txt
"
)
as
fp
:
raw
=
fp
.
read
().
split
(
'
\n
'
)
raw
=
fp
.
read
().
split
(
'
\n
'
)
...
@@ -39,7 +40,7 @@ with open("/srv/dokuwiki/data/data/pages/intern/diskussionsthemen.txt") as fp:
...
@@ -39,7 +40,7 @@ with open("/srv/dokuwiki/data/data/pages/intern/diskussionsthemen.txt") as fp:
Liebe Zonies,
Liebe Zonies,
es gibt wieder Themen die im Plenum besprochen werden sollen. Der nächste
es gibt wieder Themen die im Plenum besprochen werden sollen. Der nächste
Reguläre Termin ist am nächsten Dienstag (
{
str
(
d
)
}
).
Reguläre Termin ist am nächsten Dienstag (
{
str
(
d
)
}
)
um 20:00
.
Im Wiki (https://wiki.warpzone.ms/intern:diskussionsthemen#diskussionsthemen_naechstes_plenum_automatische_einladung)
Im Wiki (https://wiki.warpzone.ms/intern:diskussionsthemen#diskussionsthemen_naechstes_plenum_automatische_einladung)
stehen folgende Themen:
stehen folgende Themen:
...
@@ -54,9 +55,10 @@ sendmail_plenum.py
...
@@ -54,9 +55,10 @@ sendmail_plenum.py
"""
"""
msg
=
EmailMessage
()
msg
=
EmailMessage
()
msg
[
'
Subject
'
]
=
'
Aktuelle Plenumsthemen für
den kommenden Dienstag
20:00
'
msg
[
'
Subject
'
]
=
f
'
Aktuelle Plenumsthemen für
Dienstag (
{
str
(
d
)
}
20:00
)
'
msg
[
'
From
'
]
=
'
{{noreply_email_user}}
'
msg
[
'
From
'
]
=
'
{{noreply_email_user}}
'
msg
[
'
To
'
]
=
'
intern@warpzone.ms
'
msg
[
'
To
'
]
=
'
intern@warpzone.ms
'
msg
[
'
Date
'
]
=
formatdate
(
localtime
=
True
)
msg
.
set_content
(
mail
)
msg
.
set_content
(
mail
)
server
=
smtplib
.
SMTP
(
'
{{smtp_host}}
'
,
{{
smtp_port
}})
server
=
smtplib
.
SMTP
(
'
{{smtp_host}}
'
,
{{
smtp_port
}})
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment