Переглянути джерело

deactivate solr and z-push on debian 11.

Thomas Buck 3 роки тому
джерело
коміт
902271b55c

+ 7
- 1
roles/mailserver/tasks/dovecot.yml Переглянути файл

@@ -105,11 +105,17 @@
105 105
     - 10-mail.conf
106 106
     - 10-master.conf
107 107
     - 90-antispam.conf
108
-    - 90-plugin.conf
109 108
     - 90-sieve.conf
110 109
     - auth-sql.conf.ext
111 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 119
 - name: Template additional Dovecot configuration files
114 120
   template:
115 121
     src=etc_dovecot_conf.d_{{ item }}.j2

+ 2
- 9
roles/mailserver/tasks/solr.yml Переглянути файл

@@ -31,6 +31,7 @@
31 31
     dest=/etc/solr/conf/schema.xml
32 32
     owner=root
33 33
     group=root
34
+  when: ansible_distribution_version != '11'
34 35
 
35 36
 - name: Copy tweaked Tomcat config file into place
36 37
   copy:
@@ -57,6 +58,7 @@
57 58
     owner=root
58 59
     group=root
59 60
   notify: restart solr
61
+  when: ansible_distribution_version != '11'
60 62
 
61 63
 - name: Create Solr index directory
62 64
   file:
@@ -75,12 +77,3 @@
75 77
     group=tomcat
76 78
   notify: restart solr
77 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 Переглянути файл

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

Завантаження…
Відмінити
Зберегти