diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml index 180d9c8..c70798b 100644 --- a/inventory/group_vars/all.yml +++ b/inventory/group_vars/all.yml @@ -24,8 +24,8 @@ apache_vhosts: >- + (apache_vhosts_munin | default([])) }} -docker_add_repo: True -docker_install_compose_plugin: False +docker_add_repo: true +docker_install_compose_plugin: false docker_users: - 'gballan' @@ -43,13 +43,13 @@ munin_node_plugins: - name: 'uptime' - name: 'users' -ntp_enabled: True +ntp_enabled: true ntp_timezone: 'America/New_York' ntp_package: 'chrony' ntp_daemon: 'chronyd' ntp_config_file: '/etc/chrony/chrony.conf' ntp_driftfile: '/var/lib/chrony/chrony.drift' -ntp_manage_config: True +ntp_manage_config: true ntp_servers: - 'virginia.time.system76.com iburst' - 'ohio.time.system76.com iburst' diff --git a/inventory/group_vars/gitea_servers.yml b/inventory/group_vars/gitea_servers.yml index 79e96b6..98b8fbe 100644 --- a/inventory/group_vars/gitea_servers.yml +++ b/inventory/group_vars/gitea_servers.yml @@ -7,14 +7,14 @@ gitea_data_dir: /var/lib/gitea # use the default SSH server for git operations, not Gitea's built-in one gitea_ssh_port: 22 gitea_user: git -gitea_start_ssh: False +gitea_start_ssh: false -gitea_disable_registration: True -gitea_show_registration_button: False -gitea_require_signin: False +gitea_disable_registration: true +gitea_show_registration_button: false +gitea_require_signin: false -gitea_enable_push_create_org: True -gitea_enable_push_create_user: True +gitea_enable_push_create_org: true +gitea_enable_push_create_user: true # Apache reverse proxy config apache_mods_enabled_gitea: diff --git a/inventory/group_vars/gl_servers.yml b/inventory/group_vars/gl_servers.yml index 135741e..bcc41a5 100644 --- a/inventory/group_vars/gl_servers.yml +++ b/inventory/group_vars/gl_servers.yml @@ -1,9 +1,9 @@ --- -git_install_from_source: False +git_install_from_source: false -ruby_install_from_source: False -ruby_install_bundler: True +ruby_install_from_source: false +ruby_install_bundler: true nodejs_version: '24.x' diff --git a/inventory/group_vars/munin_masters.yml b/inventory/group_vars/munin_masters.yml index d22e814..2b89b36 100644 --- a/inventory/group_vars/munin_masters.yml +++ b/inventory/group_vars/munin_masters.yml @@ -25,7 +25,7 @@ apache_vhosts_munin: DirectoryIndex index.html -munin_local_conf_remove: True +munin_local_conf_remove: true munin_html_strategy: 'cgi' munin_graph_strategy: 'cgi' munin_max_processes: 4 diff --git a/playbooks/base.yml b/playbooks/base.yml index ae3a33e..b7d0970 100644 --- a/playbooks/base.yml +++ b/playbooks/base.yml @@ -2,28 +2,28 @@ - name: Uninstall Puppet/OpenVox packages hosts: all - become: yes + become: true tasks: - name: Uninstall puppet package - package: + ansible.builtin.package: name: 'puppet-agent' state: absent - name: Uninstall puppet-release package - package: + ansible.builtin.package: name: 'puppet8-release' state: absent - name: Uninstall openvox package - package: + ansible.builtin.package: name: 'openvox-agent' state: absent - name: Uninstall openvox-release package - package: + ansible.builtin.package: name: 'openvox8-release' state: absent - name: Disable Puppet Service if present hosts: all - become: yes + become: true tasks: - name: Check if Puppet service exists ansible.builtin.service_facts: @@ -32,5 +32,5 @@ ansible.builtin.service: name: puppet state: stopped - enabled: False + enabled: false when: "'puppet.service' in services or 'puppet' in services" diff --git a/playbooks/os_patching.yml b/playbooks/os_patching.yml index 0e872a8..15cdba0 100644 --- a/playbooks/os_patching.yml +++ b/playbooks/os_patching.yml @@ -11,22 +11,22 @@ tasks: - name: Update apt cache (Debian) ansible.builtin.apt: - update_cache: yes + update_cache: true cache_valid_time: 3600 when: ansible_os_family == "Debian" - name: Upgrade all packages (Debian) ansible.builtin.apt: upgrade: dist - autoremove: yes - autoclean: yes + autoremove: true + autoclean: true when: ansible_os_family == "Debian" - - name: Upgrade all packages (RedHat) + - name: Upgrade all packages (RedHat) # noqa: package-latest ansible.builtin.dnf: name: "*" state: latest - update_cache: yes + update_cache: true when: ansible_os_family == "RedHat" - name: Check if reboot is required (Debian) diff --git a/playbooks/packages.yml b/playbooks/packages.yml index 9cbadbc..e20cbc7 100644 --- a/playbooks/packages.yml +++ b/playbooks/packages.yml @@ -1,17 +1,15 @@ --- -- hosts: all - become: True +- name: Install common packages + hosts: all + become: true tasks: - name: Install common packages on all hosts - package: + ansible.builtin.package: name: "{{ packages_common }}" state: present -- hosts: all - become: True - tasks: - name: Install extra packages if listed - package: + ansible.builtin.package: name: "{{ packages_extra | default([]) }}" state: present