From 183e92b998b0d07460f4b1fc429c1cb461d61e29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christer=20War=C3=A9n?= Date: Fri, 3 May 2024 15:27:44 +0300 Subject: [PATCH] Installer Tasks: Rename to Installer tasks --- install.sh | 2 +- tasks.yml | 6 +++--- tasks/{install.yml => installer.yml} | 32 ++++++++++++++-------------- 3 files changed, 20 insertions(+), 20 deletions(-) rename tasks/{install.yml => installer.yml} (80%) diff --git a/install.sh b/install.sh index 3198b7e..4f38ff3 100644 --- a/install.sh +++ b/install.sh @@ -31,7 +31,7 @@ python3 -m venv /opt/ansible &> /dev/null /opt/ansible/bin/ansible-galaxy collection install -r requirements.yml --upgrade &> /dev/null -/opt/ansible/bin/ansible-pull -U ssh://git@github.com/MatteZ02/mpp-ansible --private-key ~/.ssh/id_rsa tasks.yml -t install +/opt/ansible/bin/ansible-pull -U ssh://git@github.com/MatteZ02/mpp-ansible --private-key ~/.ssh/id_rsa tasks.yml -t installer echo " diff --git a/tasks.yml b/tasks.yml index 623c61c..62bee9d 100644 --- a/tasks.yml +++ b/tasks.yml @@ -6,10 +6,10 @@ gather_timeout: 10 tasks: - - name: "Install" - import_tasks: tasks/install.yml + - name: "Installer" + import_tasks: tasks/installer.yml tags: - - install + - installer - never - name: "Maintenance" diff --git a/tasks/install.yml b/tasks/installer.yml similarity index 80% rename from tasks/install.yml rename to tasks/installer.yml index c90f12b..bd778d9 100644 --- a/tasks/install.yml +++ b/tasks/installer.yml @@ -1,5 +1,5 @@ --- -- name: "Install - Ansible - Python Library" +- name: "Installer - Ansible - Python Library" pip: name: ansible state: latest @@ -9,7 +9,7 @@ tags: - ansible -- name: "Install - Ansible - Create Symbolic Links" +- name: "Installer - Ansible - Create Symbolic Links" ansible.builtin.file: src: /opt/ansible/bin/{{ binary }} dest: /usr/bin/{{ binary }} @@ -35,7 +35,7 @@ tags: - ansible -- name: "Install - Ansible - Dependencies / Python Library : hvac" +- name: "Installer - Ansible - Dependencies / Python Library : hvac" pip: name: hvac state: latest @@ -45,7 +45,7 @@ tags: - ansible -- name: "Install - Ansible - Dependencies / Python Library : netaddr" +- name: "Installer - Ansible - Dependencies / Python Library : netaddr" pip: name: netaddr state: latest @@ -55,7 +55,7 @@ tags: - ansible -- name: "Install - Ansible - Dependencies / Python Library : jmespath" +- name: "Installer - Ansible - Dependencies / Python Library : jmespath" pip: name: jmespath state: latest @@ -65,7 +65,7 @@ tags: - ansible -- name: "Install - Ansible - Dependencies / Python Library : pexpect" +- name: "Installer - Ansible - Dependencies / Python Library : pexpect" pip: name: pexpect state: latest @@ -75,14 +75,14 @@ tags: - ansible -- name: "Install - Podman" +- name: "Installer - Podman" apt: name: podman state: latest tags: - podman -- name: "Install : Podman : Configure - Subordinate Ids : Users : root" +- name: "Installer : Podman : Configure - Subordinate Ids : Users : root" lineinfile: path: /etc/subuid regexp: "^root" @@ -94,7 +94,7 @@ regexp: "^root" line: "root:100000:65536" -- name: "Install - Certbot - Python Library" +- name: "Installer - Certbot - Python Library" pip: name: certbot state: latest @@ -104,7 +104,7 @@ tags: - certbot -- name: "Install - Certbot - Create Symbolic Links" +- name: "Installer - Certbot - Create Symbolic Links" ansible.builtin.file: src: /opt/ansible/bin/{{ binary }} dest: /usr/bin/{{ binary }} @@ -119,7 +119,7 @@ tags: - certbot -- name: "Install - Certbot - Auth Hook" +- name: "Installer - Certbot - Auth Hook" copy: src: "../files/certbot/nginx.sh" dest: "/etc/letsencrypt/renewal-hooks/pre/nginx.sh" @@ -128,7 +128,7 @@ tags: - certbot -- name: "Install - Certbot - Create Certificates" +- name: "Installer - Certbot - Create Certificates" command: "certbot certonly --cert-name {{ cert.name }} --manual --preferred-challenges http-01 --email {{ cert.email }} --server https://acme-v02.api.letsencrypt.org/directory --agree-tos -n --manual-auth-hook /etc/letsencrypt/renewal-hooks/pre/nginx.sh --debug-challenges --preferred-chain='ISRG Root X1' --key-type rsa -d {{ cert.domains | join(' -d ') }}" register: task changed_when: task.stdout.find("Certificate not yet due for renewal; no action taken.") == -1 @@ -141,7 +141,7 @@ tags: - certbot -- name: "Install - MariaDB - Dependencies / Python Library : pymysql" +- name: "Installer - MariaDB - Dependencies / Python Library : pymysql" pip: name: pymysql state: latest @@ -151,7 +151,7 @@ tags: - mariadb -- name: "Install - MariaDB - Dependencies / Package : mariadb-client" +- name: "Installer - MariaDB - Dependencies / Package : mariadb-client" apt: name: "mariadb-client" state: latest @@ -160,7 +160,7 @@ tags: - mariadb -- name: "Install - Schedule - Maintenance" +- name: "Installer - Schedule - Maintenance" cron: name: Maintenance hour: "*/3" @@ -169,7 +169,7 @@ tags: - cron -- name: "Install - Schedule - Deployer" +- name: "Installer - Schedule - Deployer" cron: name: Deployer minute: "*/5"