diff --git a/README.rst b/README.rst index d53b55d2b5bab5c0e75ebea20ff90c1eb5db4c11..98d712d56d4b81a9b8da7b742be8d7255d2db17f 100644 --- a/README.rst +++ b/README.rst @@ -28,7 +28,6 @@ Role Variables collectd_riemann_server: collectd_collectd_server: collectd_statsd_server: - unattended_upgrades: tls_cert: # Filename of the TLS cert for that host. tls_key: # Filename of the TLS key for that host. tls_ca_cert: #Filename of the TLS CA cert for that host. diff --git a/tasks/main.yml b/tasks/main.yml index 1135d1b01a684e47d88221c03ca31aac8f1be936..aa77d8979f109b5fe30b3c59de9cf2d17d44997a 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -29,8 +29,5 @@ - include: collectd_agent.yml when: (collectd_graphite_server is defined or collectd_riemann_server is defined or collectd_collectd_server is defined or collectd_statsd_server is defined) and not common_role_finished is defined -- include: unattended_upgrades.yml - when: unattended_upgrades|default(True) and ansible_os_family == 'Debian' and not common_role_finished is defined - - set_fact: common_role_finished: True diff --git a/tasks/unattended_upgrades.yml b/tasks/unattended_upgrades.yml deleted file mode 100644 index 64bf623ef9595bb1202c97324c7a1af7bd2a5903..0000000000000000000000000000000000000000 --- a/tasks/unattended_upgrades.yml +++ /dev/null @@ -1,43 +0,0 @@ ---- - -- name: Assert - assert: - that: ansible_pkg_mgr == 'apt' - -- name: apt install unattended-upgrades - apt: - name: unattended-upgrades - state: present - update_cache: yes - cache_valid_time: 3600 - -- name: Configure unattended-upgrades - with_items: - - dest: /etc/apt/apt.conf.d/50unattended-upgrades - line: 'Unattended-Upgrade::Mail "root";' - regexp: '^Unattended-Upgrade::Mail ' - - dest: /etc/apt/apt.conf.d/50unattended-upgrades - line: 'Unattended-Upgrade::MailOnlyOnError "true";' - regexp: '^Unattended-Upgrade::MailOnlyOnError' - - dest: /etc/apt/apt.conf.d/20auto-upgrades - line: 'APT::Periodic::Update-Package-Lists "1";' - regexp: '^APT::Periodic::Update-Package-Lists' - create: yes - owner: root - group: root - mode: 0o0644 - - dest: /etc/apt/apt.conf.d/20auto-upgrades - line: 'APT::Periodic::Unattended-Upgrade "1";' - regexp: '^APT::Periodic::Unattended-Upgrade' - create: yes - owner: root - group: root - mode: 0o0644 - lineinfile: - dest: '{{ item.dest }}' - line: '{{ item.line }}' - regexp: '{{ item.regexp }}' - create: '{{ item.create|default(False) }}' - owner: '{{ item.owner|default(omit) }}' - group: '{{ item.group|default(omit) }}' - mode: '{{ item.mode|default(omit) }}'