diff --git a/playbook.yml b/playbook.yml index 03c8c26..b0bf94d 100644 --- a/playbook.yml +++ b/playbook.yml @@ -1,15 +1,14 @@ --- - name: And now all running - hosts: localhost + hosts: mintotaur vars: user: warezjoe - host: desktop # desktop rpi ntb + host: ntb # desktop rpi ntb roles: - # run with sudo alone - role: linux_config_init - # - role: import_ssh_key # without sudo - # - role: tools_for_command_line - # - role: service_start - # - role: gui_app_init - # - role: ansible-role-docker - # docker_users: "{{ user }}" + - role: import_ssh_key # without sudo + - role: tools_for_command_line + - role: service_start + - role: gui_app_init + # - role: ansible-role-docker + # docker_users: "{{ user }}" diff --git a/roles/gui_app_init/tasks/add_steam_repo.yml b/roles/gui_app_init/tasks/add_steam_repo.yml index 27654ff..4ea5cbb 100644 --- a/roles/gui_app_init/tasks/add_steam_repo.yml +++ b/roles/gui_app_init/tasks/add_steam_repo.yml @@ -6,4 +6,3 @@ - fedora-workstation-repositories state: present when: ansible_os_family == "RedHat" - diff --git a/roles/gui_app_init/tasks/add_vscode_repo.yml b/roles/gui_app_init/tasks/add_vscode_repo.yml index 68c47c2..5b95ccd 100644 --- a/roles/gui_app_init/tasks/add_vscode_repo.yml +++ b/roles/gui_app_init/tasks/add_vscode_repo.yml @@ -1,5 +1,5 @@ --- -- name: Add repository for vscode +- name: Add repository for vscode for "RedHat" become: true ansible.builtin.yum_repository: name: vscode @@ -7,3 +7,16 @@ baseurl: https://packages.microsoft.com/yumrepos/vscode gpgkey: https://packages.microsoft.com/keys/microsoft.asc when: ansible_os_family == "RedHat" + +- name: Add gpg key for vscode for "Debian" + become: true + ansible.builtin.apt_key: + url: https://packages.microsoft.com/keys/microsoft.asc + state: present + +- name: Add repository for vscode for "Debian" + become: true + ansible.builtin.apt_repository: + repo: deb https://packages.microsoft.com/repos/code stable main + #gpgkey: https://packages.microsoft.com/keys/microsoft.asc + when: ansible_os_family == "Debian" \ No newline at end of file diff --git a/roles/gui_app_init/tasks/administration.yml b/roles/gui_app_init/tasks/administration.yml index 0e02fd9..39c3e36 100644 --- a/roles/gui_app_init/tasks/administration.yml +++ b/roles/gui_app_init/tasks/administration.yml @@ -12,8 +12,3 @@ - terminator state: present -- name: Setting Terminator - ansible.builtin.include_tasks: "{{ item }}" - loop: - - font_set.yml - - terminator_cofig_copy.yml diff --git a/roles/gui_app_init/tasks/games.yml b/roles/gui_app_init/tasks/games.yml index 85ea9ed..bdd30b4 100644 --- a/roles/gui_app_init/tasks/games.yml +++ b/roles/gui_app_init/tasks/games.yml @@ -12,4 +12,4 @@ ansible.builtin.package: name: - wine - state: present \ No newline at end of file + state: present diff --git a/roles/gui_app_init/tasks/install_discord.yml b/roles/gui_app_init/tasks/install_discord.yml index e691d4b..22a7b7f 100644 --- a/roles/gui_app_init/tasks/install_discord.yml +++ b/roles/gui_app_init/tasks/install_discord.yml @@ -5,9 +5,10 @@ register: prefedora_ver when: ansible_os_family == "RedHat" -- name: set fact +- name: Set fact set_fact: fedora_ver: "{{ prefedora_ver.stdout }}" + when: ansible_os_family == "RedHat" - name: Add repo Discord repo for Fedora become: true @@ -20,4 +21,4 @@ become: true ansible.builtin.dnf: name: discord - when: ansible_os_family == "RedHat" \ No newline at end of file + when: ansible_os_family == "RedHat" diff --git a/roles/linux_config_init/tasks/git.yml b/roles/linux_config_init/tasks/git.yml new file mode 100644 index 0000000..8e59aaa --- /dev/null +++ b/roles/linux_config_init/tasks/git.yml @@ -0,0 +1,7 @@ +--- +- name: Get git + become: true + ansible.builtin.package: + name: + - git + state: present \ No newline at end of file diff --git a/roles/linux_config_init/tasks/main.yml b/roles/linux_config_init/tasks/main.yml index 5fd4864..4d2c168 100644 --- a/roles/linux_config_init/tasks/main.yml +++ b/roles/linux_config_init/tasks/main.yml @@ -1,11 +1,12 @@ --- # tasks file for linux_config_init -- name: System settings in /etc +- name: System settings ansible.builtin.include_tasks: "{{ item }}" loop: - # - static_dns.yml - sudoer_no_passwd.yml - hostname_set.yml + - git.yml + - script_import.yml - name: Set Pernament IP ansible.builtin.include_tasks: set_perma_ip.yml diff --git a/roles/linux_config_init/tasks/script_import.yml b/roles/linux_config_init/tasks/script_import.yml index 2cc3f19..90e830c 100644 --- a/roles/linux_config_init/tasks/script_import.yml +++ b/roles/linux_config_init/tasks/script_import.yml @@ -1,9 +1,14 @@ --- - name: Clone a github repository git: - repo: ssh://git@gitea.matous.vondrejka.cz:222/Warezjoe/.bin.git - dest: ~/ - clone: yes - update: yes + repo: https://gitea.matous.vondrejka.cz/Warezjoe/.bin.git + dest: ~/.bin/ + clone: true + update: true + +- name: Run Aliaser + ansible.builtin.blockinfile: + path: ~/.bashrc + block: | + source ~/.bin/Aliaser -- name: Add scripts to PATH diff --git a/roles/linux_config_init/tasks/set_perma_ip.yml b/roles/linux_config_init/tasks/set_perma_ip.yml index 6ffadec..85dbd7f 100644 --- a/roles/linux_config_init/tasks/set_perma_ip.yml +++ b/roles/linux_config_init/tasks/set_perma_ip.yml @@ -1,9 +1,4 @@ --- -- name: Fedora version fetch - shell: | - nmcli c | grep ethernet | awk -F '\\s\\s' '{print $1}' - register: prefedora_ver - - name: Delete all old ethernet connections for desktop exept below configured community.general.nmcli: conn_name: '*' diff --git a/roles/service_start/tasks/main.yml b/roles/service_start/tasks/main.yml index 77e3c7e..eeec62f 100644 --- a/roles/service_start/tasks/main.yml +++ b/roles/service_start/tasks/main.yml @@ -1,4 +1,4 @@ --- # tasks file for service_start - name: SSH server - ansible.builtin.include_tasks: ssh_server.yml \ No newline at end of file + ansible.builtin.include_tasks: ssh_server.yml diff --git a/roles/service_start/tasks/ssh_server.yml b/roles/service_start/tasks/ssh_server.yml index f96664c..3958823 100644 --- a/roles/service_start/tasks/ssh_server.yml +++ b/roles/service_start/tasks/ssh_server.yml @@ -1,5 +1,5 @@ --- -- name: replace line +- name: Replace line become: true lineinfile: path: /etc/ssh/sshd_config diff --git a/roles/tools_for_command_line/tasks/administration.yml b/roles/tools_for_command_line/tasks/administration.yml index 8a914a3..8fdf31b 100644 --- a/roles/tools_for_command_line/tasks/administration.yml +++ b/roles/tools_for_command_line/tasks/administration.yml @@ -7,7 +7,6 @@ - mc - nano - net-tools - - git - ncdu - nmap - telnet