Browse Source

deactivate solr and z-push on debian 11.

Thomas Buck 3 years ago
parent
commit
902271b55c

+ 7
- 1
roles/mailserver/tasks/dovecot.yml View File

105
     - 10-mail.conf
105
     - 10-mail.conf
106
     - 10-master.conf
106
     - 10-master.conf
107
     - 90-antispam.conf
107
     - 90-antispam.conf
108
-    - 90-plugin.conf
109
     - 90-sieve.conf
108
     - 90-sieve.conf
110
     - auth-sql.conf.ext
109
     - auth-sql.conf.ext
111
   notify: restart dovecot
110
   notify: restart dovecot
112
 
111
 
112
+- name: Copy additional Dovecot SOLR configuration file in place
113
+  copy:
114
+    src=etc_dovecot_conf.d_90-plugin.conf
115
+    dest=/etc/dovecot/conf.d/90-plugin.conf
116
+  notify: restart dovecot
117
+  when: ansible_distribution_version != '11'
118
+
113
 - name: Template additional Dovecot configuration files
119
 - name: Template additional Dovecot configuration files
114
   template:
120
   template:
115
     src=etc_dovecot_conf.d_{{ item }}.j2
121
     src=etc_dovecot_conf.d_{{ item }}.j2

+ 2
- 9
roles/mailserver/tasks/solr.yml View File

31
     dest=/etc/solr/conf/schema.xml
31
     dest=/etc/solr/conf/schema.xml
32
     owner=root
32
     owner=root
33
     group=root
33
     group=root
34
+  when: ansible_distribution_version != '11'
34
 
35
 
35
 - name: Copy tweaked Tomcat config file into place
36
 - name: Copy tweaked Tomcat config file into place
36
   copy:
37
   copy:
57
     owner=root
58
     owner=root
58
     group=root
59
     group=root
59
   notify: restart solr
60
   notify: restart solr
61
+  when: ansible_distribution_version != '11'
60
 
62
 
61
 - name: Create Solr index directory
63
 - name: Create Solr index directory
62
   file:
64
   file:
75
     group=tomcat
77
     group=tomcat
76
   notify: restart solr
78
   notify: restart solr
77
   when: ansible_distribution_version == '10'
79
   when: ansible_distribution_version == '10'
78
-
79
-- name: Create Solr index directory
80
-  file:
81
-    state=directory
82
-    path=/data/solr
83
-    owner=tomcat
84
-    group=tomcat
85
-  notify: restart solr
86
-  when: ansible_distribution_version == '11'

+ 10
- 16
roles/mailserver/tasks/z-push.yml View File

50
     - dependencies
50
     - dependencies
51
   when: ansible_distribution_version == '10'
51
   when: ansible_distribution_version == '10'
52
 
52
 
53
-- name: Install Z-Push
54
-  apt:
55
-    name: "{{ packages }}"
56
-    state: present
57
-  vars:
58
-    packages:
59
-    - z-push
60
-    - z-push-common
61
-    - z-push-backend-combined
62
-    - z-push-backend-imap
63
-    - z-push-backend-carddav
64
-    - z-push-backend-caldav
65
-  tags:
66
-    - dependencies
67
-  when: ansible_distribution_version == '11'
68
-
69
 - name: Ensure Z-Push state and log directories are in place
53
 - name: Ensure Z-Push state and log directories are in place
70
   file:
54
   file:
71
     state=directory
55
     state=directory
77
     - /data/zpush-state
61
     - /data/zpush-state
78
     - /var/log/z-push
62
     - /var/log/z-push
79
   notify: restart apache
63
   notify: restart apache
64
+  when: ansible_distribution_version != '11'
80
 
65
 
81
 - name: Copy Z-Push common config.php into place
66
 - name: Copy Z-Push common config.php into place
82
   template:
67
   template:
83
     src=usr_share_z-push_config.php.j2
68
     src=usr_share_z-push_config.php.j2
84
     dest=/usr/share/z-push/config.php
69
     dest=/usr/share/z-push/config.php
70
+  when: ansible_distribution_version != '11'
85
 
