diff --git a/roles/base/tasks/ansible_setup.yml b/roles/base/tasks/ansible_setup.yml index af616d7..88bd090 100644 --- a/roles/base/tasks/ansible_setup.yml +++ b/roles/base/tasks/ansible_setup.yml @@ -1,4 +1,10 @@ # ASC is not recommende need to dearmor file +- name: ansible setup | remove old source.list entry + lineinfile: + path: "/etc/apt/sources.list" + regexp: "deb http://ppa.launchpad.net/ansible/ansible/ubuntu trusty main" + state: absent + - name: ansible setup | get key tags: ansible,ansible-setup get_url: @@ -29,50 +35,50 @@ name: ansible state: latest -- name: ansible setup | install required packages - tags: ansible,ansible-setup,packages - package: - name: - - "{{ dconf_package }}" - - "{{ python_psutil_package }}" +# - name: ansible setup | install required packages +# tags: ansible,ansible-setup,packages +# package: +# name: +# - "{{ dconf_package }}" +# - "{{ python_psutil_package }}" -# Note: For Arch, the requirement is met by a dependency of systemd, only necessary on Debian-based -- name: ansible setup | install acl package - tags: ansible,ansible-setup,packages - package: - name: acl - when: ansible_distribution in ["Debian", "Pop!_OS", "Ubuntu", "Linux Mint"] +# # Note: For Arch, the requirement is met by a dependency of systemd, only necessary on Debian-based +# - name: ansible setup | install acl package +# tags: ansible,ansible-setup,packages +# package: +# name: acl +# when: ansible_distribution in ["Debian", "Pop!_OS", "Ubuntu", "Linux Mint"] -- name: ansible:setup | create ansible log file - tags: ansible,ansible-setup - file: - path: /var/log/ansible.log - owner: rene - group: ansible - mode: 0664 - state: touch - changed_when: False +# - name: ansible:setup | create ansible log file +# tags: ansible,ansible-setup +# file: +# path: /var/log/ansible.log +# owner: rene +# group: ansible +# mode: 0664 +# state: touch +# changed_when: False -- name: ansible setup | add logrotate config for ansible log file - tags: ansible-setup - copy: - src: files/ansible-setup/logrotate - dest: /etc/logrotate.d/ansible - owner: root - group: root - mode: 0644 +# - name: ansible setup | add logrotate config for ansible log file +# tags: ansible-setup +# copy: +# src: files/ansible-setup/logrotate +# dest: /etc/logrotate.d/ansible +# owner: root +# group: root +# mode: 0644 -- name: ansible setup | remove default ansible directory (/etc/ansible) from host - tags: ansible,ansible-setup - file: - path: /etc/ansible - state: absent +# - name: ansible setup | remove default ansible directory (/etc/ansible) from host +# tags: ansible,ansible-setup +# file: +# path: /etc/ansible +# state: absent -- name: ansible setup | generate provision script from template - tags: ansible,ansible-setup,scripts - template: - src: provision.sh.j2 - dest: /usr/local/bin/provision - owner: root - group: root - mode: 0755 +# - name: ansible setup | generate provision script from template +# tags: ansible,ansible-setup,scripts +# template: +# src: provision.sh.j2 +# dest: /usr/local/bin/provision +# owner: root +# group: root +# mode: 0755 diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index 1d279ff..90c143e 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -17,6 +17,7 @@ - wireguard == true - ansible_default_ipv4.address | ansible.utils.ipaddr('public') ignore_errors: True + - import_tasks: ansible_setup.yml - import_tasks: system_setup/git.yml # install software # - import_tasks: software/repositories.yml