Kaynağa Gözat

Merge branch 'master' of https://git.ichalsroot.de/erdo/ansible

erdo_king 7 yıl önce
ebeveyn
işleme
046a44f59f

+ 2 - 0
.gitignore

@@ -0,0 +1,2 @@
+*.retry
+*.swp

+ 3 - 0
main.yml

@@ -20,3 +20,6 @@
        tags: linux_updates
      - role: cleanup
        tags: cleanup
+     - role: config_server
+       tags: config_server
+

+ 12 - 2
roles/cleanup/tasks/main.yml

@@ -1,6 +1,16 @@
 ---
+- name: Remove "check-mk-agent-plugin-mk-apt" package
+  apt:
+    name: check-mk-agent-plugin-mk-apt
+    state: absent
+
+- name: disable unattended upgrades
+  replace:
+    path: /etc/apt/apt.conf.d/20auto-upgrades
+    regexp: '1'
+    replace: '0'
+    
 - name: cleanup apt-update - mk_job
   file:
      path: /var/lib/check_mk_agent/job/root/apt-update
-     state: absent
-
+     state: absent

+ 6 - 0
roles/config_server/handlers/main.yml

@@ -0,0 +1,6 @@
+---
+- name: rebuild locales database
+  command: "{{ item }}"
+  with_items:
+    - dpkg-reconfigure locales -f noninteractive
+    - /usr/sbin/locale-gen

+ 5 - 0
roles/config_server/tasks/main.yml

@@ -0,0 +1,5 @@
+---
+- name: Include tag-files
+  include_tasks: "{{ item }}" 
+  with_fileglob:  
+   -  "{{ role_path }}/tasks/tasks/*.yml"

+ 14 - 0
roles/config_server/tasks/tasks/locale.yml

@@ -0,0 +1,14 @@
+---
+- name: Ensure a locale exists
+  locale_gen:
+    name: de_DE.UTF-8
+    state: present
+
+- name: select default locale
+  debconf:
+    name: locales
+    question: locales/default_environment_locale
+    value: de_DE.UTF-8
+    vtype: select
+  notify:
+    - rebuild locales database

+ 15 - 8
roles/linux_updates/tasks/main.yml

@@ -13,28 +13,35 @@
      upgrade: dist
   register: apt_upgrade
   when: ansible_os_family == "Debian"
+  ignore_errors: True
 
 - name: delete old packages
   apt: autoclean=yes
   register: apt_autoclean
   when: ansible_os_family == "Debian"
 
-- name: updates a server
+- name: check for deleted files
   shell: lsof +L1 -R
   register: lsof
   when: ansible_os_family == "Debian"
 
-#- debug: var=apt_autoclean
-#  with_items: 
-#     - apt_autoclean
-#     - apt_upgrade
-#     - lsof
+  #- debug: var=apt_upgrade
+  #  with_items: 
+  #     - apt_autoclean
+  #     - apt_upgrade
+       #   - lsof
+
+## set color green 
+- set_fact:
+    color: "#00CC33"
+    title_status: "successfully"
+  when: apt_upgrade.failed == false
 
 - mail: 
-        subject: "[U] {{ ansible_distribution }} Update Message # Installed updates on host {{ ansible_fqdn }}"
+        subject: "[U] {{ ansible_fqdn }} # updated {{ title_status }}"
         to: update <erdo@ichalsroot.de>
         body: "{{ lookup('template', 'templates/mail_body.j2') }}"
         subtype: html
   delegate_to: localhost
-  when: ansible_os_family == "Debian"
+  when: ansible_os_family == "Debian" and ( apt_upgrade.changed or apt_upgrade.failed == true )
 

+ 12 - 1
roles/linux_updates/templates/mail_body.j2

@@ -71,6 +71,12 @@
           border-bottom: 1px solid #CCCCCC;
           margin-top: 15px;
         }
+	div.block {
+	  height: 20px; 
+	  width: 20px; 
+	  background-color: {{ color }}; 
+	  display: inline-block;
+	}
     </style>
 </head>
 
@@ -79,7 +85,12 @@
         <table class="header">
                 <thead>
                         <tr>
-                                <th><h1>{{ ansible_distribution}} Update Message</h1></th>
+				<th>
+					<h1>
+						<div class="block">&nbsp;</div>
+						{{ ansible_distribution}} Update Message
+					</h1>
+				</th>
                         </tr>
                 </thead>
                 <tbody>

+ 4 - 0
roles/linux_updates/vars/main.yml

@@ -0,0 +1,4 @@
+---
+## default for mail template
+color: "#FF0000"
+title_status: "failed"