diff --git a/ansible.cfg b/ansible.cfg index e9afcdd..5efef87 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -1,5 +1,5 @@ [defaults] -INVENTORY = ~/inventory +INVENTORY = ../inventory pipelining = True #strategy = free diff --git a/playbook.yml b/playbook.yml index d656e59..bc512ee 100644 --- a/playbook.yml +++ b/playbook.yml @@ -1,7 +1,7 @@ --- - hosts: all roles: - - { role: packages, become: true} + - { role: packages, become: true, retries: 3, delay: 60} - { role: ssh, become: true} - configs diff --git a/roles/configs/files/bashrc b/roles/configs/files/bashrc index 80bc36a..e037ecd 100644 --- a/roles/configs/files/bashrc +++ b/roles/configs/files/bashrc @@ -283,7 +283,7 @@ alias gupv='git pull --rebase -v' alias gwch='git whatchanged -p --abbrev-commit --pretty=medium' alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign -m "--wip-- [skip ci]"' -alias apt="sudo apt" +#alias apt="sudo apt" alias vim="vim -p" export PS1='\e[0;35m\t \e[0;32m\u@\h:\w\e[m\n\$ ' @@ -293,3 +293,4 @@ figlet `hostname` bind '"\e[A": history-search-backward' bind '"\e[B": history-search-forward' +export EDITOR=vim diff --git a/roles/configs/tasks/root.yml b/roles/configs/tasks/root.yml index 765bf62..9b36a12 100644 --- a/roles/configs/tasks/root.yml +++ b/roles/configs/tasks/root.yml @@ -46,12 +46,16 @@ - name: Change hostname ansible.builtin.hostname: name: "{{ inventory_hostname }}" + - name: Do not show news on login + ignore_errors: true file: path: /etc/update-motd.d/50-motd-news mode: 644 when: ansible_facts['os_family'] == "Debian" + - name: Do not show help on login + ignore_errors: true file: path: /etc/update-motd.d/10-help-text mode: 644 @@ -62,12 +66,14 @@ path: "{{ ansible_user_dir }}/.oh-my-bash" register: omb_flag_root -- debug: - msg: 'OMB is not installed for root' - when: not omb_flag_root.stat.exists - - name: Put simple bashrc config template: src: files/bashrc dest: "/root/.bashrc" when: not omb_flag_root.stat.exists + +- name: Set timezone to Europe/Moscow + community.general.timezone: + name: Europe/Moscow + + diff --git a/roles/packages/tasks/main.yml b/roles/packages/tasks/main.yml index 2a312e3..3c27ed6 100644 --- a/roles/packages/tasks/main.yml +++ b/roles/packages/tasks/main.yml @@ -1,9 +1,10 @@ --- - name: Install Debian packages apt: - name: ['mc', 'htop', 'vim', 'neovim', 'screen', 'tmux', 'curl', 'wget', 'bash-completion', 'tree', 'figlet'] + name: ['mc', 'htop', 'vim', 'neovim', 'screen', 'tmux', 'curl', 'wget', 'bash-completion', 'tree', 'figlet', 'ufw'] state: present update_cache: yes + lock_timeout: 300 when: ansible_facts['os_family'] == "Debian" @@ -11,12 +12,14 @@ apt: name: ['cloud-init', 'modemmanager', 'snapd', 'needrestart'] state: absent + lock_timeout: 300 when: ansible_facts['os_family'] == "Debian" - name: Remove orphans apt: autoremove: yes purge: yes + lock_timeout: 300 when: ansible_facts['os_family'] == "Debian" - name: Less modules in initramfs