From 1101a7cf82524049a5ad76888b8c649f0b87517a Mon Sep 17 00:00:00 2001 From: fedy95 Date: Fri, 5 Mar 2021 18:18:33 +0300 Subject: [PATCH 1/3] update docker --- roles/docker/tasks/main.yml | 18 +++++++++++++++++- roles/docker/vars/main.yml | 4 ++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 roles/docker/vars/main.yml diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index e93a70c..e944fbc 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -1,5 +1,10 @@ --- +- name: Test if folder exist + stat: + path: "{{ docker_compose_bin }}" + register: docker_compose_bin_exist + - name: Update apt cache apt: update_cache: yes @@ -7,6 +12,7 @@ - name: Upgrade all apt packages apt: upgrade=dist + when: docker_compose_bin_exist.stat.exists == False - name: Install docker packages apt: @@ -15,21 +21,25 @@ 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 {{ lsb_release }} stable state: present + when: docker_compose_bin_exist.stat.exists == False - name: Install docker apt: @@ -38,22 +48,28 @@ 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/1.27.4/docker-compose-Linux-x86_64 + 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 diff --git a/roles/docker/vars/main.yml b/roles/docker/vars/main.yml new file mode 100644 index 0000000..d1dc7dc --- /dev/null +++ b/roles/docker/vars/main.yml @@ -0,0 +1,4 @@ +--- + +docker_compose_bin: "/usr/local/bin/docker-compose" +docker_compose_version: "1.27.4" -- 2.30.2 From 15c502367c8f5ab93c23bd046b8886f65b5d2991 Mon Sep 17 00:00:00 2001 From: fedy95 Date: Fri, 5 Mar 2021 18:18:51 +0300 Subject: [PATCH 2/3] add goland --- ansible-desktop.yml | 3 +- roles/common/tasks/main.yml | 22 +++++++++++ roles/ide_goland/tasks/main.yml | 42 +++++++++++++++++++++ roles/ide_goland/vars/main.yml | 4 ++ roles/ide_phpstorm/tasks/main.yml | 42 +++++++++++++++++++++ roles/ide_phpstorm/vars/main.yml | 4 ++ roles/phpstorm/tasks/main.yml | 61 ------------------------------- roles/phpstorm/vars/main.yml | 4 -- 8 files changed, 116 insertions(+), 66 deletions(-) create mode 100644 roles/ide_goland/tasks/main.yml create mode 100644 roles/ide_goland/vars/main.yml create mode 100644 roles/ide_phpstorm/tasks/main.yml create mode 100644 roles/ide_phpstorm/vars/main.yml delete mode 100644 roles/phpstorm/tasks/main.yml delete mode 100644 roles/phpstorm/vars/main.yml diff --git a/ansible-desktop.yml b/ansible-desktop.yml index e4d26dd..36dd8c4 100644 --- a/ansible-desktop.yml +++ b/ansible-desktop.yml @@ -6,7 +6,8 @@ - { role: common, become: true } - { role: docker, become: true } - { 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: phpstorm, become: true } - { role: telegram, become: true } diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 3f93013..37573c9 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -26,3 +26,25 @@ - name: Upgrade installed packages apt: upgrade=yes + +- name: Create .gitignore_global + copy: + dest: /home/fedy95/.gitignore_global + content: | + .idea + +- name: Create global .gitconfig + copy: + dest: /home/fedy95/.gitconfig + content: | + [user] + name = fedy95 + email = fedy95@protonmail.com + [core] + autocrlf = input + excludesfile = /home/fedy95/.gitignore_global + +- name: Create Work dir + file: + path: /home/fedy95/Work + state: directory diff --git a/roles/ide_goland/tasks/main.yml b/roles/ide_goland/tasks/main.yml new file mode 100644 index 0000000..519b0d0 --- /dev/null +++ b/roles/ide_goland/tasks/main.yml @@ -0,0 +1,42 @@ +--- + +- name: Test if folder exist + stat: + path: "{{ goland_bin }}" + register: goland_exist + +- name: Download + get_url: + url: http://download.jetbrains.com/go/ide_goland-{{ goland_version }}.tar.gz + dest: /opt/ide_goland-{{ goland_version }}.tar.gz + when: goland_exist.stat.exists == False + +- name: Create folder + file: + path: /opt/ide_goland-{{ goland_version }} + state: directory + when: goland_exist.stat.exists == False + +- name: Decompress + unarchive: + src: /opt/ide_goland-{{ goland_version }}.tar.gz + dest: /opt/ide_goland-{{ goland_version }} + extra_opts: [ --strip-component=1 ] + when: goland_exist.stat.exists == False + +- name: Create symlink + file: + src: /opt/ide_goland-{{ goland_version }}/bin/ide_goland.sh + dest: "{{ goland_bin }}" + state: link + when: goland_exist.stat.exists == False + +- name: Remove archive + file: + path: /opt/ide_goland-{{ goland_version }}.tar.gz + state: absent + when: goland_exist.stat.exists == False + +- name: Init start (Create Desktop Entry) + command: sh {{ goland_bin }} + when: goland_exist.stat.exists == False diff --git a/roles/ide_goland/vars/main.yml b/roles/ide_goland/vars/main.yml new file mode 100644 index 0000000..35c057d --- /dev/null +++ b/roles/ide_goland/vars/main.yml @@ -0,0 +1,4 @@ +--- + +goland_bin: "/usr/local/bin/ide_goland" +goland_version: "2020.3.3" diff --git a/roles/ide_phpstorm/tasks/main.yml b/roles/ide_phpstorm/tasks/main.yml new file mode 100644 index 0000000..2d60b1d --- /dev/null +++ b/roles/ide_phpstorm/tasks/main.yml @@ -0,0 +1,42 @@ +--- + +- name: Test if folder exist + stat: + path: "{{ phpstorm_bin }}" + register: phpstorm_exist + +- name: Download + get_url: + url: http://download.jetbrains.com/webide/PhpStorm-{{ phpstorm_version }}.tar.gz + dest: /opt/ide_phpstorm-{{ phpstorm_version }}.tar.gz + when: phpstorm_exist.stat.exists == False + +- name: Create folder + file: + path: /opt/ide_phpstorm-{{ phpstorm_version }} + state: directory + when: phpstorm_exist.stat.exists == False + +- name: Decompress + unarchive: + src: /opt/ide_phpstorm-{{ phpstorm_version }}.tar.gz + dest: /opt/ide_phpstorm-{{ phpstorm_version }} + extra_opts: [ --strip-component=1 ] + when: phpstorm_version.stat.exists == False + +- name: Create symlink + file: + src: /opt/ide_phpstorm-{{ phpstorm_version }}/bin/ide_phpstorm.sh + dest: "{{ phpstorm_bin }}" + state: link + when: phpstorm_exist.stat.exists == False + +- name: Remove archive + file: + path: /opt/ide_phpstorm-{{ phpstorm_version }}.tar.gz + state: absent + when: phpstorm_exist.stat.exists == False + +- name: Init start (Create Desktop Entry) + command: sh {{ phpstorm_bin }} + when: phpstorm_exist.stat.exists == False diff --git a/roles/ide_phpstorm/vars/main.yml b/roles/ide_phpstorm/vars/main.yml new file mode 100644 index 0000000..70f73bc --- /dev/null +++ b/roles/ide_phpstorm/vars/main.yml @@ -0,0 +1,4 @@ +--- + +phpstorm_bin: "/usr/local/bin/ide_phpstorm" +phpstorm_version: "2020.3.2" diff --git a/roles/phpstorm/tasks/main.yml b/roles/phpstorm/tasks/main.yml deleted file mode 100644 index bfed3eb..0000000 --- a/roles/phpstorm/tasks/main.yml +++ /dev/null @@ -1,61 +0,0 @@ ---- - -- name: Test if folder exist - stat: - path: "{{ phpstorm_bin }}" - register: phpstorm_exist - -- name: Download - get_url: - url: http://download.jetbrains.com/webide/PhpStorm-{{ phpstorm_version }}.tar.gz - dest: /opt/phpstorm-{{ phpstorm_version }}.tar.gz - when: phpstorm_exist.stat.exists == False - -- name: Decompress - unarchive: - src: /opt/phpstorm-{{ phpstorm_version }}.tar.gz - dest: /opt - copy: no - when: phpstorm_exist.stat.exists == False - -- name: Create folder - shell: - mv /opt/PhpStorm-* /opt/phpstorm-{{ phpstorm_version }} - creates="/opt/phpstorm-{{ phpstorm_version }}" - when: phpstorm_exist.stat.exists == False - -- name: Create symlink - file: - src: /opt/phpstorm-{{ phpstorm_version }}/bin/phpstorm.sh - dest: "{{ phpstorm_bin }}" - state: link - when: phpstorm_exist.stat.exists == False - -- name: Remove archive - file: - path: /opt/phpstorm-{{ phpstorm_version }}.tar.gz - state: absent - when: phpstorm_exist.stat.exists == False - -- name: Create .gitignore_global - copy: - dest: /home/fedy95/.gitignore_global - content: | - .idea - when: phpstorm_exist.stat.exists == False - -- name: Create .gitconfig - copy: - dest: /home/fedy95/.gitconfig - content: | - [user] - name = fedy95 - email = fedy95@protonmail.com - [core] - autocrlf = input - excludesfile = /home/fedy95/.gitignore_global - when: phpstorm_exist.stat.exists == False - -- name: Init start (Create Desktop Entry) - command: sh {{ phpstorm_bin }} - when: phpstorm_exist.stat.exists == False diff --git a/roles/phpstorm/vars/main.yml b/roles/phpstorm/vars/main.yml deleted file mode 100644 index 69e57c6..0000000 --- a/roles/phpstorm/vars/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -phpstorm_bin: "/usr/local/bin/phpstorm" -phpstorm_version: "2020.3.1" -- 2.30.2 From 798bea81a52147450224bd194901ab065de5369d Mon Sep 17 00:00:00 2001 From: fedy95 Date: Fri, 5 Mar 2021 18:19:04 +0300 Subject: [PATCH 3/3] turn off krdc --- ansible-desktop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible-desktop.yml b/ansible-desktop.yml index 36dd8c4..08d9967 100644 --- a/ansible-desktop.yml +++ b/ansible-desktop.yml @@ -8,6 +8,6 @@ - { role: firefox, become: true } - { role: ide_goland, become: true } - { role: ide_phpstorm, become: true } - - { role: krdc, become: true } +# - { role: krdc, become: true } # - { role: materia-kde, become: true } # https://github.com/PapirusDevelopmentTeam/materia-kde - { role: telegram, become: true } -- 2.30.2