Merge pull request #170 from jsravn/master

Some minor tweaks

README.textile

@@ -174,7 +174,7 @@ Set up SPF and reverse DNS "as per this post":http://sealedabstract.com/code/nsa
 h3. 7. Miscellaneous Configuration
 
 * Sign in to the ZNC web interface and set things up to your liking.
-* You'll probably want to sign into your ownCloud installation and check out the settings there, too.
+* Sign into ownCloud to set it up. You should select postgresql as the configuration backend.
 
 h2. How To Use Your New Personal Cloud
 

roles/mailserver/tasks/dspam.yml

@@ -29,7 +29,3 @@
     - 90-plugin.conf
   notify: restart dovecot
 
-- name: Put sieve rules into each user directory
-  copy: src=dot_dovecot.sieve dest=/decrypted/{{ item.domain }}/{{ item.account }}/.dovecot.sieve owner=vmail group=dovecot
-  with_items: mail_virtual_users
-  notify: restart dovecot

roles/mailserver/templates/usr_share_z-push_config.php.j2

@@ -128,7 +128,7 @@
     //   SYNC_FILTERTYPE_ALL (default, no limitation)
     //   SYNC_FILTERTYPE_1DAY, SYNC_FILTERTYPE_3DAYS, SYNC_FILTERTYPE_1WEEK, SYNC_FILTERTYPE_2WEEKS,
     //   SYNC_FILTERTYPE_1MONTH, SYNC_FILTERTYPE_3MONTHS, SYNC_FILTERTYPE_6MONTHS
-    define('SYNC_FILTERTIME_MAX', SYNC_FILTERTYPE_ALL);
+    define('SYNC_FILTERTIME_MAX', SYNC_FILTERTYPE_3MONTHS);
 
     // Interval in seconds before checking if there are changes on the server when in Ping.
     // It means the highest time span before a change is pushed to a mobile. Set it to
@@ -233,8 +233,8 @@
     //  BackendVCardDir settings
     // **********************
     define('VCARDDIR_DIR', '/home/%u/.kde/share/apps/kabc/stdvcf');
-    
-    
+
+
 /**********************************************************************************
  *  Search provider settings
  *

roles/tarsnap/files/tarsnap.sh

@@ -54,12 +54,18 @@ else
 	BACKUP="$YEAR$MOY$DOM-$TIME-daily"
 fi
 
+# Stop postgres
+monit stop postgres
+
 # Do backups
 for dir in $DIRS; do
 	echo "==> create $BACKUP-$dir"
 	$TARSNAP $EXTRA_FLAGS -c -f $BACKUP-$dir $dir
 done
 
+# Start postgres
+monit start postgres
+
 # Backups done, time for cleaning up old archives
 
 # using tail to find archives to delete, but its

roles/tarsnap/tasks/tarsnap.yml

@@ -61,4 +61,4 @@
   copy: src=tarsnap.sh dest=/root/tarsnap.sh mode="755"
 
 - name: Install nightly Tarsnap-generations cronjob
-  cron: name="Tarsnap backup" hour="23" minute="0" job="sh /root/tarsnap.sh >> /var/log/tarsnap.log"
+  cron: name="Tarsnap backup" hour="3" minute="0" job="sh /root/tarsnap.sh >> /var/log/tarsnap.log"

roles/webmail/files/usr_share_roundcube_plugins_managesieve_config.inc.php

@@ -29,10 +29,10 @@ $rcmail_config['managesieve_auth_pw'] = null;
 $rcmail_config['managesieve_usetls'] = false;
 
 // default contents of filters script (eg. default spam filter)
-$rcmail_config['managesieve_default'] = '/etc/dovecot/sieve/global';
+$rcmail_config['managesieve_default'] = '/etc/roundcube/global.sieve';
 
 // The name of the script which will be used when there's no user script
-$rcmail_config['managesieve_script_name'] = 'managesieve';
+$rcmail_config['managesieve_script_name'] = 'roundcube';
 
 // Sieve RFC says that we should use UTF-8 endcoding for mailbox names,
 // but some implementations does not covert UTF-8 to modified UTF-7.

roles/webmail/tasks/roundcube.yml

@@ -17,6 +17,9 @@
 - name: Configure roundcube's managesieve plugin
   copy: src=usr_share_roundcube_plugins_managesieve_config.inc.php dest=/usr/share/roundcube/plugins/managesieve/config.inc.php group=www-data owner=root mode=640 force=yes
 
+- name: Copy global default sieve rules
+  copy: src=etc_roundcube_global.sieve dest=/etc/roundcube/global.sieve owner=root group=www-data mode=640
+
 - name: Enable roundcube site
   command: a2ensite roundcube creates=/etc/apache2/sites-enabled/roundcube
   notify: restart apache