Changeset ce9f9b3 for npl/mailserver/kopano_conf/root/etc

Timestamp:

08/03/18 13:17:46 (7 years ago)

Author:

Edwin Eefting <edwin@datux.nl>

Branches:

master, perl-5.22

Children:

a384a97

Parents:

981dbbc (diff), 1163be4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'gcc484'

Location:

npl/mailserver/kopano_conf/root/etc

Files:

• cron.weekly/kopano_clean (modified) (2 diffs)
• kopano/userscripts/kopano-dspam-retrain (moved) (moved from npl/mailserver/zarafa_conf7/root/etc/zarafa/userscripts/zarafa-spamd-retrain) (1 diff)
• kopano/userscripts/kopano-spamd-retrain (deleted)
• postinst.d/post.kopano_conf (modified) (3 diffs)

npl/mailserver/kopano_conf/root/etc/cron.weekly/kopano_clean

@@ -17 +17 @@
 if ! [ -e /var/lib/kopano/kopano_upgrade_fix ]; then
         syn3-state kopano OK "$TXT kopano 7 upgrade bugfix aan het uitvoeren (eenmalig)" 
-        mysql -p`cat /etc/my.passwd` kopano -e "
+        mysql -p`cat /etc/my.passwd` zarafa -e "
                 begin;
                 truncate table tproperties;
@@ -35 +35 @@
 
 syn3-state kopano OK "$TXT database optimalisatie"
-mysqlcheck --optimize -p`cat /etc/my.passwd` kopano || abort "database optimalisatie mislukt"
+mysqlcheck --optimize -p`cat /etc/my.passwd` zarafa || abort "database optimalisatie mislukt"
 
 syn3-state kopano OK "$TXT kopano search xapian compact"

npl/mailserver/kopano_conf/root/etc/kopano/userscripts/kopano-dspam-retrain

@@ -1 +1 @@
 #!/bin/bash
 
-#SYN-3 dspam training script for zarafa-spamd. see https://github.com/psy0rz/zarafa-spamd
+#SYN-3 dspam training script for kopano-dspam. see https://github.com/psy0rz/kopano-dspam
 
 SPAM_USER="$1"

npl/mailserver/kopano_conf/root/etc/postinst.d/post.kopano_conf

@@ -54 +54 @@
 groupadd kopano
 useradd kopano-gateway
+svcrestart /service/nscd
 
 #create and own stuff
@@ -65 +66 @@
 chown kopano:kopano /var/lib/kopano
 
+mkdir /home/system/kopano_webapp
+chown nobody /home/system/kopano_webapp
+
 #logging
 mkdir /var/log/kopano
@@ -72 +76 @@
 #migrate from zarafa?
 if [ -e /home/system/zarafa ]; then
-        chown kopano:kopano /home/system/zarafa
+        mv /home/system/kopano /home/system/kopano.old
         mv /home/system/zarafa /home/system/kopano
+        chown -R kopano:kopano /home/system/kopano
 else
         mkdir /home/system/kopano
-        chown kopano /home/system/kopano || exit 1
+        chown kopano:kopano /home/system/kopano || exit 1
 fi