From 498fbdcfbc28a26b35158b589d0ab6a769c35bc2 Mon Sep 17 00:00:00 2001 From: git Date: Wed, 24 Jan 2024 12:31:33 +0100 Subject: [PATCH] Merge ssh importing, better hostname set, deleted service_start and IOMMU for proxmox --- roles/import_ssh_key/.travis.yml | 29 ----------- roles/import_ssh_key/defaults/main.yml | 2 - roles/import_ssh_key/handlers/main.yml | 2 - roles/import_ssh_key/tasks/main.yml | 17 ------ roles/import_ssh_key/tests/inventory | 2 - roles/import_ssh_key/tests/test.yml | 5 -- roles/import_ssh_key/vars/main.yml | 2 - .../linux_config_init/tasks/hostname_set.yml | 25 ++++++++- roles/linux_config_init/tasks/main.yml | 2 +- .../linux_config_init/tasks/script_import.yml | 14 ----- .../linux_config_init/tasks/set_perma_ip.yml | 17 ------ roles/service_start/README.md | 38 -------------- roles/service_start/defaults/main.yml | 2 - roles/service_start/handlers/main.yml | 2 - roles/service_start/meta/main.yml | 52 ------------------- roles/service_start/tasks/main.yml | 4 -- roles/service_start/tasks/ssh_server.yml | 18 ------- roles/service_start/tests/inventory | 2 - roles/service_start/tests/test.yml | 5 -- roles/service_start/vars/main.yml | 2 - .../tasks/administration.yml | 1 + 21 files changed, 26 insertions(+), 217 deletions(-) delete mode 100644 roles/import_ssh_key/.travis.yml delete mode 100644 roles/import_ssh_key/defaults/main.yml delete mode 100644 roles/import_ssh_key/handlers/main.yml delete mode 100644 roles/import_ssh_key/tasks/main.yml delete mode 100644 roles/import_ssh_key/tests/inventory delete mode 100644 roles/import_ssh_key/tests/test.yml delete mode 100644 roles/import_ssh_key/vars/main.yml delete mode 100644 roles/linux_config_init/tasks/script_import.yml delete mode 100644 roles/service_start/README.md delete mode 100644 roles/service_start/defaults/main.yml delete mode 100644 roles/service_start/handlers/main.yml delete mode 100644 roles/service_start/meta/main.yml delete mode 100644 roles/service_start/tasks/main.yml delete mode 100644 roles/service_start/tasks/ssh_server.yml delete mode 100644 roles/service_start/tests/inventory delete mode 100644 roles/service_start/tests/test.yml delete mode 100644 roles/service_start/vars/main.yml diff --git a/roles/import_ssh_key/.travis.yml b/roles/import_ssh_key/.travis.yml deleted file mode 100644 index 36bbf62..0000000 --- a/roles/import_ssh_key/.travis.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -language: python -python: "2.7" - -# Use the new container infrastructure -sudo: false - -# Install ansible -addons: - apt: - packages: - - python-pip - -install: - # Install ansible - - pip install ansible - - # Check ansible version - - ansible --version - - # Create ansible.cfg with correct roles_path - - printf '[defaults]\nroles_path=../' >ansible.cfg - -script: - # Basic role syntax check - - ansible-playbook tests/test.yml -i tests/inventory --syntax-check - -notifications: - webhooks: https://galaxy.ansible.com/api/v1/notifications/ \ No newline at end of file diff --git a/roles/import_ssh_key/defaults/main.yml b/roles/import_ssh_key/defaults/main.yml deleted file mode 100644 index 41ac92c..0000000 --- a/roles/import_ssh_key/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# defaults file for import_ssh_key diff --git a/roles/import_ssh_key/handlers/main.yml b/roles/import_ssh_key/handlers/main.yml deleted file mode 100644 index 58fbc58..0000000 --- a/roles/import_ssh_key/handlers/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# handlers file for import_ssh_key diff --git a/roles/import_ssh_key/tasks/main.yml b/roles/import_ssh_key/tasks/main.yml deleted file mode 100644 index 97b46fc..0000000 --- a/roles/import_ssh_key/tasks/main.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -- name: Dowload - ansible.builtin.uri: - url: https://github.com/MatousVondrejka.keys - method: GET - return_content: true - register: ssh_key - -- name: Setting - ansible.builtin.blockinfile: - state: present - insertafter: EOF - path: ~/.ssh/authorized_keys - mode: '0664' - create: true - block: | - {{ ssh_key.content }} diff --git a/roles/import_ssh_key/tests/inventory b/roles/import_ssh_key/tests/inventory deleted file mode 100644 index 878877b..0000000 --- a/roles/import_ssh_key/tests/inventory +++ /dev/null @@ -1,2 +0,0 @@ -localhost - diff --git a/roles/import_ssh_key/tests/test.yml b/roles/import_ssh_key/tests/test.yml deleted file mode 100644 index d19bcd3..0000000 --- a/roles/import_ssh_key/tests/test.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- hosts: localhost - remote_user: root - roles: - - import_ssh_key diff --git a/roles/import_ssh_key/vars/main.yml b/roles/import_ssh_key/vars/main.yml deleted file mode 100644 index ecff6d6..0000000 --- a/roles/import_ssh_key/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# vars file for import_ssh_key diff --git a/roles/linux_config_init/tasks/hostname_set.yml b/roles/linux_config_init/tasks/hostname_set.yml index 2e944f7..88de0fd 100644 --- a/roles/linux_config_init/tasks/hostname_set.yml +++ b/roles/linux_config_init/tasks/hostname_set.yml @@ -1,3 +1,26 @@ +--- +- name: Copy /etc/hosts + template: + src: ../templates/etc_hosts + dest: /etc/hosts + owner: root + group: root + mode: '0664' + + +- name: Set host name in /etc/hosts + ansible.builtin.blockinfile: + state: present + insertafter: EOF + path: /etc/hosts + mode: '0664' + owner: root + group: root + create: true + block: | + {{ ip }} {{ host }} + + - name: Set a hostname ansible.builtin.hostname: - name: "{{ host }}" + name: "{{ host }}" \ 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 d9946e2..2587c88 100644 --- a/roles/linux_config_init/tasks/main.yml +++ b/roles/linux_config_init/tasks/main.yml @@ -6,7 +6,7 @@ - sudoer_no_passwd.yml - hostname_set.yml - git.yml - - create_warezjoe.yml + - create_user.yml # - script_import.yml #- name: Set Pernament IP diff --git a/roles/linux_config_init/tasks/script_import.yml b/roles/linux_config_init/tasks/script_import.yml deleted file mode 100644 index 90e830c..0000000 --- a/roles/linux_config_init/tasks/script_import.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- name: Clone a github repository - git: - 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 - diff --git a/roles/linux_config_init/tasks/set_perma_ip.yml b/roles/linux_config_init/tasks/set_perma_ip.yml index 85dbd7f..ed97d53 100644 --- a/roles/linux_config_init/tasks/set_perma_ip.yml +++ b/roles/linux_config_init/tasks/set_perma_ip.yml @@ -1,18 +1 @@ --- -- name: Delete all old ethernet connections for desktop exept below configured - community.general.nmcli: - conn_name: '*' - state: absent - when: host == 'desktop' - -- name: Add an Ethernet connection with static IP configuration for desktop - community.general.nmcli: - conn_name: deksktop-local - ifname: enp7s0 - type: ethernet - ip4: 192.168.5.99/24 - gw4: 192.168.5.1 - dns4: 8.8.8.8 - state: present - autoconnect: true - when: host == 'desktop' diff --git a/roles/service_start/README.md b/roles/service_start/README.md deleted file mode 100644 index 225dd44..0000000 --- a/roles/service_start/README.md +++ /dev/null @@ -1,38 +0,0 @@ -Role Name -========= - -A brief description of the role goes here. - -Requirements ------------- - -Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required. - -Role Variables --------------- - -A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well. - -Dependencies ------------- - -A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles. - -Example Playbook ----------------- - -Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too: - - - hosts: servers - roles: - - { role: username.rolename, x: 42 } - -License -------- - -BSD - -Author Information ------------------- - -An optional section for the role authors to include contact information, or a website (HTML is not allowed). diff --git a/roles/service_start/defaults/main.yml b/roles/service_start/defaults/main.yml deleted file mode 100644 index be080b7..0000000 --- a/roles/service_start/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# defaults file for service_start diff --git a/roles/service_start/handlers/main.yml b/roles/service_start/handlers/main.yml deleted file mode 100644 index fc9d393..0000000 --- a/roles/service_start/handlers/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# handlers file for service_start diff --git a/roles/service_start/meta/main.yml b/roles/service_start/meta/main.yml deleted file mode 100644 index c572acc..0000000 --- a/roles/service_start/meta/main.yml +++ /dev/null @@ -1,52 +0,0 @@ -galaxy_info: - author: your name - description: your role description - company: your company (optional) - - # If the issue tracker for your role is not on github, uncomment the - # next line and provide a value - # issue_tracker_url: http://example.com/issue/tracker - - # Choose a valid license ID from https://spdx.org - some suggested licenses: - # - BSD-3-Clause (default) - # - MIT - # - GPL-2.0-or-later - # - GPL-3.0-only - # - Apache-2.0 - # - CC-BY-4.0 - license: license (GPL-2.0-or-later, MIT, etc) - - min_ansible_version: 2.1 - - # If this a Container Enabled role, provide the minimum Ansible Container version. - # min_ansible_container_version: - - # - # Provide a list of supported platforms, and for each platform a list of versions. - # If you don't wish to enumerate all versions for a particular platform, use 'all'. - # To view available platforms and versions (or releases), visit: - # https://galaxy.ansible.com/api/v1/platforms/ - # - # platforms: - # - name: Fedora - # versions: - # - all - # - 25 - # - name: SomePlatform - # versions: - # - all - # - 1.0 - # - 7 - # - 99.99 - - galaxy_tags: [] - # List tags for your role here, one per line. A tag is a keyword that describes - # and categorizes the role. Users find roles by searching for tags. Be sure to - # remove the '[]' above, if you add tags to this list. - # - # NOTE: A tag is limited to a single word comprised of alphanumeric characters. - # Maximum 20 tags per role. - -dependencies: [] - # List your role dependencies here, one per line. Be sure to remove the '[]' above, - # if you add dependencies to this list. diff --git a/roles/service_start/tasks/main.yml b/roles/service_start/tasks/main.yml deleted file mode 100644 index eeec62f..0000000 --- a/roles/service_start/tasks/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -# tasks file for service_start -- name: SSH server - 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 deleted file mode 100644 index 3958823..0000000 --- a/roles/service_start/tasks/ssh_server.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -- name: Replace line - become: true - lineinfile: - path: /etc/ssh/sshd_config - regexp: '^(.*)#PasswordAuthentication yes(.*)$' - line: 'PasswordAuthentication no' - backrefs: yes - - -- name: Start and enable sshd - become: true - ansible.builtin.service: - name: sshd - state: started - enabled: true - when: host != 'ntb' - diff --git a/roles/service_start/tests/inventory b/roles/service_start/tests/inventory deleted file mode 100644 index 878877b..0000000 --- a/roles/service_start/tests/inventory +++ /dev/null @@ -1,2 +0,0 @@ -localhost - diff --git a/roles/service_start/tests/test.yml b/roles/service_start/tests/test.yml deleted file mode 100644 index fa9ecac..0000000 --- a/roles/service_start/tests/test.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- hosts: localhost - remote_user: root - roles: - - service_start diff --git a/roles/service_start/vars/main.yml b/roles/service_start/vars/main.yml deleted file mode 100644 index 66cdc06..0000000 --- a/roles/service_start/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# vars file for service_start diff --git a/roles/tools_for_command_line/tasks/administration.yml b/roles/tools_for_command_line/tasks/administration.yml index 8fdf31b..566db77 100644 --- a/roles/tools_for_command_line/tasks/administration.yml +++ b/roles/tools_for_command_line/tasks/administration.yml @@ -13,6 +13,7 @@ - gpg - openssh-server - neofetch + - sudo state: present - name: Wireguard deb