diff --git a/.ansible-lint b/.ansible-lint index 7ce4d86..d410903 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -4,4 +4,3 @@ exclude_paths: - changelogs skip_list: - var-naming[no-role-prefix] -... diff --git a/.markdownlint.yml b/.markdownlint.yml index eb1dcb8..3a2f102 100644 --- a/.markdownlint.yml +++ b/.markdownlint.yml @@ -4,7 +4,7 @@ default: true # MD003/heading-style/header-style - Heading style # This will ensure that the heading format is consistent across all markdown files MD003: - style: "atx" + style: atx # MD013/line-length - Line length # Setting to false to match the yamllint setting @@ -17,5 +17,4 @@ MD0046: MD033: allowed_elements: - - "br" -... + - br diff --git a/.yamllint b/.yamllint index fe6507a..a6509c7 100644 --- a/.yamllint +++ b/.yamllint @@ -18,7 +18,6 @@ rules: truthy: level: error allowed-values: - - 'true' - - 'false' - - 'on' -... + - "true" + - "false" + - on diff --git a/minecraft/defaults/main.yml b/minecraft/defaults/main.yml index 069865e..e9cbd9d 100644 --- a/minecraft/defaults/main.yml +++ b/minecraft/defaults/main.yml @@ -6,5 +6,4 @@ force_gamemode: false gamemode: survival hardcore_mode: false max_players: 20 -motd: "Minecraft Server" -... +motd: Minecraft Server diff --git a/minecraft/handlers/main.yml b/minecraft/handlers/main.yml index f9e3332..7a4f32f 100644 --- a/minecraft/handlers/main.yml +++ b/minecraft/handlers/main.yml @@ -5,4 +5,3 @@ state: started enabled: true daemon_reload: true -... diff --git a/minecraft/meta/main.yml b/minecraft/meta/main.yml index 6135088..511bba4 100644 --- a/minecraft/meta/main.yml +++ b/minecraft/meta/main.yml @@ -8,10 +8,10 @@ galaxy_info: license: GPL-3.0-only - min_ansible_version: '2.9.10' + min_ansible_version: 2.9.10 platforms: - - name: 'EL' + - name: EL versions: - all @@ -19,4 +19,3 @@ galaxy_info: - minecraft dependencies: [] -... diff --git a/minecraft/molecule/default/converge.yml b/minecraft/molecule/default/converge.yml index 3fb49b7..62387b3 100644 --- a/minecraft/molecule/default/converge.yml +++ b/minecraft/molecule/default/converge.yml @@ -3,7 +3,6 @@ hosts: server become: true tasks: - - name: "Include minecraft" + - name: Include minecraft ansible.builtin.include_role: - name: "minecraft" -... + name: minecraft diff --git a/minecraft/molecule/default/molecule.yml b/minecraft/molecule/default/molecule.yml index 0b3a4ba..ca51e4d 100644 --- a/minecraft/molecule/default/molecule.yml +++ b/minecraft/molecule/default/molecule.yml @@ -24,10 +24,9 @@ provisioner: inventory: group_vars: server: - motd: 'Minecraft server deployed by Molecule' + motd: Minecraft server deployed by Molecule host_vars: minecraft-client: wait_seconds: ${WAIT_SECONDS:-120} verifier: name: ansible -... diff --git a/minecraft/molecule/default/prepare.yml b/minecraft/molecule/default/prepare.yml index 809d14b..80d1b8f 100644 --- a/minecraft/molecule/default/prepare.yml +++ b/minecraft/molecule/default/prepare.yml @@ -3,7 +3,6 @@ hosts: client become: true tasks: - - name: Install pip ansible.builtin.dnf: name: python3-pip @@ -12,4 +11,3 @@ - name: Install mcstatus ansible.builtin.pip: name: mcstatus -... diff --git a/minecraft/molecule/default/verify.yml b/minecraft/molecule/default/verify.yml index cdca876..679fb1e 100644 --- a/minecraft/molecule/default/verify.yml +++ b/minecraft/molecule/default/verify.yml @@ -8,31 +8,30 @@ vars: address: '{{ hostvars["minecraft-server"].ansible_default_ipv4.address }}' tasks: - - name: Wait to confirm server is reachable after {{ wait_seconds }} - ansible.builtin.command: 'mcstatus {{ address }} status' + ansible.builtin.command: mcstatus {{ address }} status changed_when: false - retries: '{{ wait_seconds // 5 }}' + retries: "{{ wait_seconds // 5 }}" delay: 5 register: mcstatus_status_raw until: not (mcstatus_status_raw is failed) - name: Load the mcstatus status json ansible.builtin.set_fact: - mcstatus_status: '{{ mcstatus_status_raw.stdout | from_yaml }}' + mcstatus_status: "{{ mcstatus_status_raw.stdout | from_yaml }}" - name: The mcstatus status output ansible.builtin.debug: var: mcstatus_status - name: Query server - ansible.builtin.command: 'mcstatus {{ address }} query' + ansible.builtin.command: mcstatus {{ address }} query changed_when: false register: mcstatus_query_raw - name: Load the mcstatus query json ansible.builtin.set_fact: - mcstatus_query: '{{ mcstatus_query_raw.stdout | from_yaml }}' + mcstatus_query: "{{ mcstatus_query_raw.stdout | from_yaml }}" - name: Assert motd is properly set and reported ansible.builtin.assert: @@ -41,4 +40,3 @@ - motd in mcstatus_status.description vars: motd: '{{ hostvars["minecraft-server"].motd }}' -... diff --git a/minecraft/tasks/main.yml b/minecraft/tasks/main.yml index d15fe87..31f2782 100644 --- a/minecraft/tasks/main.yml +++ b/minecraft/tasks/main.yml @@ -12,11 +12,11 @@ - name: Create minecraft directories ansible.builtin.file: - path: "/opt/{{ item }}" + path: /opt/{{ item }} state: directory owner: minecraft group: minecraft - mode: '0755' + mode: "0755" with_items: - minecraft - minecraft/backup @@ -44,7 +44,7 @@ - name: Get most recent release to download ansible.builtin.uri: - url: '{{ recent_release.url }}' + url: "{{ recent_release.url }}" method: GET vars: recent_release: '{{ (version_manifest.json.versions | selectattr("id", "equalto", version_manifest.json.latest.release) | list).0 }}' @@ -57,9 +57,9 @@ - name: Download latest Minecraft release ansible.builtin.get_url: - url: '{{ latest_version_manifest.json.downloads.server.url }}' + url: "{{ latest_version_manifest.json.downloads.server.url }}" dest: /opt/minecraft/server/server.jar - mode: '0644' + mode: "0644" - name: Clone mcrcon repo ansible.builtin.git: @@ -78,7 +78,7 @@ remote_src: true src: /opt/minecraft/build/mcrcon-code/mcrcon dest: /opt/minecraft/mcrcon - mode: '0755' + mode: "0755" owner: minecraft group: minecraft @@ -86,19 +86,18 @@ ansible.builtin.template: src: minecraft.service.j2 dest: /etc/systemd/system/minecraft.service - mode: '0644' + mode: "0644" notify: Systemd_reload - name: Populate minecraft server.properties ansible.builtin.template: src: server.properties.j2 - mode: '0644' + mode: "0644" dest: /opt/minecraft/server/server.properties - name: Agree to the EULA ansible.builtin.copy: content: | eula=true - mode: '0644' + mode: "0644" dest: /opt/minecraft/server/eula.txt -... diff --git a/minecraft/vars/main.yml b/minecraft/vars/main.yml index a72f99b..ef34a13 100644 --- a/minecraft/vars/main.yml +++ b/minecraft/vars/main.yml @@ -5,4 +5,3 @@ package_deps: - rsync - git - gcc -... diff --git a/web/meta/main.yml b/web/meta/main.yml index 4471033..6c49a8e 100644 --- a/web/meta/main.yml +++ b/web/meta/main.yml @@ -8,7 +8,7 @@ galaxy_info: license: GPL-3.0-only - min_ansible_version: '2.9.10' + min_ansible_version: 2.9.10 platforms: - name: Fedora @@ -20,4 +20,3 @@ galaxy_info: - test dependencies: [] -... diff --git a/web/molecule/default/converge.yml b/web/molecule/default/converge.yml index 5c34ded..2e29abb 100644 --- a/web/molecule/default/converge.yml +++ b/web/molecule/default/converge.yml @@ -2,7 +2,6 @@ - name: Converge hosts: all tasks: - - name: "Include web" + - name: Include web ansible.builtin.include_role: - name: "web" -... + name: web diff --git a/web/molecule/default/molecule.yml b/web/molecule/default/molecule.yml index 365a1bc..c7301bc 100644 --- a/web/molecule/default/molecule.yml +++ b/web/molecule/default/molecule.yml @@ -18,7 +18,7 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:ro pre_build_image: true published_ports: - - 0.0.0.0:8080:80 + - "0.0.0.0:8080:80" provisioner: name: ansible config_options: @@ -26,4 +26,3 @@ provisioner: pipelining: false verifier: name: ansible -... diff --git a/web/molecule/default/verify.yml b/web/molecule/default/verify.yml index 08b8ecc..d366a5e 100644 --- a/web/molecule/default/verify.yml +++ b/web/molecule/default/verify.yml @@ -3,8 +3,6 @@ hosts: all gather_facts: false tasks: - - name: Test that the website is up ansible.builtin.uri: url: http://localhost -... diff --git a/web/tasks/main.yml b/web/tasks/main.yml index e9e8bf8..eba10f7 100644 --- a/web/tasks/main.yml +++ b/web/tasks/main.yml @@ -10,7 +10,7 @@ dest: /var/www/html/index.html owner: apache group: apache - mode: '0644' + mode: "0644" - name: Start httpd service ansible.builtin.systemd: @@ -18,4 +18,3 @@ enabled: true state: started daemon_reload: true -...