Add fail2ban role and clean up yaml lint noise
This commit is contained in:
@@ -1,16 +1,13 @@
|
||||
---
|
||||
language: python
|
||||
python: "2.7"
|
||||
python: '2.7'
|
||||
|
||||
# Use the new container infrastructure
|
||||
sudo: false
|
||||
|
||||
# Install ansible
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- python-pip
|
||||
|
||||
packages: [python-pip]
|
||||
install:
|
||||
# Install ansible
|
||||
- pip install ansible
|
||||
@@ -20,10 +17,8 @@ install:
|
||||
|
||||
# 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/
|
||||
webhooks: https://galaxy.ansible.com/api/v1/notifications/
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
---
|
||||
# defaults file for ensure_timezone
|
||||
timezone_hwclock: 'UTC'
|
||||
timezone_name: 'UTC'
|
||||
|
||||
timezone_hwclock: UTC
|
||||
timezone_name: UTC
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
---
|
||||
# handlers file for ensure_timezone
|
||||
- name: 'ensure_timezone.package_facts'
|
||||
- name: ensure_timezone.package_facts
|
||||
ansible.builtin.package_facts:
|
||||
- name: 'ensure_timezone.service_facts'
|
||||
- name: ensure_timezone.service_facts
|
||||
ansible.builtin.service_facts:
|
||||
- name: 'ensure_timezone.service_reload'
|
||||
- name: ensure_timezone.service_reload
|
||||
when:
|
||||
- ansible_facts["system"] == 'Linux'
|
||||
- ansible_facts["service_mgr"] == 'systemd'
|
||||
- ensure_timezone is defined
|
||||
ansible.builtin.systemd:
|
||||
daemon_reload: 'yes'
|
||||
- name: 'ensure_timezone.service_restart'
|
||||
- name: ensure_timezone.service_restart
|
||||
when:
|
||||
- ansible_facts["system"] == 'Linux'
|
||||
- ensure_timezone is defined
|
||||
@@ -21,9 +21,7 @@
|
||||
ansible.builtin.service:
|
||||
enabled: '{{ item.enabled }}'
|
||||
name: '{{ item.name }}'
|
||||
state: 'restarted'
|
||||
state: restarted
|
||||
loop: '{{ ensure_timezone.service_list }}'
|
||||
loop_control:
|
||||
label: '{{ item.name }} will be restarted'
|
||||
...
|
||||
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
---
|
||||
galaxy_info:
|
||||
author: Jason Rothstein
|
||||
description: Ensure time zone is configured, and cron restarted if there is a change
|
||||
@@ -15,7 +16,6 @@ galaxy_info:
|
||||
# - Apache-2.0
|
||||
# - CC-BY-4.0
|
||||
license: LGPL-3.0-or-later
|
||||
|
||||
min_ansible_version: 2.9
|
||||
|
||||
# If this a Container Enabled role, provide the minimum Ansible Container version.
|
||||
@@ -38,7 +38,6 @@ galaxy_info:
|
||||
# - 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
|
||||
@@ -46,8 +45,6 @@ galaxy_info:
|
||||
#
|
||||
# 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.
|
||||
|
||||
|
||||
@@ -1,43 +1,45 @@
|
||||
---
|
||||
# tasks file for ensure_timezone
|
||||
- name: 'include variables'
|
||||
when:
|
||||
- ansible_facts["system"] == 'Linux'
|
||||
- name: include variables
|
||||
when: ["ansible_facts[\"system\"] == 'Linux'"]
|
||||
ansible.builtin.include_vars:
|
||||
file: '{{ lookup("first_found", findme) }}'
|
||||
name: 'ensure_timezone'
|
||||
name: ensure_timezone
|
||||
vars:
|
||||
findme:
|
||||
files:
|
||||
- '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml'
|
||||
- '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml'
|
||||
- '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"]
|
||||
}}-{{ ansible_facts["architecture"] }}.yml'
|
||||
- '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"]
|
||||
}}-default.yml'
|
||||
- '{{ ansible_facts["distribution"] }}-default.yml'
|
||||
- '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml'
|
||||
- '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml'
|
||||
- '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"]
|
||||
}}-{{ ansible_facts["architecture"] }}.yml'
|
||||
- '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"]
|
||||
}}-default.yml'
|
||||
- '{{ ansible_facts["os_family"] }}-default.yml'
|
||||
- 'default.yml'
|
||||
paths:
|
||||
- '../vars/'
|
||||
errors: 'ignore'
|
||||
- name: 'package discovery'
|
||||
- default.yml
|
||||
paths: [../vars/]
|
||||
errors: ignore
|
||||
- name: package discovery
|
||||
when:
|
||||
- ansible_facts["system"] == 'Linux'
|
||||
- ansible_facts["packages"] is not defined
|
||||
ansible.builtin.package_facts:
|
||||
- name: 'service discovery'
|
||||
- name: service discovery
|
||||
when:
|
||||
- ansible_facts["system"] == 'Linux'
|
||||
- ansible_facts["services"] is not defined
|
||||
ansible.builtin.service_facts:
|
||||
- name: 'Set timezone'
|
||||
- name: Set timezone
|
||||
community.general.timezone:
|
||||
hwclock: '{{ timezone_hwclock }}'
|
||||
name: '{{ timezone_name }}'
|
||||
notify:
|
||||
- 'ensure_timezone.package_facts'
|
||||
- 'ensure_timezone.service_facts'
|
||||
- 'ensure_timezone.service_restart'
|
||||
- name: 'ensure packages'
|
||||
- ensure_timezone.package_facts
|
||||
- ensure_timezone.service_facts
|
||||
- ensure_timezone.service_restart
|
||||
- name: ensure packages
|
||||
when:
|
||||
- ansible_facts["system"] == 'Linux'
|
||||
- ensure_timezone is defined
|
||||
@@ -49,10 +51,8 @@
|
||||
loop: '{{ ensure_timezone.package_list }}'
|
||||
loop_control:
|
||||
label: '{{ item.name }} will be {{ item.state }}'
|
||||
notify:
|
||||
- 'ensure_timezone.package_facts'
|
||||
- 'ensure_timezone.service_facts'
|
||||
- name: 'ensure configurations'
|
||||
notify: [ensure_timezone.package_facts, ensure_timezone.service_facts]
|
||||
- name: ensure configurations
|
||||
when:
|
||||
- ansible_facts["system"] == 'Linux'
|
||||
- ensure_timezone is defined
|
||||
@@ -73,11 +73,11 @@
|
||||
loop_control:
|
||||
label: '{{ item.dest }} will be ensured'
|
||||
notify:
|
||||
- 'ensure_timezone.package_facts'
|
||||
- 'ensure_timezone.service_facts'
|
||||
- 'ensure_timezone.service_reload'
|
||||
- 'ensure_timezone.service_restart'
|
||||
- name: 'ensure services'
|
||||
- ensure_timezone.package_facts
|
||||
- ensure_timezone.service_facts
|
||||
- ensure_timezone.service_reload
|
||||
- ensure_timezone.service_restart
|
||||
- name: ensure services
|
||||
when:
|
||||
- ansible_facts["system"] == 'Linux'
|
||||
- ensure_timezone is defined
|
||||
@@ -90,10 +90,8 @@
|
||||
loop: '{{ ensure_timezone.service_list }}'
|
||||
loop_control:
|
||||
label: '{{ item.name }} will be {{ item.state }}'
|
||||
notify:
|
||||
- 'ensure_timezone.package_facts'
|
||||
- 'ensure_timezone.service_facts'
|
||||
- name: 'Ensure SELinux is configured'
|
||||
notify: [ensure_timezone.package_facts, ensure_timezone.service_facts]
|
||||
- name: Ensure SELinux is configured
|
||||
when:
|
||||
- ansible_facts["system"] == 'Linux'
|
||||
- ensure_timezone is defined
|
||||
@@ -102,8 +100,8 @@
|
||||
ansible.posix.selinux:
|
||||
policy: '{{ ensure_timezone.selinux_policy }}'
|
||||
state: '{{ ensure_timezone.selinux_state }}'
|
||||
register: 'ensure_timezone_results'
|
||||
- name: 'Reboot if required'
|
||||
register: ensure_timezone_results
|
||||
- name: Reboot if required
|
||||
when:
|
||||
- ansible_facts["system"] == 'Linux'
|
||||
- ensure_timezone is defined
|
||||
@@ -113,7 +111,7 @@
|
||||
- ensure_timezone_results.reboot_required is defined
|
||||
- ensure_timezone_results.reboot_required
|
||||
ansible.builtin.reboot:
|
||||
- name: 'ensure seboolean'
|
||||
- name: ensure seboolean
|
||||
when:
|
||||
- ansible_facts["system"] == 'Linux'
|
||||
- ensure_timezone is defined
|
||||
@@ -126,6 +124,5 @@
|
||||
loop: '{{ ensure_timezone.seboolean_list }}'
|
||||
loop_control:
|
||||
label: '{{ item.name }} will be {{ item.state }}'
|
||||
- name: 'flush handlers'
|
||||
ansible.builtin.meta: 'flush_handlers'
|
||||
...
|
||||
- name: flush handlers
|
||||
ansible.builtin.meta: flush_handlers
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
---
|
||||
- hosts: localhost
|
||||
remote_user: root
|
||||
roles:
|
||||
- ensure_timezone
|
||||
roles: [ensure_timezone]
|
||||
|
||||
@@ -2,7 +2,5 @@
|
||||
# vars file for ensure_timezone
|
||||
service_list:
|
||||
- enabled: 'yes'
|
||||
name: 'crond.service'
|
||||
state: 'started'
|
||||
...
|
||||
|
||||
name: crond.service
|
||||
state: started
|
||||
|
||||
@@ -2,7 +2,5 @@
|
||||
# vars file for ensure_timezone
|
||||
service_list:
|
||||
- enabled: 'yes'
|
||||
name: 'crond.service'
|
||||
state: 'started'
|
||||
...
|
||||
|
||||
name: crond.service
|
||||
state: started
|
||||
|
||||
@@ -2,7 +2,5 @@
|
||||
# vars file for ensure_timezone
|
||||
service_list:
|
||||
- enabled: 'yes'
|
||||
name: 'crond.service'
|
||||
state: 'started'
|
||||
...
|
||||
|
||||
name: crond.service
|
||||
state: started
|
||||
|
||||
@@ -2,7 +2,5 @@
|
||||
# vars file for ensure_timezone
|
||||
service_list:
|
||||
- enabled: 'yes'
|
||||
name: 'crond.service'
|
||||
state: 'started'
|
||||
...
|
||||
|
||||
name: crond.service
|
||||
state: started
|
||||
|
||||
@@ -2,7 +2,5 @@
|
||||
# vars file for ensure_timezone
|
||||
service_list:
|
||||
- enabled: 'yes'
|
||||
name: 'cron.service'
|
||||
state: 'started'
|
||||
...
|
||||
|
||||
name: cron.service
|
||||
state: started
|
||||
|
||||
@@ -2,7 +2,5 @@
|
||||
# vars file for ensure_timezone
|
||||
service_list:
|
||||
- enabled: 'yes'
|
||||
name: 'cron.service'
|
||||
state: 'started'
|
||||
...
|
||||
|
||||
name: cron.service
|
||||
state: started
|
||||
|
||||
@@ -2,7 +2,5 @@
|
||||
# vars file for ensure_timezone
|
||||
service_list:
|
||||
- enabled: 'yes'
|
||||
name: 'cron.service'
|
||||
state: 'started'
|
||||
...
|
||||
|
||||
name: cron.service
|
||||
state: started
|
||||
|
||||
@@ -2,7 +2,5 @@
|
||||
# vars file for ensure_timezone
|
||||
service_list:
|
||||
- enabled: 'yes'
|
||||
name: 'crond.service'
|
||||
state: 'started'
|
||||
...
|
||||
|
||||
name: crond.service
|
||||
state: started
|
||||
|
||||
@@ -2,7 +2,5 @@
|
||||
# vars file for ensure_timezone
|
||||
service_list:
|
||||
- enabled: 'yes'
|
||||
name: 'crond.service'
|
||||
state: 'started'
|
||||
...
|
||||
|
||||
name: crond.service
|
||||
state: started
|
||||
|
||||
@@ -2,7 +2,5 @@
|
||||
# vars file for ensure_timezone
|
||||
service_list:
|
||||
- enabled: 'yes'
|
||||
name: 'crond.service'
|
||||
state: 'started'
|
||||
...
|
||||
|
||||
name: crond.service
|
||||
state: started
|
||||
|
||||
@@ -2,7 +2,5 @@
|
||||
# vars file for ensure_timezone
|
||||
service_list:
|
||||
- enabled: 'yes'
|
||||
name: 'crond.service'
|
||||
state: 'started'
|
||||
...
|
||||
|
||||
name: crond.service
|
||||
state: started
|
||||
|
||||
@@ -2,7 +2,5 @@
|
||||
# vars file for ensure_timezone
|
||||
service_list:
|
||||
- enabled: 'yes'
|
||||
name: 'crond.service'
|
||||
state: 'started'
|
||||
...
|
||||
|
||||
name: crond.service
|
||||
state: started
|
||||
|
||||
@@ -2,7 +2,5 @@
|
||||
# vars file for ensure_timezone
|
||||
service_list:
|
||||
- enabled: 'yes'
|
||||
name: 'crond.service'
|
||||
state: 'started'
|
||||
...
|
||||
|
||||
name: crond.service
|
||||
state: started
|
||||
|
||||
@@ -2,7 +2,5 @@
|
||||
# vars file for ensure_timezone
|
||||
service_list:
|
||||
- enabled: 'yes'
|
||||
name: 'crond.service'
|
||||
state: 'started'
|
||||
...
|
||||
|
||||
name: crond.service
|
||||
state: started
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
---
|
||||
# vars file for ensure_timezone
|
||||
...
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
---
|
||||
# vars file for ensure_timezone
|
||||
...
|
||||
|
||||
Reference in New Issue
Block a user