diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-04-16 13:56:45 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-04-16 13:56:45 +0000 |
| commit | da59def2e10a45f7a7d21066e281b54f42da4ace (patch) | |
| tree | 6cead146f1b23ab3e2acf6d1c8fb502809c53187 | |
| parent | 0af0ba047844a802afcbed8aab2cb5df130e156e (diff) | |
| download | puppet-da59def2e10a45f7a7d21066e281b54f42da4ace.tar puppet-da59def2e10a45f7a7d21066e281b54f42da4ace.tar.gz puppet-da59def2e10a45f7a7d21066e281b54f42da4ace.tar.bz2 puppet-da59def2e10a45f7a7d21066e281b54f42da4ace.tar.xz puppet-da59def2e10a45f7a7d21066e281b54f42da4ace.zip | |
blog: add variables to set blog emails
| -rw-r--r-- | modules/blog/manifests/init.pp | 2 | ||||
| -rwxr-xr-x | modules/blog/templates/check_new-blog-post.sh | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/modules/blog/manifests/init.pp b/modules/blog/manifests/init.pp index f9056b62..efc128ad 100644 --- a/modules/blog/manifests/init.pp +++ b/modules/blog/manifests/init.pp @@ -4,6 +4,8 @@ class blog { $blog_location = "/var/www/vhosts/$blog_domain" $blog_db_backupdir = "/var/lib/backups/blog_db" $blog_files_backupdir = "/var/lib/backups/blog_files" + $blog_newpost_email_to = 'mageia-blogteam@mageia.org' + $blog_newpost_email_from = 'Mageia Blog bot <mageia-blogteam@mageia.org>' user { 'blog': groups => apache, diff --git a/modules/blog/templates/check_new-blog-post.sh b/modules/blog/templates/check_new-blog-post.sh index 3f9d9755..2123ed4a 100755 --- a/modules/blog/templates/check_new-blog-post.sh +++ b/modules/blog/templates/check_new-blog-post.sh @@ -34,7 +34,7 @@ if [ "$tmp_old" = "$tmp_new" ] then # Modification on lastest post echo "YES - Modification" >> $PATH_TO_FILE"/last_check" - echo -e "The latest blog post has been modified and needs to be checked!\n\nTitle:\t$last_title\nAuthor:\t$last_creator\n-- \nMail sent by the script '$0' on `hostname`" | /bin/mail -r "Mageia Blog bot <mageia-blogteam@<%= domain %>>" -s "Modification of the lastest entry on English Blog" mageia-blogteam@<%= domain %> + echo -e "The latest blog post has been modified and needs to be checked!\n\nTitle:\t$last_title\nAuthor:\t$last_creator\n-- \nMail sent by the script '$0' on `hostname`" | /bin/mail -r '<%= blog_newpost_email_from %>' -s "Modification of the lastest entry on English Blog" <%= blog_newpost_email_to %> echo $DATE else echo "NO" >> $PATH_TO_FILE"/last_check" @@ -42,7 +42,7 @@ if [ "$tmp_old" = "$tmp_new" ] else # New post to translate echo "YES - New entry" >> $PATH_TO_FILE"/last_check" - echo -e "A new blog post is waiting for translation:\n\nTitle:\t$last_title\nAuthor:\t$last_creator\n-- \nMail sent by the script '$0' on `hostname`" | /bin/mail -r "Mageia Blog bot <mageia-blogteam@<%= domain %>>" -s "New entry on English Blog" mageia-blogteam@<%= domain %> + echo -e "A new blog post is waiting for translation:\n\nTitle:\t$last_title\nAuthor:\t$last_creator\n-- \nMail sent by the script '$0' on `hostname`" | /bin/mail -r '<%= blog_newpost_email_from %>' -s "New entry on English Blog" <%= blog_newpost_email_to %> echo $DATE fi |