Merge remote-tracking branch 'upstream/master' into 626-configure-dovecot-to-move-spam-to-junk-folder

roles/mailserver/files/etc_dovecot_conf.d_90-antispam.conf

@@ -0,0 +1,9 @@
+plugin {
+    antispam_backend = pipe
+    antispam_spam    = Junk
+    antispam_trash   = Trash
+    antispam_mail_sendmail = /usr/bin/rspamc
+    antispam_mail_spam     = learn_spam
+    antispam_mail_notspam  = learn_ham
+    antispam_mail_sendmail_args = -h;localhost:11334;-P;q1
+}

roles/mailserver/tasks/dovecot.yml

@@ -43,6 +43,7 @@
     - 10-mail.conf
     - 10-master.conf
     - 90-sieve.conf
+    - 90-antispam.conf
     - auth-sql.conf.ext
   notify: restart dovecot
 

roles/mailserver/tasks/opendkim.yml

@@ -14,11 +14,11 @@
 
 - name: Create OpenDKIM key directories
   file: state=directory path=/etc/opendkim/keys/{{ item.name }} group=opendkim owner=opendkim
-  with_items: mail_virtual_domains
+  with_items: "{{ mail_virtual_domains }}"
 
 - name: Generate OpenDKIM keys
   command: opendkim-genkey -r -d {{ item.name }} -D /etc/opendkim/keys/{{ item.name }}/ creates=/etc/opendkim/keys/{{ item.name }}/default.private
-  with_items: mail_virtual_domains
+  with_items: "{{ mail_virtual_domains }}"
 
 - name: Put opendkim.conf into place
   copy: src=etc_opendkim.conf dest=/etc/opendkim.conf owner=opendkim group=opendkim

roles/news/defaults/main.yml

@@ -6,7 +6,7 @@ selfoss_domain: "news.{{ domain }}"
 selfoss_db_username: selfoss
 selfoss_db_password: "{{ lookup('password', secret + '/' + 'selfoss_db_password', length=32) }}"
 selfoss_db_database: selfoss
-selfoss_version: 2.15
+selfoss_version: 2.16
 
 selfoss_username: "{{ main_user_name }}"
 # this is the sha512 hash of the desired password

roles/owncloud/tasks/owncloud.yml

@@ -43,5 +43,9 @@
   template: src=etc_apache2_sites-available_owncloud.j2 dest=/etc/apache2/sites-available/owncloud.conf group=root
   notify: restart apache
 
+- name: Enable ownCloud site
+  command: a2ensite owncloud.conf creates=/etc/apache2/sites-enabled/owncloud.conf
+  notify: restart apache
+
 - name: Install ownCloud cronjob
   cron: name="ownCloud" user="www-data" minute="*/5" job="php -f /var/www/owncloud/cron.php > /dev/null"

roles/vpn/tasks/openvpn.yml

@@ -21,13 +21,13 @@
 
 - name: Create directories for clients
   file: path={{ openvpn_path}}/{{ item }} state=directory
-  with_items: openvpn_clients
+  with_items: "{{ openvpn_clients }}"
 
 - name: Generate RSA keys for the clients
   command: openssl genrsa -out client.key {{ openvpn_key_size }}
            chdir={{ openvpn_path }}/{{ item }}
            creates=client.key
-  with_items: openvpn_clients
+  with_items: "{{ openvpn_clients }}"
 
 - name: Set the proper permissions on all RSA keys
   file: path={{ openvpn_path }}
@@ -73,13 +73,13 @@
   command: openssl req -new -key client.key -out client.csr -subj "{{ openssl_request_subject }}/CN={{ item }}"
            chdir={{ openvpn_path }}/{{ item }}
            creates=client.csr
-  with_items: openvpn_clients
+  with_items: "{{ openvpn_clients }}"
 
 - name: Generate certificates for the clients
   command: openssl x509 -CA {{ openvpn_ca }}.crt -CAkey {{ openvpn_ca }}.key -CAcreateserial -req -days {{ openvpn_days_valid }} -in client.csr -out client.crt
            chdir={{ openvpn_path }}/{{ item }}
            creates=client.crt
-  with_items: openvpn_clients
+  with_items: "{{ openvpn_clients }}"
 
 - name: Generate HMAC firewall key
   command: openvpn --genkey --secret {{ openvpn_hmac_firewall }}
@@ -93,13 +93,13 @@
 - name: Register client certificate contents
   command: cat client.crt
            chdir={{ openvpn_path }}/{{ item }}
-  with_items: openvpn_clients
+  with_items: "{{ openvpn_clients }}"
   register: openvpn_client_certificates
 
 - name: Register client key contents
   command: cat client.key
            chdir={{ openvpn_path }}/{{ item }}
-  with_items: openvpn_clients
+  with_items: "{{ openvpn_clients }}"
   register: openvpn_client_keys
 
 - name: Register HMAC firewall contents
@@ -111,9 +111,9 @@
   template: src=client.cnf.j2
             dest={{ openvpn_path }}/{{ item[0] }}/{{ openvpn_server }}.ovpn
   with_together:
-    - openvpn_clients
-    - openvpn_client_certificates.results
-    - openvpn_client_keys.results
+    - "{{ openvpn_clients }}"
+    - "{{ openvpn_client_certificates.results }}"
+    - "{{ openvpn_client_keys.results }}"
 
 - name: Generate Diffie-Hellman parameters (this will take a while)
   command: openssl dhparam -out {{ openvpn_dhparam }} {{ openvpn_key_size }}

roles/xmpp/tasks/prosody.yml

@@ -28,7 +28,7 @@
 
 - name: Create Prosody accounts
   command: prosodyctl register {{ item.name }} {{ prosody_virtual_domain }} "{{ item.password }}"
-  with_items: prosody_accounts
+  with_items: "{{ prosody_accounts }}"
 
 - name: Set firewall rules for Prosody
   ufw: rule=allow port={{ item }} proto=tcp