Alex Payne преди 9 години
родител
ревизия
7275a52ba6
променени са 3 файла, в които са добавени 6 реда и са изтрити 6 реда
  1. 1
    1
      roles/mailserver/handlers/main.yml
  2. 2
    2
      roles/mailserver/tasks/solr.yml
  3. 3
    3
      roles/monitoring/files/etc_monit_conf.d_tomcat

+ 1
- 1
roles/mailserver/handlers/main.yml Целия файл

8
   service: name=opendkim state=restarted
8
   service: name=opendkim state=restarted
9
 
9
 
10
 - name: restart solr
10
 - name: restart solr
11
-  service: name=tomcat6 state=restarted
11
+  service: name=tomcat8 state=restarted
12
 
12
 
13
 - name: import sql postfix
13
 - name: import sql postfix
14
   action: shell PGPASSWORD='{{ mail_db_password }}' psql -h localhost -d {{ mail_db_database }} -U {{ mail_db_username }} -f /etc/postfix/import.sql --set ON_ERROR_STOP=1
14
   action: shell PGPASSWORD='{{ mail_db_password }}' psql -h localhost -d {{ mail_db_database }} -U {{ mail_db_username }} -f /etc/postfix/import.sql --set ON_ERROR_STOP=1

+ 2
- 2
roles/mailserver/tasks/solr.yml Целия файл

10
   copy: src=solr-schema.xml dest=/etc/solr/conf/schema.xml group=root owner=root
10
   copy: src=solr-schema.xml dest=/etc/solr/conf/schema.xml group=root owner=root
11
 
11
 
12
 - name: Copy tweaked Tomcat config file into place
12
 - name: Copy tweaked Tomcat config file into place
13
-  copy: src=etc_tomcat6_server.xml dest=/etc/tomcat6/server.xml group=tomcat6 owner=root
13
+  copy: src=etc_tomcat8_server.xml dest=/etc/tomcat8/server.xml group=tomcat8 owner=root
14
   notify: restart solr
14
   notify: restart solr
15
 
15
 
16
 - name: Copy tweaked Solr config file into place
16
 - name: Copy tweaked Solr config file into place
18
   notify: restart solr
18
   notify: restart solr
19
 
19
 
20
 - name: Create Solr index directory
20
 - name: Create Solr index directory
21
-  file: state=directory path=/decrypted/solr group=tomcat6 owner=tomcat6
21
+  file: state=directory path=/decrypted/solr group=tomcat8 owner=tomcat8
22
   notify: restart solr
22
   notify: restart solr

+ 3
- 3
roles/monitoring/files/etc_monit_conf.d_tomcat Целия файл

1
-check process tomcat with pidfile "/var/run/tomcat6.pid"
1
+check process tomcat with pidfile "/var/run/tomcat8.pid"
2
   group mail
2
   group mail
3
-  start program = "/etc/init.d/tomcat6 start"
4
-  stop program = "/etc/init.d/tomcat6 stop"
3
+  start program = "systemctl start tomcat8"
4
+  stop program = "systemctl stop tomcat8"
5
   if failed port 8080 then alert
5
   if failed port 8080 then alert
6
   if failed port 8080 for 5 cycles then restart
6
   if failed port 8080 for 5 cycles then restart

Loading…
Отказ
Запис