diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/attachments/20110119/32a9dd13/attachment.html')
-rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20110119/32a9dd13/attachment.html | 136 |
1 files changed, 136 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/attachments/20110119/32a9dd13/attachment.html b/zarb-ml/mageia-sysadm/attachments/20110119/32a9dd13/attachment.html new file mode 100644 index 000000000..9bbed9a27 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110119/32a9dd13/attachment.html @@ -0,0 +1,136 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" +"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /> +<title>[856] now support 'new post' or 'modification of last post' to prevent bad notification mails</title> +</head> +<body> + +<style type="text/css"><!-- +#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } +#msg dl.meta dt { float: left; width: 6em; font-weight: bold; } +#msg dt:after { content:':';} +#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } +#msg dl a { font-weight: bold} +#msg dl a:link { color:#fc3; } +#msg dl a:active { color:#ff0; } +#msg dl a:visited { color:#cc6; } +h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } +#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; } +#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; } +#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; } +#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; } +#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; } +#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } +#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; } +#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; } +#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; } +#logmsg pre { background: #eee; padding: 1em; } +#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;} +#logmsg dl { margin: 0; } +#logmsg dt { font-weight: bold; } +#logmsg dd { margin: 0; padding: 0 0 0.5em 0; } +#logmsg dd:before { content:'\00bb';} +#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; } +#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; } +#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; } +#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; } +#logmsg table th.Corner { text-align: left; } +#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; } +#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } +#patch { width: 100%; } +--></style> +<div id="msg"> +<dl class="meta"> +<dt>Revision</dt> <dd>856</dd> +<dt>Author</dt> <dd>dams</dd> +<dt>Date</dt> <dd>2011-01-19 02:30:40 +0100 (Wed, 19 Jan 2011)</dd> +</dl> + +<h3>Log Message</h3> +<pre>now support 'new post' or 'modification of last post' to prevent bad notification mails</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulesblogtemplatescheck_newblogpostsh">puppet/modules/blog/templates/check_new-blog-post.sh</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulesblogtemplatescheck_newblogpostsh">Modified: puppet/modules/blog/templates/check_new-blog-post.sh</a> +=================================================================== +--- puppet/modules/blog/templates/check_new-blog-post.sh 2011-01-18 23:08:26 UTC (rev 855) ++++ puppet/modules/blog/templates/check_new-blog-post.sh 2011-01-19 01:30:40 UTC (rev 856) +@@ -2,36 +2,52 @@ + + # Initialization + PATH_TO_FILE=${PATH_TO_FILE:-/var/lib/blog} +-/usr/bin/wget -qO $PATH_TO_FILE"/RSS_new" http://blog.mageia.org/?feed=rss2 ++/usr/bin/wget -qO $PATH_TO_FILE"/last_tmp" http://blog.mageia.org/?feed=rss2 + if [ $? -ne 0 ] + then + exit 2 + fi +-# Check if RSS_old exists +-if [ ! -f $PATH_TO_FILE"/RSS_old" ] ++last_title=$(grep "title" $PATH_TO_FILE"/last_tmp" | head -n 2 | sed '1d' | sed 's/<title>//' | sed 's/<\/title>//' | sed 's/^[ \t]*//') ++last_pub=$(grep "pubDate" $PATH_TO_FILE"/last_tmp" | head -n 1 | sed 's/<pubDate>//' | sed 's/<\/pubDate>//' | sed 's/^[ \t]*//') ++echo -e "$last_title\n$last_pub" > $PATH_TO_FILE"/last_tmp" ++ ++# Check if 'last_entry' exists ++if [ ! -f $PATH_TO_FILE"/last_entry" ] + then +- /bin/mv -f $PATH_TO_FILE"/RSS_new" $PATH_TO_FILE"/RSS_old" ++ /bin/mv -f $PATH_TO_FILE"/last_tmp" $PATH_TO_FILE"/last_entry" + exit 1 + fi + ++# Add a date file for log + /bin/date +"%d:%m:%Y %H:%M" > $PATH_TO_FILE"/last_check" + + # Check if a new blog post on EN needs to be translated on other blogs +-tmp_new=$(/bin/grep 'lastBuildDate' $PATH_TO_FILE"/RSS_new") +-tmp_old=$(/bin/grep 'lastBuildDate' $PATH_TO_FILE"/RSS_old") ++tmp_new=$(cat $PATH_TO_FILE"/last_tmp" | sed '1d') ++tmp_old=$(cat $PATH_TO_FILE"/last_entry" | sed '1d') + if [ "$tmp_old" = "$tmp_new" ] + then + # Nothing new + echo "NO" >> $PATH_TO_FILE"/last_check" + else +- # New post to translate +- cat $PATH_TO_FILE"/last_check" > $PATH_TO_FILE"/last_need_translation" +- new_post=$(grep "title" $PATH_TO_FILE"/RSS_new" | head -n 2 | sed '1d' | sed 's/<title>//' | sed 's/<\/title>//' | sed 's/^[ \t]*//') +- echo $new_post >> $PATH_TO_FILE"/last_need_translation" +- echo "YES" >> $PATH_TO_FILE"/last_check" +- echo -e "A new blog post is waiting for translation\n\"$new_post\"" | /bin/mail -s "New entry on English Blog" mageia-blogteam@mageia.org +- echo $DATE +-fi ++ tmp_new=$(cat $PATH_TO_FILE"/last_tmp" | sed '2d') ++ tmp_old=$(cat $PATH_TO_FILE"/last_entry" | sed '2d') ++ if [ "$tmp_old" = "$tmp_new" ] ++ then ++ # Modification on last post ++ cat $PATH_TO_FILE"/last_check" > $PATH_TO_FILE"/last_need_translation" ++ echo $tmp_new >> $PATH_TO_FILE"/last_need_translation" ++ echo "YES - Modification" >> $PATH_TO_FILE"/last_check" ++ echo -e "Info: the last blog post had been modified and need to be checked.\n\"$tmp_new\"" | /bin/mail -s "Modification of the last entry on English Blog" mageia-blogteam@mageia.org ++ echo $DATE ++ else ++ # New post to translate ++ cat $PATH_TO_FILE"/last_check" > $PATH_TO_FILE"/last_need_translation" ++ echo $tmp_new >> $PATH_TO_FILE"/last_need_translation" ++ echo "YES - New entry" >> $PATH_TO_FILE"/last_check" ++ echo -e "Info: a new blog post is waiting for translation.\n\"$tmp_new\"" | /bin/mail -s "New entry on English Blog" mageia-blogteam@mageia.org ++ echo $DATE ++ fi ++ fi + + # Clean tmp files and copy RSS_new to RSS_old +-/bin/mv -f $PATH_TO_FILE"/RSS_new" $PATH_TO_FILE"/RSS_old" ++/bin/mv -f $PATH_TO_FILE"/last_tmp" $PATH_TO_FILE"/last_entry" + +</pre></div> + +</body> +</html>
\ No newline at end of file |