71
 
86
 - name: Copy Z-Push combined backend config.php into place
72
 - name: Copy Z-Push combined backend config.php into place
87
   template:
73
   template:
88
     src=usr_share_z-push_backend_combined_config.php.j2
74
     src=usr_share_z-push_backend_combined_config.php.j2
89
     dest=/usr/share/z-push/backend/combined/config.php
75
     dest=/usr/share/z-push/backend/combined/config.php
76
+  when: ansible_distribution_version != '11'
90
 
77
 
91
 - name: Copy Z-Push IMAP backend config.php into place
78
 - name: Copy Z-Push IMAP backend config.php into place
92
   template:
79
   template:
93
     src=usr_share_z-push_backend_imap_config.php.j2
80
     src=usr_share_z-push_backend_imap_config.php.j2
94
     dest=/usr/share/z-push/backend/imap/config.php
81
     dest=/usr/share/z-push/backend/imap/config.php
82
+  when: ansible_distribution_version != '11'
95
 
83
 
96
 - name: Copy Z-Push CardDAV backend config.php into place
84
 - name: Copy Z-Push CardDAV backend config.php into place
97
   template:
85
   template:
98
     src=usr_share_z-push_backend_carddav_config.php.j2
86
     src=usr_share_z-push_backend_carddav_config.php.j2
99
     dest=/usr/share/z-push/backend/carddav/config.php
87
     dest=/usr/share/z-push/backend/carddav/config.php
88
+  when: ansible_distribution_version != '11'
100
 
89
 
101
 - name: Copy Z-Push CalDAV backend config.php into place
90
 - name: Copy Z-Push CalDAV backend config.php into place
102
   template:
91
   template:
103
     src=usr_share_z-push_backend_caldav_config.php.j2
92
     src=usr_share_z-push_backend_caldav_config.php.j2
104
     dest=/usr/share/z-push/backend/caldav/config.php
93
     dest=/usr/share/z-push/backend/caldav/config.php
94
+  when: ansible_distribution_version != '11'
105
 
95
 
106
 - name: Copy Z-Push autodiscover config.php into place
96
 - name: Copy Z-Push autodiscover config.php into place
107
   template:
97
   template:
108
     src=usr_share_z-push_autodiscover_config.php.j2
98
     src=usr_share_z-push_autodiscover_config.php.j2
109
     dest=/usr/share/z-push/autodiscover/config.php
99
     dest=/usr/share/z-push/autodiscover/config.php
100
+  when: ansible_distribution_version != '11'
110
 
101
 
111
 - name: Add Z-Push autodiscover to Apache config
102
 - name: Add Z-Push autodiscover to Apache config
112
   lineinfile:
103
   lineinfile:
114
     line: '    AliasMatch (?i)/Autodiscover/Autodiscover.xml$ "/usr/share/z-push/autodiscover/autodiscover.php"'
105
     line: '    AliasMatch (?i)/Autodiscover/Autodiscover.xml$ "/usr/share/z-push/autodiscover/autodiscover.php"'
115
     insertafter: 'Microsoft-Server-ActiveSync'
106
     insertafter: 'Microsoft-Server-ActiveSync'
116
   notify: restart apache
107
   notify: restart apache
108
+  when: ansible_distribution_version != '11'
117
 
109
 
118
 - name: Enable z-push Apache alias and PHP configuration file
110
 - name: Enable z-push Apache alias and PHP configuration file
119
   command: a2enconf z-push creates=/etc/apache2/conf-enabled/z-push.conf
111
   command: a2enconf z-push creates=/etc/apache2/conf-enabled/z-push.conf
120
   notify: restart apache
112
   notify: restart apache
113
+  when: ansible_distribution_version != '11'
121
 
114
 
122
 - name: Configure z-push logrotate
115
 - name: Configure z-push logrotate
123
   copy:
116
   copy:
126
     owner=root
119
     owner=root
127
     group=root
120
     group=root
128
     mode=0644
121
     mode=0644
122
+  when: ansible_distribution_version != '11'

Loading…
Cancel
Save