CE: Первичное изменение структуры шаблона (#41, #30)

opt/1C/noarch/conf/logcfg_zabbix_template.xml → configs/logcfg.xml

@@ -1,6 +1,6 @@
 <config xmlns="http://v8.1c.ru/v8/tech-log">
     <dump create="false"/>
-    <log location="/var/log/1C/zabbix/locks" history="1">
+    <log location="{{tech_logs_dir}}/zabbix/locks" history="1">
         <event>
             <eq property="name" value="tlock"/>
         </event>
@@ -18,7 +18,7 @@
         <property name="locks"/>
         <property name="context"/>
     </log>
-    <log location="/var/log/1C/zabbix/calls" history="1">
+    <log location="{{tech_logs_dir}}/zabbix/calls" history="1">
         <event>
             <eq property="name" value="call"/>
             <ne property="context" value=""/>
@@ -37,7 +37,7 @@
         <property name="inbytes"/>
         <property name="outbytes"/>
      </log>
-    <log location="/var/log/1C/zabbix/excps" history="1">
+    <log location="{{tech_logs_dir}}/zabbix/excps" history="1">
         <event>
             <eq property="name" value="excp"/>
         </event>

playbooks/install.yml

@@ -1,6 +1,6 @@
 ---
 
-- hosts: 1c_servers
+- hosts: 1c
   roles:
     - general
 
@@ -15,4 +15,12 @@
 
 - hosts: 1c_cs
   roles:
-    - 1c_cs
+    - 1c_cs
+
+- hosts: hosts_to_restart
+  gather_facts: no
+  tasks:
+    - name: Restart zabbix agent
+      service:
+        name: zabbix-agent
+        state: restarted

playbooks/inventory.sample

@@ -1,3 +1,9 @@
+# Общая группа серверов 1С Предприятия
+[1c:children]
+1c_cs
+1c_ls
+1c_ws
+
 # Группа центральных серверов 1С Предприятия
 [1c_cs]
 localhost

playbooks/roles/1c_cs/files/1c_central_server.sh

@@ -1 +1 @@
-../../../../etc/zabbix/scripts/1c_central_server.sh
+../../../../scripts/1c_central_server.sh

playbooks/roles/1c_cs/files/userparameter_1c-cs.conf

@@ -1 +1 @@
-../../../../etc/zabbix/zabbix_agentd.d/userparameter_1c-cs.conf
+../../../../configs/userparameter_1c-cs.conf

playbooks/roles/1c_cs/handlers/main.yml

@@ -1,2 +1,6 @@
 ---
 # handlers file for 1c_cs
+
+- name: Add host to group for restart zabbix agent
+  group_by:
+    key: hosts_to_restart

playbooks/roles/1c_cs/tasks/main.yml

@@ -8,11 +8,14 @@
     owner: root
     group: root
     mode: 0644
+  notify: 
+    - Add host to group for restart zabbix agent
+
 
 - name: Copy main script for central server
   copy:
     src: 1c_central_server.sh
     dest: /etc/zabbix/scripts/
-    owner: zabbix
-    group: zabbix
-    mode: 0755
+    owner: root
+    group: root
+    mode: 0755

playbooks/roles/1c_ls/files/1c_license_server.sh

@@ -1 +1 @@
-../../../../etc/zabbix/scripts/1c_license_server.sh
+../../../../scripts/1c_license_server.sh

playbooks/roles/1c_ls/files/1c_ls_license_info.sh

@@ -1 +1 @@
-../../../../etc/cron.hourly/1c_ls_license_info.sh
+../../../../scripts/1c_ls_license_info.sh

playbooks/roles/1c_ls/files/userparameter_1c-ls.conf

@@ -1 +1 @@
-../../../../etc/zabbix/zabbix_agentd.d/userparameter_1c-ls.conf
+../../../../configs/userparameter_1c-ls.conf

playbooks/roles/1c_ls/handlers/main.yml

@@ -1,2 +1,6 @@
 ---
 # handlers file for 1c_ls
+
+- name: Add host to group for restart zabbix agent
+  group_by:
+    key: hosts_to_restart

playbooks/roles/1c_ls/tasks/main.yml

@@ -16,13 +16,15 @@
     owner: root
     group: root
     mode: 0644
+  notify: 
+    - Add host to group for restart zabbix agent
 
 - name: Copy main script for license server
   copy:
     src: 1c_license_server.sh
     dest: /etc/zabbix/scripts/
-    owner: zabbix
-    group: zabbix
+    owner: root
+    group: root
     mode: 0755
 
 - name: Make cron job for license info

playbooks/roles/1c_ws/files/1c_work_server.sh

@@ -1 +1 @@
-../../../../etc/zabbix/scripts/1c_work_server.sh
+../../../../scripts/1c_work_server.sh

playbooks/roles/1c_ws/files/userparameter_1c-ws.conf

@@ -1 +1 @@
-../../../../etc/zabbix/zabbix_agentd.d/userparameter_1c-ws.conf
+../../../../configs/userparameter_1c-ws.conf

playbooks/roles/1c_ws/handlers/main.yml

@@ -1,2 +1,6 @@
 ---
 # handlers file for 1c_ws
+
+- name: Add host to group for restart zabbix agent
+  group_by:
+    key: hosts_to_restart

playbooks/roles/1c_ws/tasks/main.yml

@@ -15,38 +15,44 @@
     owner: root
     group: root
     mode: 0644
+  notify: 
+    - Add host to group for restart zabbix agent
 
 - name: Copy main script for work server
   copy:
     src: 1c_work_server.sh
     dest: /etc/zabbix/scripts/
-    owner: zabbix
-    group: zabbix
+    owner: root
+    group: root
     mode: 0755
 
 - name: Make directory for 1C tech log
   file:
     name: /var/log/1C
     owner: usr1cv8
     group: grp1cv8
+    state: directory
     mode: 0750
 
 - name: Make directory for 1C tech log
   file:
     name: /var/log/1C/zabbix
     owner: usr1cv8
     group: grp1cv8
+    state: directory
     mode: 0750
 
 - name: Make directory for problem log
   file:
     name: /var/log/1C/zabbix/problem_log
     owner: zabbix
     group: grp1cv8
+    state: directory
     mode: 0750
 
 - name: Attach zabbix user to 1C group
   user:
     name: zabbix
     groups: grp1cv8
     append: yes
+

playbooks/roles/general/files/1c_common_module.sh

@@ -1 +1 @@
-../../../../etc/zabbix/scripts/1c_common_module.sh
+../../../../scripts/1c_common_module.sh

playbooks/roles/general/tasks/main.yml

@@ -1,9 +1,17 @@
 ---
 # tasks file for general
+- name: Make directory for template scripts
+  file:
+    path: /etc/zabbix/scripts
+    state: directory
+    owner: root
+    group: root
+    mode: 0755
+
 - name: Copy common module script
   copy:
     src: 1c_common_module.sh
     dest: /etc/zabbix/scripts/
-    owner: zabbix
-    group: zabbix
-    mode: 0755
+    owner: root
+    group: root
+    mode: 0755