From 72c92f231f59b946102d2ea6188ad460b57debcb Mon Sep 17 00:00:00 2001 From: Rafael Ito Date: Mon, 5 Sep 2022 11:29:51 -0300 Subject: [PATCH] [ansible] refactored project in ito-rafael/ansible-provision repo --- ansible/local.yml | 21 ------------ .../roles/base/files/users/sudoers_ansible | 1 - ansible/roles/base/files/users/sudoers_rafael | 1 - ansible/roles/base/tasks/main.yaml | 16 --------- ansible/roles/base/tasks/software/fcron.yml | 23 ------------- ansible/roles/base/tasks/software/openssh.yml | 27 --------------- .../base/tasks/system/auto-provision.yml | 22 ------------ .../roles/base/tasks/system/openssh_keys.yml | 34 ------------------- ansible/roles/base/tasks/users/ansible.yml | 22 ------------ ansible/roles/base/tasks/users/rafael.yml | 22 ------------ ansible/roles/base/vars/Archlinux.yml | 2 -- ansible/roles/base/vars/main.yaml | 1 - ansible/roles/workstation/tasks/main.yaml | 8 ----- .../workstation/tasks/software/shell.yml | 3 -- .../workstation/tasks/software/terminal.yml | 3 -- .../tasks/software/window-manager.yml | 18 ---------- ansible/roles/workstation/vars/Archlinux.yml | 1 - 17 files changed, 225 deletions(-) delete mode 100644 ansible/local.yml delete mode 100644 ansible/roles/base/files/users/sudoers_ansible delete mode 100644 ansible/roles/base/files/users/sudoers_rafael delete mode 100644 ansible/roles/base/tasks/main.yaml delete mode 100644 ansible/roles/base/tasks/software/fcron.yml delete mode 100644 ansible/roles/base/tasks/software/openssh.yml delete mode 100644 ansible/roles/base/tasks/system/auto-provision.yml delete mode 100644 ansible/roles/base/tasks/system/openssh_keys.yml delete mode 100644 ansible/roles/base/tasks/users/ansible.yml delete mode 100644 ansible/roles/base/tasks/users/rafael.yml delete mode 100644 ansible/roles/base/vars/Archlinux.yml delete mode 100644 ansible/roles/base/vars/main.yaml delete mode 100644 ansible/roles/workstation/tasks/main.yaml delete mode 100644 ansible/roles/workstation/tasks/software/shell.yml delete mode 100644 ansible/roles/workstation/tasks/software/terminal.yml delete mode 100644 ansible/roles/workstation/tasks/software/window-manager.yml delete mode 100644 ansible/roles/workstation/vars/Archlinux.yml diff --git a/ansible/local.yml b/ansible/local.yml deleted file mode 100644 index 78942a44..00000000 --- a/ansible/local.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -- hosts: localhost - connection: local - become: true - roles: - - base - -- hosts: all - become: true - pre_tasks: - - name: pre-run | [Arch] update package cache - tags: always - pacman: update_cache=yes - changed_when: False - when: ansible_distribution == "Archlinux" - -- hosts: workstation - become: true - roles: - - workstation -... diff --git a/ansible/roles/base/files/users/sudoers_ansible b/ansible/roles/base/files/users/sudoers_ansible deleted file mode 100644 index 98883937..00000000 --- a/ansible/roles/base/files/users/sudoers_ansible +++ /dev/null @@ -1 +0,0 @@ -ansible ALL=(ALL) NOPASSWD: ALL diff --git a/ansible/roles/base/files/users/sudoers_rafael b/ansible/roles/base/files/users/sudoers_rafael deleted file mode 100644 index a67f825d..00000000 --- a/ansible/roles/base/files/users/sudoers_rafael +++ /dev/null @@ -1 +0,0 @@ -rafael ALL=(ALL) ALL diff --git a/ansible/roles/base/tasks/main.yaml b/ansible/roles/base/tasks/main.yaml deleted file mode 100644 index af1faaa5..00000000 --- a/ansible/roles/base/tasks/main.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# load distro-specific variables -- include_vars: "{{ ansible_distribution }}.yml" - -- block: - - # set up ansible environment - - import_tasks: users/ansible.yml - - import_tasks: software/openssh.yml - - import_tasks: system/openssh_keys.yml - - import_tasks: software/fcron.yml - - import_tasks: system/auto-provision.yml - - # set up users - - import_tasks: users/rafael.yml - - # system setup diff --git a/ansible/roles/base/tasks/software/fcron.yml b/ansible/roles/base/tasks/software/fcron.yml deleted file mode 100644 index fa38045f..00000000 --- a/ansible/roles/base/tasks/software/fcron.yml +++ /dev/null @@ -1,23 +0,0 @@ -- name: system | fcron | install package - package: - name: "{{ cron_package }}" - state: latest - -- name: system | fcron | disable sendmail - replace: - path: /etc/fcron/fcron.conf - regexp: '^(sendmail.*=.*/usr/bin/sendmail)$' - replace: '#\g<1>' - -- name: system | fcron | start daemon - systemd: - name: fcron - state: started - enabled: yes - when: ansible_distribution == "Archlinux" - -- name: system | fcron | crontab symlink - file: - src: /usr/bin/fcrontab - path: /usr/bin/crontab - state: link diff --git a/ansible/roles/base/tasks/software/openssh.yml b/ansible/roles/base/tasks/software/openssh.yml deleted file mode 100644 index 07681dc0..00000000 --- a/ansible/roles/base/tasks/software/openssh.yml +++ /dev/null @@ -1,27 +0,0 @@ -- name: software | openssh | installation [Arch] - package: - name: openssh - state: latest - when: ansible_distribution == "Archlinux" - -- name: software | openssh | installation [Debian] - package: - name: - - openssh-server - - openssh-client - state: latest - when: ansible_distribution == "Debian" - -- name: software | openssh | start daemon [Arch] - systemd: - name: sshd - state: started - enabled: yes - when: ansible_distribution == "Archlinux" - -- name: software | openssh | start daemon [Debian] - systemd: - name: ssh - state: started - enabled: yes - when: ansible_distribution == "Debian" diff --git a/ansible/roles/base/tasks/system/auto-provision.yml b/ansible/roles/base/tasks/system/auto-provision.yml deleted file mode 100644 index 5bd5d5bc..00000000 --- a/ansible/roles/base/tasks/system/auto-provision.yml +++ /dev/null @@ -1,22 +0,0 @@ -- name: system | auto-provision | ansible version - package: - name: ansible - state: latest - -- name: system | auto-provision | create user ansible - user: - name: ansible - system: yes - -- name: system | auto-provision | add ansible to fcron.allow - lineinfile: - path: /etc/fcron/fcron.allow - line: ansible - -- name: system | auto-provision | add cron job - cron: - cron_file: - name: ansible auto-provision - user: ansible - minute: "*/10" - job: ansible-pull --only-if-changed --url https://github.com/ito-rafael/pc-general-config.git ansible/local.yml diff --git a/ansible/roles/base/tasks/system/openssh_keys.yml b/ansible/roles/base/tasks/system/openssh_keys.yml deleted file mode 100644 index 0fadcdae..00000000 --- a/ansible/roles/base/tasks/system/openssh_keys.yml +++ /dev/null @@ -1,34 +0,0 @@ -- name: init | ssh keys | create dir - file: - path: /home/ansible/.ssh - state: directory - owner: ansible - group: ansible - mode: 0700 - -- name: init | ssh keys | generate keys - openssh_keypair: - path: /home/ansible/.ssh/id_ed25519 - type: ed25519 - state: present - owner: ansible - group: ansible - comment: "Ansible" - -- name: init | ssh keys | create known_hosts & authorized_keys dirs - copy: - content: "" - dest: "{{ item }}" - force: no - owner: ansible - group: ansible - mode: 0600 - with_items: - - /home/ansible/.ssh/known_hosts - - /home/ansible/.ssh/authorized_keys - -- name: init | ssh keys | copy pub ssh key - authorized_key: - key: "{{ lookup('file', '/home/ansible/.ssh/id_ed25519.pub') }}" - user: ansible - state: present diff --git a/ansible/roles/base/tasks/users/ansible.yml b/ansible/roles/base/tasks/users/ansible.yml deleted file mode 100644 index 25da9559..00000000 --- a/ansible/roles/base/tasks/users/ansible.yml +++ /dev/null @@ -1,22 +0,0 @@ -- name: users | ansible | create group - group: - name: ansible - state: present - -- name: users | ansible | create user - user: - name: ansible - group: ansible - groups: "{{ sudo_group }}" - state: present - comment: "Ansible" - system: yes - shell: /bin/bash - -- name: users | ansible | add sudoers file - copy: - src: files/users/sudoers_ansible - dest: /etc/sudoers.d/ansible - owner: root - group: root - mode: 0440 diff --git a/ansible/roles/base/tasks/users/rafael.yml b/ansible/roles/base/tasks/users/rafael.yml deleted file mode 100644 index 97baf105..00000000 --- a/ansible/roles/base/tasks/users/rafael.yml +++ /dev/null @@ -1,22 +0,0 @@ -- name: users | rafael | create group - group: - name: rafael - state: present - -- name: users | rafael | create user - user: - name: rafael - group: rafael - groups: "{{ sudo_group }}" - state: present - comment: "Rafael Ito" - password: "{{ rafael_passwd }}" - shell: /usr/bin/zsh - -- name: users | rafael | add sudoers file - copy: - src: files/users/sudoers_rafael - dest: /etc/sudoers.d/rafael - owner: root - group: root - mode: 0440 diff --git a/ansible/roles/base/vars/Archlinux.yml b/ansible/roles/base/vars/Archlinux.yml deleted file mode 100644 index 1e6ea9be..00000000 --- a/ansible/roles/base/vars/Archlinux.yml +++ /dev/null @@ -1,2 +0,0 @@ -cron_package: fcron -sudo_group: wheel diff --git a/ansible/roles/base/vars/main.yaml b/ansible/roles/base/vars/main.yaml deleted file mode 100644 index 7ec65ca9..00000000 --- a/ansible/roles/base/vars/main.yaml +++ /dev/null @@ -1 +0,0 @@ -rafael_passwd: password-hash-goes-here diff --git a/ansible/roles/workstation/tasks/main.yaml b/ansible/roles/workstation/tasks/main.yaml deleted file mode 100644 index fb7c9faf..00000000 --- a/ansible/roles/workstation/tasks/main.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# load distro-specific variables -- include_vars: "{{ ansible_distribution }}.yml" - tags: always - -- block: - - import_tasks: software/shell.yml # Zsh - - import_tasks: software/terminal.yml # kitty - - import_tasks: software/window-manager.yml # Sway diff --git a/ansible/roles/workstation/tasks/software/shell.yml b/ansible/roles/workstation/tasks/software/shell.yml deleted file mode 100644 index a49581c6..00000000 --- a/ansible/roles/workstation/tasks/software/shell.yml +++ /dev/null @@ -1,3 +0,0 @@ -- name: software | shell | zsh - package: - name: zsh diff --git a/ansible/roles/workstation/tasks/software/terminal.yml b/ansible/roles/workstation/tasks/software/terminal.yml deleted file mode 100644 index 296402b7..00000000 --- a/ansible/roles/workstation/tasks/software/terminal.yml +++ /dev/null @@ -1,3 +0,0 @@ -- name: software | terminal | kitty - package: - name: kitty diff --git a/ansible/roles/workstation/tasks/software/window-manager.yml b/ansible/roles/workstation/tasks/software/window-manager.yml deleted file mode 100644 index b801d6b1..00000000 --- a/ansible/roles/workstation/tasks/software/window-manager.yml +++ /dev/null @@ -1,18 +0,0 @@ -- name: software | window-manager | sway - package: - name: - - gnu-free-fonts - - seatd - - sway - -- name: users | rafael | add to seat group - user: - name: rafael - groups: seat - append: yes - -- name: service | seatd | start - systemd: - name: seatd - enabled: yes - state: started diff --git a/ansible/roles/workstation/vars/Archlinux.yml b/ansible/roles/workstation/vars/Archlinux.yml deleted file mode 100644 index dbe4d421..00000000 --- a/ansible/roles/workstation/vars/Archlinux.yml +++ /dev/null @@ -1 +0,0 @@ -wpa_supplicant_package: wpa_supplicant