Merge ../live-mtm

diff --git a/crontab.part.INO b/crontab.part.INO
index a55d824a8d31e99d0342b66e63a32e9e1e708197..764da64e3ad2f8f2e24da9ffb5a3691c2cdb27fb 100644 (file)
--- a/crontab.part.INO
+++ b/crontab.part.INO
@@ -3,7 +3,7 @@
 #  ssh webstump@chiark live-mtm/install-aggregates
 #
 #m h  d m dow
-50 7  * * 1,4  savelog live-%ABBREV%/xlog/log/%GROUP%/event.log
-51 7  12 * *   savelog live-%ABBREV%/errs
-52 7  12 * *   savelog live-%ABBREV%/webstump/log/webstump.log
+50 7  * * 1,4  savelog -p live-%ABBREV%/xlog/log/%GROUP%/event.log
+51 7  12 * *   savelog -p live-%ABBREV%/errs
+52 7  12 * *   savelog -p live-%ABBREV%/webstump/log/webstump.log
 53 7  * * 1    find live-%ABBREV%/xlog/log/%GROUP%/public -mtime +14 -print0 | xargs -r0 rm --

diff --git a/stump/etc/modenv.INO b/stump/etc/modenv.INO
index 171547468c4e42352ae679b073b8c2f8cee6e431..382861e9013d38ebdbbf877995f505a03f260444 100755 (executable)
--- a/stump/etc/modenv.INO
+++ b/stump/etc/modenv.INO
@@ -12,6 +12,8 @@
 
 set -e
 
+umask 007
+
 #######################################################################
 # this is the root directory where moderation software & config
 # resides. Make sure that sendmail is in the PATH.
@@ -288,6 +290,5 @@ export BEGIN_PGP_SIGNED_MESSAGE BOT_SUBJECT_PREFIX
 #
 
 if [ "x$1" != "x" ]; then
-  umask 077
   antivirus | decodeBase64 | "$@"
 fi

diff --git a/webstump/scripts/file-message.pl b/webstump/scripts/file-message.pl
index 1585f8601c2b6a3d94cb49751f9429204bd3edec..a7a07d29edf7ad88dae599358999c1ebde2e80ea 100755 (executable)
--- a/webstump/scripts/file-message.pl
+++ b/webstump/scripts/file-message.pl
@@ -7,7 +7,7 @@
 # Figure out the home directory
 #
 
-umask 022;
+umask 007;
 
 if( !($0 =~ /\/scripts\/file-message\.pl$/) ) {
   die "This script can only be called with full path name!!!";

diff --git a/webstump/scripts/webstump.pl b/webstump/scripts/webstump.pl
index 3da004bc3842cf07dc112bb3e249b6e6b5a5a8ec..ba5343ea70bd793f78a887d0d4a4ebe5dc577520 100755 (executable)
--- a/webstump/scripts/webstump.pl
+++ b/webstump/scripts/webstump.pl
@@ -9,6 +9,8 @@ if( !($0 =~ /\/scripts\/webstump\.pl$/) ) {
   die "This script can only be called with full path name!!!";
 }
 
+umask 007;
+
 $webstump_home = $0;
 $webstump_home =~ s/\/scripts\/webstump\.pl$//;