From 393258b750a6e176fa3a825ab91862fa260a8813 Mon Sep 17 00:00:00 2001 From: Caleb Fultz Date: Sun, 14 Jul 2024 00:57:15 -0400 Subject: [PATCH] jina templates --- 10-host-vars/roles/base/tasks/main.yml | 2 +- 10-host-vars/site.yml | 2 +- 11-jinga-templates/host_vars/10.0.0.11.yml | 1 + 11-jinga-templates/host_vars/10.0.0.5.yml | 3 ++- 11-jinga-templates/host_vars/10.0.0.7.yml | 3 ++- 11-jinga-templates/host_vars/10.0.0.8.yml | 3 ++- 11-jinga-templates/roles/base/handlers/main.yml | 2 +- 7 files changed, 10 insertions(+), 6 deletions(-) diff --git a/10-host-vars/roles/base/tasks/main.yml b/10-host-vars/roles/base/tasks/main.yml index 1424014..301bd69 100644 --- a/10-host-vars/roles/base/tasks/main.yml +++ b/10-host-vars/roles/base/tasks/main.yml @@ -29,4 +29,4 @@ authorized_key: user: cfultz state: present - key: "{{ lookup('url', 'https://git.cfultz.wtf/cfultz.keys', split_lines=False) }}" \ No newline at end of file + key: "{{ lookup('url', 'https://git.cfultz.wtf/cfultz.keys', split_lines=False) }}" diff --git a/10-host-vars/site.yml b/10-host-vars/site.yml index 2e05265..7cd0562 100644 --- a/10-host-vars/site.yml +++ b/10-host-vars/site.yml @@ -3,7 +3,7 @@ become: true pre_tasks: - - name: install updates for RHEL distros + - name: install updates for EL distros tags: always package: update_only: yes diff --git a/11-jinga-templates/host_vars/10.0.0.11.yml b/11-jinga-templates/host_vars/10.0.0.11.yml index 485e9c9..cf8e497 100644 --- a/11-jinga-templates/host_vars/10.0.0.11.yml +++ b/11-jinga-templates/host_vars/10.0.0.11.yml @@ -5,3 +5,4 @@ database_package: mariadb database_service: mariadb passwd_auth: "no" ssh_template_file: sshd_config_el.j2 +sshd_service: sshd \ No newline at end of file diff --git a/11-jinga-templates/host_vars/10.0.0.5.yml b/11-jinga-templates/host_vars/10.0.0.5.yml index 2b539ee..cf8e497 100644 --- a/11-jinga-templates/host_vars/10.0.0.5.yml +++ b/11-jinga-templates/host_vars/10.0.0.5.yml @@ -4,4 +4,5 @@ php_package: php database_package: mariadb database_service: mariadb passwd_auth: "no" -ssh_template_file: sshd_config_el.j2 \ No newline at end of file +ssh_template_file: sshd_config_el.j2 +sshd_service: sshd \ No newline at end of file diff --git a/11-jinga-templates/host_vars/10.0.0.7.yml b/11-jinga-templates/host_vars/10.0.0.7.yml index 203473c..fba99ef 100644 --- a/11-jinga-templates/host_vars/10.0.0.7.yml +++ b/11-jinga-templates/host_vars/10.0.0.7.yml @@ -4,4 +4,5 @@ php_package: libapache2-mod-php database_package: mariadb-server database_service: mariadb-server passwd_auth: "no" -ssh_template_file: sshd_config_debian.j2 \ No newline at end of file +ssh_template_file: sshd_config_debian.j2 +sshd_service: ssh \ No newline at end of file diff --git a/11-jinga-templates/host_vars/10.0.0.8.yml b/11-jinga-templates/host_vars/10.0.0.8.yml index 203473c..fba99ef 100644 --- a/11-jinga-templates/host_vars/10.0.0.8.yml +++ b/11-jinga-templates/host_vars/10.0.0.8.yml @@ -4,4 +4,5 @@ php_package: libapache2-mod-php database_package: mariadb-server database_service: mariadb-server passwd_auth: "no" -ssh_template_file: sshd_config_debian.j2 \ No newline at end of file +ssh_template_file: sshd_config_debian.j2 +sshd_service: ssh \ No newline at end of file diff --git a/11-jinga-templates/roles/base/handlers/main.yml b/11-jinga-templates/roles/base/handlers/main.yml index 650dd9e..0bce885 100644 --- a/11-jinga-templates/roles/base/handlers/main.yml +++ b/11-jinga-templates/roles/base/handlers/main.yml @@ -1,4 +1,4 @@ - name: restart_sshd service: - name: sshd + name: "{{ sshd_service }}" state: restarted \ No newline at end of file