From 19f000ded3a582644036892dae9c8b6d91348046 Mon Sep 17 00:00:00 2001 From: Claudio Maradonna Date: Tue, 27 Dec 2022 20:37:22 +0100 Subject: [PATCH] Add roles dedicated to little sysadmin operations. updated yggdrasil module with fast peers update in config :) --- handbook.yml | 3 ++ roles/sysadmin-tools/.travis.yml | 29 +++++++++++++ roles/sysadmin-tools/README.md | 38 +++++++++++++++++ roles/sysadmin-tools/defaults/main.yml | 2 + roles/sysadmin-tools/handlers/main.yml | 2 + roles/sysadmin-tools/meta/main.yml | 52 ++++++++++++++++++++++++ roles/sysadmin-tools/tasks/main.yml | 13 ++++++ roles/sysadmin-tools/tests/inventory | 2 + roles/sysadmin-tools/tests/test.yml | 5 +++ roles/sysadmin-tools/vars/main.yml | 2 + roles/yggdrasil/tasks/install_Debian.yml | 7 +--- roles/yggdrasil/tasks/main.yml | 5 +++ roles/yggdrasil/tasks/update_peers.yml | 13 ++++++ 13 files changed, 168 insertions(+), 5 deletions(-) create mode 100644 roles/sysadmin-tools/.travis.yml create mode 100644 roles/sysadmin-tools/README.md create mode 100644 roles/sysadmin-tools/defaults/main.yml create mode 100644 roles/sysadmin-tools/handlers/main.yml create mode 100644 roles/sysadmin-tools/meta/main.yml create mode 100644 roles/sysadmin-tools/tasks/main.yml create mode 100644 roles/sysadmin-tools/tests/inventory create mode 100644 roles/sysadmin-tools/tests/test.yml create mode 100644 roles/sysadmin-tools/vars/main.yml create mode 100644 roles/yggdrasil/tasks/update_peers.yml diff --git a/handbook.yml b/handbook.yml index 069b60a..feb2f90 100644 --- a/handbook.yml +++ b/handbook.yml @@ -13,6 +13,9 @@ - { role: auditd, tags: [auditd] } - { role: iptables-webserver, tags: [firewall, webserver] } + # --- Sysadmin --- + - { role: sysadmin-tools, tags: [sysadmin] } + # --- Services --- # Role relative to services, applications and so on - { role: ipfs, tags: [ipfs] } diff --git a/roles/sysadmin-tools/.travis.yml b/roles/sysadmin-tools/.travis.yml new file mode 100644 index 0000000..36bbf62 --- /dev/null +++ b/roles/sysadmin-tools/.travis.yml @@ -0,0 +1,29 @@ +--- +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/sysadmin-tools/README.md b/roles/sysadmin-tools/README.md new file mode 100644 index 0000000..225dd44 --- /dev/null +++ b/roles/sysadmin-tools/README.md @@ -0,0 +1,38 @@ +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/sysadmin-tools/defaults/main.yml b/roles/sysadmin-tools/defaults/main.yml new file mode 100644 index 0000000..35cdfbd --- /dev/null +++ b/roles/sysadmin-tools/defaults/main.yml @@ -0,0 +1,2 @@ +--- +# defaults file for sysadmin-tools diff --git a/roles/sysadmin-tools/handlers/main.yml b/roles/sysadmin-tools/handlers/main.yml new file mode 100644 index 0000000..6f36e96 --- /dev/null +++ b/roles/sysadmin-tools/handlers/main.yml @@ -0,0 +1,2 @@ +--- +# handlers file for sysadmin-tools diff --git a/roles/sysadmin-tools/meta/main.yml b/roles/sysadmin-tools/meta/main.yml new file mode 100644 index 0000000..c572acc --- /dev/null +++ b/roles/sysadmin-tools/meta/main.yml @@ -0,0 +1,52 @@ +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/sysadmin-tools/tasks/main.yml b/roles/sysadmin-tools/tasks/main.yml new file mode 100644 index 0000000..0e8ff60 --- /dev/null +++ b/roles/sysadmin-tools/tasks/main.yml @@ -0,0 +1,13 @@ +--- + +- name: "Setup the hostname of the target" + when: "new_hostname is defined" + block: + - ansible.builtin.hostname: + name: "{{ new_hostname }}" + + - name: "Replace /etc/hosts old entries" + ansible.builtin.replace: + path: /etc/hosts + regexp: '^.*127\.0\.1\.1.*$' + replace: "127.0.1.1 {{ new_hostname }}" diff --git a/roles/sysadmin-tools/tests/inventory b/roles/sysadmin-tools/tests/inventory new file mode 100644 index 0000000..878877b --- /dev/null +++ b/roles/sysadmin-tools/tests/inventory @@ -0,0 +1,2 @@ +localhost + diff --git a/roles/sysadmin-tools/tests/test.yml b/roles/sysadmin-tools/tests/test.yml new file mode 100644 index 0000000..1f4bf9c --- /dev/null +++ b/roles/sysadmin-tools/tests/test.yml @@ -0,0 +1,5 @@ +--- +- hosts: localhost + remote_user: root + roles: + - sysadmin-tools diff --git a/roles/sysadmin-tools/vars/main.yml b/roles/sysadmin-tools/vars/main.yml new file mode 100644 index 0000000..0b68262 --- /dev/null +++ b/roles/sysadmin-tools/vars/main.yml @@ -0,0 +1,2 @@ +--- +# vars file for sysadmin-tools diff --git a/roles/yggdrasil/tasks/install_Debian.yml b/roles/yggdrasil/tasks/install_Debian.yml index 279eeb8..0df7cfb 100644 --- a/roles/yggdrasil/tasks/install_Debian.yml +++ b/roles/yggdrasil/tasks/install_Debian.yml @@ -21,11 +21,8 @@ name: yggdrasil update_cache: yes -- name: Update yggdrasil.conf with peers - replace: - path: /etc/yggdrasil.conf - regexp: 'Peers:\s\[\]' - replace: 'Peers: [\n\ttls://[2001:470:1f13:e56::64]:39575\n\ttls://s2.i2pd.xyz:39575\n\ttls://51.255.223.60:54232\n\ttls://45.147.198.155:6010\n\ttls://ygg1.ezdomain.ru:11130\n\ttls://ygg.mkg20001.io:443\n ]' +- block: + - include_tasks: "update_peers.yml" - name: Enable Yggdrasil service ansible.builtin.systemd: diff --git a/roles/yggdrasil/tasks/main.yml b/roles/yggdrasil/tasks/main.yml index 6d3350b..b803b58 100644 --- a/roles/yggdrasil/tasks/main.yml +++ b/roles/yggdrasil/tasks/main.yml @@ -73,3 +73,8 @@ ansible.builtin.apt: name: yggdrasil state: absent + +- when: + - "yggdrasil_enabled is true" + block: + - include_tasks: "update_peers.yml" diff --git a/roles/yggdrasil/tasks/update_peers.yml b/roles/yggdrasil/tasks/update_peers.yml new file mode 100644 index 0000000..0421178 --- /dev/null +++ b/roles/yggdrasil/tasks/update_peers.yml @@ -0,0 +1,13 @@ +- name: Update yggdrasil.conf with peers + replace: + path: /etc/yggdrasil.conf + regexp: '\bPeers:\s*((?:(?!\bPeers\b).|\n)+?)\](?!:)' + replace: ' + Peers: [\n + \t tls://[2001:470:1f13:e56::64]:39575 \n + \t tls://s2.i2pd.xyz:39575 \n + \t tls://51.255.223.60:54232 \n + \t tls://45.147.198.155:6010 \n + \t tls://gutsche.tech:8889 \n + \t tls://ygg.mkg20001.io:443 \n + ]'