From db46dc806b518f6cf26be0dbbbac39fcd4d8c822 Mon Sep 17 00:00:00 2001 From: fedy95 Date: Wed, 21 Apr 2021 12:23:48 +0300 Subject: [PATCH] cleanup --- .drone.yml | 4 +- Makefile | 6 +-- ansible-desktop.yml | 2 - compile-default-vars.sh | 6 --- group_vars/all.yml | 1 - install.sh | 19 ------- roles/docker/handlers/main.yml | 2 +- roles/docker/tasks/docker-compose.yml | 24 +++++++++ roles/docker/tasks/docker.yml | 52 ++++++++++++++++++ roles/docker/tasks/main.yml | 76 +-------------------------- roles/docker/vars/main.yml | 2 +- roles/ide_goland/vars/main.yml | 2 +- roles/ide_phpstorm/vars/main.yml | 2 +- roles/krdc/tasks/main.yml | 11 ---- roles/materia-kde/tasks/main.yml | 29 ---------- run.sh | 4 ++ 16 files changed, 91 insertions(+), 151 deletions(-) delete mode 100755 compile-default-vars.sh delete mode 100755 install.sh create mode 100644 roles/docker/tasks/docker-compose.yml create mode 100644 roles/docker/tasks/docker.yml delete mode 100644 roles/krdc/tasks/main.yml delete mode 100644 roles/materia-kde/tasks/main.yml create mode 100755 run.sh diff --git a/.drone.yml b/.drone.yml index 3042de1..9bc7712 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,6 +13,8 @@ steps: - yamllint -c /yamllint/relaxed.yaml roles/common/tasks/main.yml - yamllint -c /yamllint/relaxed.yaml roles/docker/defaults/main.yml - yamllint -c /yamllint/relaxed.yaml roles/docker/handlers/main.yml + - yamllint -c /yamllint/relaxed.yaml roles/docker/tasks/docker.yml + - yamllint -c /yamllint/relaxed.yaml roles/docker/tasks/docker-compose.yml - yamllint -c /yamllint/relaxed.yaml roles/docker/tasks/main.yml - yamllint -c /yamllint/relaxed.yaml roles/docker/vars/main.yml - yamllint -c /yamllint/relaxed.yaml roles/firefox/tasks/main.yml @@ -20,8 +22,6 @@ steps: - yamllint -c /yamllint/relaxed.yaml roles/ide_goland/vars/main.yml - yamllint -c /yamllint/relaxed.yaml roles/ide_phpstorm/tasks/main.yml - yamllint -c /yamllint/relaxed.yaml roles/ide_phpstorm/vars/main.yml - - yamllint -c /yamllint/relaxed.yaml roles/krdc/tasks/main.yml - - yamllint -c /yamllint/relaxed.yaml roles/materia-kde/tasks/main.yml - yamllint -c /yamllint/relaxed.yaml roles/telegram/tasks/main.yml - yamllint -c /yamllint/relaxed.yaml roles/typeface/tasks/main.yml - yamllint -c /yamllint/relaxed.yaml .drone.yml diff --git a/Makefile b/Makefile index a9ba300..c6dab86 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,8 @@ lint-yaml: $(LINT-YAML-CMD) roles/common/tasks/main.yml $(LINT-YAML-CMD) roles/docker/defaults/main.yml $(LINT-YAML-CMD) roles/docker/handlers/main.yml + $(LINT-YAML-CMD) roles/docker/tasks/docker.yml + $(LINT-YAML-CMD) roles/docker/tasks/docker-compose.yml $(LINT-YAML-CMD) roles/docker/tasks/main.yml $(LINT-YAML-CMD) roles/docker/vars/main.yml $(LINT-YAML-CMD) roles/firefox/tasks/main.yml @@ -20,14 +22,12 @@ lint-yaml: $(LINT-YAML-CMD) roles/ide_goland/vars/main.yml $(LINT-YAML-CMD) roles/ide_phpstorm/tasks/main.yml $(LINT-YAML-CMD) roles/ide_phpstorm/vars/main.yml - $(LINT-YAML-CMD) roles/krdc/tasks/main.yml - $(LINT-YAML-CMD) roles/materia-kde/tasks/main.yml $(LINT-YAML-CMD) roles/telegram/tasks/main.yml $(LINT-YAML-CMD) roles/typeface/tasks/main.yml $(LINT-YAML-CMD) .drone.yml $(LINT-YAML-CMD) ansible-desktop.yml run: - ansible-playbook ansible-desktop.yml --ask-become-pass + ./run.sh .DEFAULT_GOAL := lint diff --git a/ansible-desktop.yml b/ansible-desktop.yml index 6d05a15..4be8648 100644 --- a/ansible-desktop.yml +++ b/ansible-desktop.yml @@ -7,8 +7,6 @@ - { role: firefox, become: true } - { role: ide_goland, become: true } - { role: ide_phpstorm, become: true } - # - { role: krdc, become: true } - # - { role: materia-kde, become: true } # https://github.com/PapirusDevelopmentTeam/materia-kde - { role: telegram, become: true } - { role: typeface, become: true } ... diff --git a/compile-default-vars.sh b/compile-default-vars.sh deleted file mode 100755 index 14322b9..0000000 --- a/compile-default-vars.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -cat \ - <(echo -e "---\n") \ - <(cat roles/*/defaults/main.yml | grep -v '^---$' | grep -v '^[[:space:]]*$') \ - > group_vars/_compiled_defaults.yml diff --git a/group_vars/all.yml b/group_vars/all.yml index dcd29cb..2db32b9 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -3,5 +3,4 @@ aptcachetime: 3600 locale: "en_US.UTF-8" timezone: "Europe/Moscow" -lsb_release: 'focal' ... diff --git a/install.sh b/install.sh deleted file mode 100755 index 53ebac2..0000000 --- a/install.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -if ! grep -q "ansible/ansible" /etc/apt/sources.list /etc/apt/sources.list.d/*; then - echo "Adding Ansible PPA" - sudo apt-add-repository ppa:ansible/ansible -y -fi - -if ! hash ansible >/dev/null 2>&1; then - echo "Installing Ansible..." - sudo apt-get update - sudo apt-get install software-properties-common ansible git python-apt -y -else - echo "Ansible already installed" -fi - -echo "" -echo "Run ansible with:" -echo " make" -echo "" diff --git a/roles/docker/handlers/main.yml b/roles/docker/handlers/main.yml index c68a8b9..82f39c5 100644 --- a/roles/docker/handlers/main.yml +++ b/roles/docker/handlers/main.yml @@ -1,4 +1,4 @@ --- - name: Restart Docker - service: name=docker state=restarted + service: "name=docker state={{ docker_restart_handler_state }}" ... diff --git a/roles/docker/tasks/docker-compose.yml b/roles/docker/tasks/docker-compose.yml new file mode 100644 index 0000000..7de3731 --- /dev/null +++ b/roles/docker/tasks/docker-compose.yml @@ -0,0 +1,24 @@ +--- +- name: Check current docker-compose version + command: "{{ docker_compose_bin }} --version" + register: docker_compose_current_version + changed_when: false + failed_when: false + +- name: Renew existing docker-compose version if it's different + file: + path: "{{ docker_compose_bin }}" + state: absent + when: > + docker_compose_current_version.stdout is defined + and docker_compose_version not in docker_compose_current_version.stdout + +- name: Install Docker Compose + get_url: + url: https://github.com/docker/compose/releases/download/{{ docker_compose_version }}/docker-compose-Linux-x86_64 + dest: "{{ docker_compose_bin }}" + mode: 0755 + when: > + docker_compose_current_version.stdout is not defined + or docker_compose_version not in docker_compose_current_version.stdout +... diff --git a/roles/docker/tasks/docker.yml b/roles/docker/tasks/docker.yml new file mode 100644 index 0000000..92c19bf --- /dev/null +++ b/roles/docker/tasks/docker.yml @@ -0,0 +1,52 @@ +--- +- name: Update apt cache + apt: + update_cache: yes + cache_valid_time: "{{ aptcachetime }}" + +- name: Upgrade all apt packages + apt: upgrade=dist + +- name: Install docker packages + apt: + name: "{{ item }}" + state: present + update_cache: yes + loop: + - 'apt-transport-https' + - 'ca-certificates' + - 'curl' + - 'gnupg' + - 'lsb-release' + +- name: Add Docker GPG key + apt_key: + url: https://download.docker.com/linux/ubuntu/gpg + state: present + +- name: Add deb repository + apt_repository: + repo: deb https://download.docker.com/linux/ubuntu {{ ansible_distribution_release }} stable + state: present + update_cache: yes + +- name: Install docker + apt: + name: "{{ item }}" + state: present + update_cache: yes + loop: + - 'docker-ce' + - 'docker-ce-cli' + - 'containerd.io' + +- name: Ensure docker users are added to the docker group. + user: + name: "{{ item }}" + groups: docker + append: true + with_items: "{{ ansible_env.USER }}" + +- name: "Ensure Docker is {{ docker.start | ternary('started','stopped') }}" + service: name=docker state={{ docker.start | ternary('restarted','stopped') }} enabled={{ docker.service_enabled }} +... diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index ac5f3fd..9e33dc7 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -1,76 +1,4 @@ --- -- name: Test if folder exist - stat: - path: "{{ docker_compose_bin }}" - register: docker_compose_bin_exist - -- name: Update apt cache - apt: - update_cache: yes - cache_valid_time: "{{ aptcachetime }}" - -- name: Upgrade all apt packages - apt: upgrade=dist - when: docker_compose_bin_exist.stat.exists == False - -- name: Install docker packages - apt: - name: "{{ item }}" - state: present - update_cache: yes - cache_valid_time: "{{ aptcachetime }}" - loop: [ 'apt-transport-https', 'ca-certificates', 'curl', 'gnupg-agent', 'software-properties-common' ] - when: docker_compose_bin_exist.stat.exists == False - -- name: Add Docker GPG key - apt_key: - url: https://download.docker.com/linux/ubuntu/gpg - state: present - when: docker_compose_bin_exist.stat.exists == False - -- name: Verify that we have the key with the fingerprint - apt_key: - id: 0EBFCD88 - state: present - when: docker_compose_bin_exist.stat.exists == False - -#- name: Add deb repository -# apt_repository: -# repo: deb [arch=amd64] https://download.docker.com/linux/ubuntu groovy stable -# update_cache: yes -# state: present -# when: docker_compose_bin_exist.stat.exists == False - -- name: Install docker - apt: - name: "{{ item }}" - state: present - update_cache: yes - cache_valid_time: "{{ aptcachetime }}" - loop: [ 'docker-ce', 'docker-ce-cli', 'containerd.io' ] - when: docker_compose_bin_exist.stat.exists == False - -- name: Create Docker group - group: name=docker state=present - when: docker_compose_bin_exist.stat.exists == False - -- name: Add current user to Docker group - user: name="{{ ansible_env.USER }}" groups=docker append=yes - when: docker_compose_bin_exist.stat.exists == False - -- name: "Ensure Docker is {{ docker.start | ternary('started','stopped') }}" - service: name=docker state={{ docker.start | ternary('restarted','stopped') }} enabled={{ docker.service_enabled }} - when: docker_compose_bin_exist.stat.exists == False - -- name: Install docker-compose - get_url: - url: https://github.com/docker/compose/releases/download/{{ docker_compose_version }}/docker-compose-Linux-x86_64 - dest: /usr/local/bin/docker-compose - force: no - mode: 0755 - when: docker_compose_bin_exist.stat.exists == False - -- name: Upgrade installed packages - apt: upgrade=yes - when: docker_compose_bin_exist.stat.exists == False +- include_tasks: docker.yml +- include_tasks: docker-compose.yml ... diff --git a/roles/docker/vars/main.yml b/roles/docker/vars/main.yml index 378227c..25c0dd1 100644 --- a/roles/docker/vars/main.yml +++ b/roles/docker/vars/main.yml @@ -1,4 +1,4 @@ --- +docker_compose_version: "1.29.1" docker_compose_bin: "/usr/local/bin/docker-compose" -docker_compose_version: "1.27.4" ... diff --git a/roles/ide_goland/vars/main.yml b/roles/ide_goland/vars/main.yml index f8b1894..251c3fb 100644 --- a/roles/ide_goland/vars/main.yml +++ b/roles/ide_goland/vars/main.yml @@ -1,4 +1,4 @@ --- goland_bin: "/usr/local/bin/goland" -goland_version: "2020.3.3" +goland_version: "2021.1" ... diff --git a/roles/ide_phpstorm/vars/main.yml b/roles/ide_phpstorm/vars/main.yml index 1bb05f5..27df892 100644 --- a/roles/ide_phpstorm/vars/main.yml +++ b/roles/ide_phpstorm/vars/main.yml @@ -1,4 +1,4 @@ --- phpstorm_bin: "/usr/local/bin/phpstorm" -phpstorm_version: "2020.3.2" +phpstorm_version: "2021.1.1" ... diff --git a/roles/krdc/tasks/main.yml b/roles/krdc/tasks/main.yml deleted file mode 100644 index 973dead..0000000 --- a/roles/krdc/tasks/main.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -- name: Install KRDC - apt: - pkg: krdc - state: latest - update_cache: yes - cache_valid_time: "{{ aptcachetime }}" - -- name: Upgrade installed packages - apt: upgrade=yes -... diff --git a/roles/materia-kde/tasks/main.yml b/roles/materia-kde/tasks/main.yml deleted file mode 100644 index c5ab14c..0000000 --- a/roles/materia-kde/tasks/main.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -- name: Update apt cache - apt: - update_cache: yes - cache_valid_time: "{{ aptcachetime }}" - -- name: Upgrade all apt packages - apt: upgrade=dist - -- name: Add deb repository - apt_repository: - repo: ppa:papirus/papirus - state: present - update_cache: no - -- name: Install Materia-KDE - apt: - name: "{{ item }}" - install_recommends: yes - state: latest - update_cache: yes - cache_valid_time: "{{ aptcachetime }}" - loop: [ 'materia-kde', 'papirus-icon-theme' ] - -- name: Apply global theme - command: "lookandfeeltool -a com.github.varlesh.materia-dark" - become: true - become_user: "{{ ansible_env.USER }}" -... diff --git a/run.sh b/run.sh new file mode 100755 index 0000000..55f67ee --- /dev/null +++ b/run.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +sudo apt install ansible +ansible-playbook ansible-desktop.yml --ask-become-pass