Changeset c5d681f

Timestamp:

09/29/17 15:09:23 (8 years ago)

Author:

Edwin Eefting <edwin@datux.nl>

Branches:

master, perl-5.22

Children:

9684832

Parents:

10bd92c

Message:

zarafa clean fixes and free diskspace checks

Location:

npl

Files:

• internetserver/apache_conf/apache_conf.SlackBuild.log.gz (modified) (previous)
• internetserver/apache_conf/apache_conf.build (modified) (1 diff)
• internetserver/apache_conf/apache_conf.md5 (modified) (2 diffs)
• internetserver/apache_conf/apache_conf.pkg (modified) (previous)
• internetserver/apache_conf/root/etc/php5/php.ini (modified) (1 diff)
• mailserver/zarafa_conf7/root/etc/cron.weekly/zarafa_clean (modified) (2 diffs)
• mailserver/zarafa_conf7/zarafa_conf7.SlackBuild.log.gz (modified) (previous)
• mailserver/zarafa_conf7/zarafa_conf7.build (modified) (1 diff)
• mailserver/zarafa_conf7/zarafa_conf7.md5 (modified) (2 diffs)
• mailserver/zarafa_conf7/zarafa_conf7.pkg (modified) (previous)
• syncupdates (modified) (4 diffs)

npl/internetserver/apache_conf/apache_conf.build

@@ -1 @@
-6437
+6438

npl/internetserver/apache_conf/apache_conf.md5

@@ -1 @@
-3401dd091aa9cdaff2a4045393ddbef4  ./apache_conf.pkg
+be22603f572f7e13d949bcd2ac4e3bdb  ./apache_conf.pkg
 42016730303eef15aafe66cc3d793c8b  ./apache_conf.SlackBuild
-449826fbb49a494aed99e2fbf10b7945  ./apache_conf.SlackBuild.log.gz
+a91f38cfc1a342d6102a16c5537383c8  ./apache_conf.SlackBuild.log.gz
 338c8fb6cb12a77c1147519347f0cfbe  ./root/etc/apache2/conf.d/httpd-autoindex.conf
 718f54d560d303c8f6d82484977d5acf  ./root/etc/apache2/conf.d/httpd-dav.conf
@@ -20 +20 @@
 30baa04580b9a53bf204dc1164221241  ./root/etc/logrotate.d/apache2
 4b30e6ab44455cf3094ca6273700001b  ./root/etc/php5/pear.conf
-ff28eb1ad94185eb0517af39c39d4c8d  ./root/etc/php5/php.ini
+d7c01829b4c122eb2e269c126aa6ab70  ./root/etc/php5/php.ini
 b54388d73ed4dc4198fc7f04bed5daa3  ./root/etc/postinst.d/post.apache_conf
 11658bab7bd1a7380827f7c73f85a753  ./root/service/apache2/run

npl/internetserver/apache_conf/root/etc/php5/php.ini

@@ -304 +304 @@
 max_input_time = 60     ; Maximum amount of time each script may spend parsing request data
 ;max_input_nesting_level = 64 ; Maximum input variable nesting level
-;512M neccesary for z-push -a fixstates
-memory_limit = 512M      ; Maximum amount of memory a script may consume 
+;1024M neccesary for z-push -a fixstates
+memory_limit = 1024M      ; Maximum amount of memory a script may consume 
 
 

npl/mailserver/zarafa_conf7/root/etc/cron.weekly/zarafa_clean

@@ -34 +34 @@
 zarafa-admin --purge-softdelete 30 || abort "softdelete mislukt"
 
+
+
+syn3-state zarafa OK "$TXT z-push cleanup"
+z-push-admin -a fixstates || abort "z-push cleanup mislukt"
+
+NEEDED=`du  -b -s  /home/system/mysql5/|cut -f 1`
+(( FREE = `stat -f /home -c  %f` * 4096 ))
+
+if [ $NEEDED -gt $FREE ]; then
+        #human readable
+        (( NEEDED = NEEDED / 1000000000 ))
+        (( NEEDED = NEEDED + 1 ))
+        abort "Te weinig diskruimte voor optimalisatie ($NEEDED Gb ruimte nodig voor deze operatie)"
+fi
+
+
 syn3-state zarafa OK "$TXT database optimalisatie"
 mysqlcheck --optimize -p`cat /etc/my.passwd` zarafa || abort "database optimalisatie mislukt"
@@ -44 +60 @@
 
 
-syn3-state zarafa OK "$TXT z-push cleanup"
-z-push-admin -a fixstates || abort "z-push cleanup mislukt"
-
 syn3-state zarafa OK "Zarafa onderhoud succesvol voltooid."
 

npl/mailserver/zarafa_conf7/zarafa_conf7.build

@@ -1 @@
-6541
+6542

npl/mailserver/zarafa_conf7/zarafa_conf7.md5

@@ -1 @@
-e8893e32484009ca0556d0ec47070b17  ./root/etc/cron.weekly/zarafa_clean
+5168e7ee74e660a07889b5a2638971e0  ./root/etc/cron.weekly/zarafa_clean
 d0d5938e40c70afc06b0d1296fc064a2  ./root/etc/cyrus-conv.conf
 3c834f9018b56c5d738ea2641366f0db  ./root/etc/mapi/zarafa.inf
@@ -36 +36 @@
 e0acc0d2e7774f234b72a110e86057a7  ./root/var/www/htdocs/syn3/zarafa_webapp/webportal.desc
 a4cd55d9e54997e1ab8c7d8b1f89ee47  ./root/var/www/htdocs/syn3/zarafa_webapp/webportal.png
-f85e76f4432415666a5a9ddb413078a4  ./zarafa_conf7.pkg
+deb13959ac09cec840ba9a612f546d28  ./zarafa_conf7.pkg
 f4f9e3673e49bd56810ee75e666f51a0  ./zarafa_conf7.SlackBuild
-68340e47cee53a2ca0344d0442e52ec8  ./zarafa_conf7.SlackBuild.log.gz
+db342e26f18528b05d9dd85bfb84e00e  ./zarafa_conf7.SlackBuild.log.gz

npl/syncupdates

@@ -1 +1 @@
 #!/bin/bash
 
-
+rm -rf .tmp 2>/dev/null
 HOST="updates@www.syn-3.nl";
 
@@ -19 +19 @@
 echo "Searching packages..."
 for PKG in `find . -name "$FILTER"`; do
-        echo $PKG
 
         #dont upload _dev stuff, we dont use it and it wastes space and time :)
@@ -26 +25 @@
         fi
     
-        echo -n "Verifying update $PKG...";
+        #echo -n "Verifying update $PKG...";
         TGZ=`./pkgname $PKG` || exit 1
-
 
         MOD=
@@ -37 +35 @@
         #dont upload mods by default
         if [ "$MOD" ] && ! [ "$MODS" ]; then
-                echo "NOT uploading uncommitted version. (use 'MODS=1 $0 .... ' to upload anyway)"
+                echo "NOT uploading uncommitted version. (use 'MODS=1 $0 .... ' to upload anyway): $PKG"
                 continue
         fi