check new version

roles/03-installation-minecraft/tasks/01-create-user-group.yml

@@ -3,13 +3,21 @@
   ansible.builtin.group:
     name: "{{ minecraft_group }}"
     state: present
+    system: yes
 
 - name: Create minecraft user
   ansible.builtin.user:
     name: "{{ minecraft_user }}"
     group: "{{ minecraft_group }}"
+    groups: []
+    append: no
     home: "{{ minecraft_base_dir }}"
     shell: /bin/bash
-    system: true
-    create_home: false
-    state: present
+    system: yes
+    create_home: yes
+    state: present
+    comment: "Minecraft Server User"
+
+- name: Set minecraft user password to never expire
+  ansible.builtin.command: chage -M -1 {{ minecraft_user }}
+  changed_when: false

roles/03-installation-minecraft/tasks/02-create-directories.yml

@@ -1,16 +1,25 @@
 ---
-- name: Create minecraft base directories
+- name: Create minecraft directories
   ansible.builtin.file:
     path: "{{ item }}"
     state: directory
     owner: "{{ minecraft_user }}"
     group: "{{ minecraft_group }}"
     mode: '0755'
-  loop:
-    - "{{ minecraft_base_dir }}"
-    - "{{ minecraft_sources_dir }}"
-    - "{{ minecraft_server_dir }}"
-    - "{{ minecraft_tools_dir }}"
-    - "{{ minecraft_plugins_dir }}"
-    - "{{ minecraft_base_dir }}/logs"
-    - "{{ minecraft_base_dir }}/backups"
+  loop: "{{ minecraft_dirs }}"
+
+- name: Create .ssh directory for minecraft user
+  ansible.builtin.file:
+    path: "{{ minecraft_base_dir }}/.ssh"
+    state: directory
+    owner: "{{ minecraft_user }}"
+    group: "{{ minecraft_group }}"
+    mode: '0700'
+
+- name: Set correct permissions on base directory
+  ansible.builtin.file:
+    path: "{{ minecraft_base_dir }}"
+    owner: "{{ minecraft_user }}"
+    group: "{{ minecraft_group }}"
+    mode: '0755'
+    recurse: yes

roles/03-installation-minecraft/tasks/03-download-spigot.yml

@@ -1,9 +1,30 @@
 ---
+- name: Install required packages for building
+  ansible.builtin.apt:
+    name: "{{ build_packages }}"
+    state: present
+    update_cache: yes
+  when: ansible_os_family == "Debian"
+
+- name: Check if BuildTools already exists
+  ansible.builtin.stat:
+    path: "{{ minecraft_sources_dir }}/{{ buildtools_jar }}"
+  register: buildtools_exists
+
 - name: Download BuildTools
   ansible.builtin.get_url:
-    url: "https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar"
-    dest: "{{ minecraft_sources_dir }}/BuildTools.jar"
+    url: "{{ minecraft_build_tools_url }}"
+    dest: "{{ minecraft_sources_dir }}/{{ buildtools_jar }}"
     owner: "{{ minecraft_user }}"
     group: "{{ minecraft_group }}"
     mode: '0644'
-    timeout: 300
+    force: yes
+  when: not buildtools_exists.stat.exists or force_download | default(false)
+
+- name: Create work directory for compilation
+  ansible.builtin.file:
+    path: "{{ minecraft_sources_dir }}/work"
+    state: directory
+    owner: "{{ minecraft_user }}"
+    group: "{{ minecraft_group }}"
+    mode: '0755'

roles/03-installation-minecraft/tasks/04-compile-spigot.yml

@@ -0,0 +1,52 @@
+---
+- name: Check if Spigot is already compiled
+  ansible.builtin.stat:
+    path: "{{ minecraft_sources_dir }}/{{ spigot_jar_name }}"
+  register: spigot_compiled
+
+- name: Remove old work directory if exists
+  ansible.builtin.file:
+    path: "{{ minecraft_sources_dir }}/work"
+    state: absent
+  when: not spigot_compiled.stat.exists
+
+- name: Compile Spigot with BuildTools
+  ansible.builtin.shell: |
+    cd {{ minecraft_sources_dir }}
+    java -Xmx1024M -jar {{ buildtools_jar }} --rev {{ minecraft_version }} --compile-if-changed
+  args:
+    creates: "{{ minecraft_sources_dir }}/{{ spigot_jar_name }}"
+  become_user: "{{ minecraft_user }}"
+  when: not spigot_compiled.stat.exists
+  register: compile_result
+  async: 1800
+  poll: 30
+
+- name: Wait for compilation to complete
+  ansible.builtin.async_status:
+    jid: "{{ compile_result.ansible_job_id }}"
+  register: job_result
+  until: job_result.finished
+  retries: 60
+  delay: 30
+  when: compile_result.ansible_job_id is defined
+
+- name: Verify Spigot jar was created
+  ansible.builtin.stat:
+    path: "{{ minecraft_sources_dir }}/{{ spigot_jar_name }}"
+  register: spigot_jar_check
+  failed_when: not spigot_jar_check.stat.exists
+
+- name: Copy compiled Spigot to server directory
+  ansible.builtin.copy:
+    src: "{{ minecraft_sources_dir }}/{{ spigot_jar_name }}"
+    dest: "{{ minecraft_server_dir }}/{{ spigot_jar_name }}"
+    owner: "{{ minecraft_user }}"
+    group: "{{ minecraft_group }}"
+    mode: '0644'
+    remote_src: yes
+
+- name: Clean up work directory
+  ansible.builtin.file:
+    path: "{{ minecraft_sources_dir }}/work"
+    state: absent

roles/03-installation-minecraft/tasks/04-install-mcrcon.yml

@@ -1,32 +0,0 @@
----
-- name: Install packages needed for MCRCON compilation
-  ansible.builtin.apt:
-    name:
-      - git
-      - build-essential
-    state: present
-
-- name: Clone MCRCON repository
-  ansible.builtin.git:
-    repo: "https://github.com/Tiiffi/mcrcon.git"
-    dest: "{{ minecraft_tools_dir }}/mcrcon"
-    version: "v{{ mcrcon_version }}"
-    force: true
-  become_user: "{{ minecraft_user }}"
-
-- name: Compile MCRCON
-  ansible.builtin.shell: |
-    cd {{ minecraft_tools_dir }}/mcrcon
-    make
-  become_user: "{{ minecraft_user }}"
-  args:
-    creates: "{{ minecraft_tools_dir }}/mcrcon/mcrcon"
-
-- name: Install MCRCON binary
-  ansible.builtin.copy:
-    src: "{{ minecraft_tools_dir }}/mcrcon/mcrcon"
-    dest: "/usr/local/bin/mcrcon"
-    owner: root
-    group: root
-    mode: '0755'
-    remote_src: true

roles/03-installation-minecraft/tasks/05-compile-spigot.yml

@@ -1,19 +0,0 @@
----
-- name: Compile Spigot with BuildTools
-  ansible.builtin.shell: |
-    cd {{ minecraft_sources_dir }}
-    java -jar BuildTools.jar --rev {{ minecraft_version }}
-  become_user: "{{ minecraft_user }}"
-  args:
-    creates: "{{ minecraft_sources_dir }}/spigot-{{ minecraft_version }}.jar"
-  register: spigot_compilation
-  timeout: 1800
-
-- name: Copy compiled Spigot to server directory
-  ansible.builtin.copy:
-    src: "{{ minecraft_sources_dir }}/spigot-{{ minecraft_version }}.jar"
-    dest: "{{ minecraft_server_dir }}/spigot.jar"
-    owner: "{{ minecraft_user }}"
-    group: "{{ minecraft_group }}"
-    mode: '0644'
-    remote_src: true

roles/03-installation-minecraft/tasks/05-configure-server.yml

@@ -0,0 +1,57 @@
+---
+- name: Create server.properties
+  ansible.builtin.template:
+    src: server.properties.j2
+    dest: "{{ minecraft_server_dir }}/server.properties"
+    owner: "{{ minecraft_user }}"
+    group: "{{ minecraft_group }}"
+    mode: '0644'
+    backup: yes
+
+- name: Accept EULA
+  ansible.builtin.template:
+    src: eula.txt.j2
+    dest: "{{ minecraft_server_dir }}/eula.txt"
+    owner: "{{ minecraft_user }}"
+    group: "{{ minecraft_group }}"
+    mode: '0644'
+
+- name: Create spigot.yml configuration
+  ansible.builtin.template:
+    src: spigot.yml.j2
+    dest: "{{ minecraft_server_dir }}/spigot.yml"
+    owner: "{{ minecraft_user }}"
+    group: "{{ minecraft_group }}"
+    mode: '0644'
+
+- name: Create bukkit.yml configuration
+  ansible.builtin.template:
+    src: bukkit.yml.j2
+    dest: "{{ minecraft_server_dir }}/bukkit.yml"
+    owner: "{{ minecraft_user }}"
+    group: "{{ minecraft_group }}"
+    mode: '0644'
+
+- name: Create start script
+  ansible.builtin.template:
+    src: start.sh.j2
+    dest: "{{ minecraft_base_dir }}/scripts/start.sh"
+    owner: "{{ minecraft_user }}"
+    group: "{{ minecraft_group }}"
+    mode: '0755'
+
+- name: Create stop script
+  ansible.builtin.template:
+    src: stop.sh.j2
+    dest: "{{ minecraft_base_dir }}/scripts/stop.sh"
+    owner: "{{ minecraft_user }}"
+    group: "{{ minecraft_group }}"
+    mode: '0755'
+
+- name: Store current version
+  ansible.builtin.copy:
+    content: "{{ minecraft_version }}"
+    dest: "{{ minecraft_server_dir }}/.version"
+    owner: "{{ minecraft_user }}"
+    group: "{{ minecraft_group }}"
+    mode: '0644'

roles/03-installation-minecraft/tasks/06-configure-minecraft.yml

@@ -1,17 +0,0 @@
----
-- name: Create server.properties
-  ansible.builtin.template:
-    src: server.properties.j2
-    dest: "{{ minecraft_server_dir }}/server.properties"
-    owner: "{{ minecraft_user }}"
-    group: "{{ minecraft_group }}"
-    mode: '0644'
-  notify: "restart minecraft service"
-
-- name: Accept EULA
-  ansible.builtin.copy:
-    content: "eula={{ minecraft_eula | ternary('true', 'false') }}"
-    dest: "{{ minecraft_server_dir }}/eula.txt"
-    owner: "{{ minecraft_user }}"
-    group: "{{ minecraft_group }}"
-    mode: '0644'

roles/03-installation-minecraft/tasks/06-install-mcrcon.yml

@@ -0,0 +1,46 @@
+---
+- name: Check if mcrcon is already installed
+  ansible.builtin.stat:
+    path: "{{ minecraft_tools_dir }}/mcrcon"
+  register: mcrcon_installed
+
+- name: Download mcrcon
+  ansible.builtin.get_url:
+    url: "{{ mcrcon_url }}"
+    dest: "{{ minecraft_tools_dir }}/mcrcon.tar.gz"
+    owner: "{{ minecraft_user }}"
+    group: "{{ minecraft_group }}"
+    mode: '0644'
+  when: not mcrcon_installed.stat.exists
+
+- name: Extract mcrcon
+  ansible.builtin.unarchive:
+    src: "{{ minecraft_tools_dir }}/mcrcon.tar.gz"
+    dest: "{{ minecraft_tools_dir }}"
+    owner: "{{ minecraft_user }}"
+    group: "{{ minecraft_group }}"
+    remote_src: yes
+    creates: "{{ minecraft_tools_dir }}/mcrcon"
+  when: not mcrcon_installed.stat.exists
+
+- name: Make mcrcon executable
+  ansible.builtin.file:
+    path: "{{ minecraft_tools_dir }}/mcrcon"
+    mode: '0755'
+    owner: "{{ minecraft_user }}"
+    group: "{{ minecraft_group }}"
+
+- name: Create mcrcon wrapper script
+  ansible.builtin.copy:
+    content: |
+      #!/bin/bash
+      {{ minecraft_tools_dir }}/mcrcon -H localhost -P {{ rcon_port }} -p "{{ rcon_password }}" "$@"
+    dest: "{{ minecraft_base_dir }}/scripts/rcon.sh"
+    owner: "{{ minecraft_user }}"
+    group: "{{ minecraft_group }}"
+    mode: '0755'
+
+- name: Clean up mcrcon archive
+  ansible.builtin.file:
+    path: "{{ minecraft_tools_dir }}/mcrcon.tar.gz"
+    state: absent

roles/03-installation-minecraft/tasks/07-create-service.yml

@@ -0,0 +1,36 @@
+---
+- name: Create minecraft systemd service
+  ansible.builtin.template:
+    src: minecraft.service.j2
+    dest: "/etc/systemd/system/{{ minecraft_service_name }}"
+    owner: root
+    group: root
+    mode: '0644'
+  notify: 
+    - reload systemd daemon
+    - restart minecraft server
+
+- name: Reload systemd daemon
+  ansible.builtin.systemd:
+    daemon_reload: yes
+
+- name: Enable minecraft service
+  ansible.builtin.systemd:
+    name: "{{ minecraft_service_name }}"
+    enabled: "{{ minecraft_service_enabled }}"
+    masked: no
+
+- name: Start minecraft service
+  ansible.builtin.systemd:
+    name: "{{ minecraft_service_name }}"
+    state: "{{ minecraft_service_state }}"
+  when: minecraft_service_state == "started"
+
+- name: Wait for server to be ready
+  ansible.builtin.wait_for:
+    port: "{{ server_port }}"
+    delay: 10
+    timeout: 120
+    state: started
+    host: 127.0.0.1
+  when: minecraft_service_state == "started"

roles/03-installation-minecraft/tasks/07-setup-systemd-service.yml

@@ -1,17 +0,0 @@
----
-- name: Create Minecraft systemd service
-  ansible.builtin.template:
-    src: minecraft.service.j2
-    dest: /etc/systemd/system/minecraft.service
-    owner: root
-    group: root
-    mode: '0644'
-  notify:
-    - "systemd daemon reload"
-    - "restart minecraft service"
-
-- name: Enable Minecraft service
-  ansible.builtin.systemd:
-    name: minecraft
-    enabled: true
-    daemon_reload: true

roles/03-installation-minecraft/tasks/08-configure-logrotate.yml

@@ -0,0 +1,36 @@
+---
+- name: Configure logrotate for minecraft logs
+  ansible.builtin.template:
+    src: minecraft-logrotate.j2
+    dest: /etc/logrotate.d/minecraft
+    owner: root
+    group: root
+    mode: '0644'
+
+- name: Create rsyslog configuration for minecraft
+  ansible.builtin.copy:
+    content: |
+      # Minecraft Server Logging
+      :programname, isequal, "minecraft" /var/log/minecraft.log
+      & stop
+    dest: /etc/rsyslog.d/30-minecraft.conf
+    owner: root
+    group: root
+    mode: '0644'
+  notify: restart rsyslog service
+
+- name: Create minecraft log file
+  ansible.builtin.file:
+    path: /var/log/minecraft.log
+    state: touch
+    owner: "{{ minecraft_user }}"
+    group: "{{ minecraft_group }}"
+    mode: '0644'
+    modification_time: preserve
+    access_time: preserve
+
+- name: Test logrotate configuration
+  ansible.builtin.command: logrotate -d /etc/logrotate.d/minecraft
+  register: logrotate_test
+  changed_when: false
+  failed_when: logrotate_test.rc != 0

roles/03-installation-minecraft/tasks/08-setup-log-rotation.yml

@@ -1,9 +0,0 @@
----
-- name: Configure log rotation for Minecraft
-  ansible.builtin.template:
-    src: logrotate-minecraft.j2
-    dest: /etc/logrotate.d/minecraft
-    owner: root
-    group: root
-    mode: '0644'
-  notify: "restart log rotation"

roles/03-installation-minecraft/tasks/09-manage-ops.yml

@@ -0,0 +1,32 @@
+---
+- name: Check if ops.json exists
+  ansible.builtin.stat:
+    path: "{{ minecraft_server_dir }}/ops.json"
+  register: ops_file
+
+- name: Create ops.json file
+  ansible.builtin.template:
+    src: ops.json.j2
+    dest: "{{ minecraft_server_dir }}/ops.json"
+    owner: "{{ minecraft_user }}"
+    group: "{{ minecraft_group }}"
+    mode: '0644'
+    backup: yes
+  when: minecraft_ops is defined and minecraft_ops | length > 0
+
+- name: Create empty ops.json if no ops defined
+  ansible.builtin.copy:
+    content: "[]"
+    dest: "{{ minecraft_server_dir }}/ops.json"
+    owner: "{{ minecraft_user }}"
+    group: "{{ minecraft_group }}"
+    mode: '0644'
+    force: no
+  when: not ops_file.stat.exists and (minecraft_ops is not defined or minecraft_ops | length == 0)
+
+- name: Set permissions on ops.json
+  ansible.builtin.file:
+    path: "{{ minecraft_server_dir }}/ops.json"
+    owner: "{{ minecraft_user }}"
+    group: "{{ minecraft_group }}"
+    mode: '0644'

roles/03-installation-minecraft/tasks/09-setup-ops-management.yml

@@ -1,10 +0,0 @@
----
-- name: Create ops.json file
-  ansible.builtin.template:
-    src: ops.json.j2
-    dest: "{{ minecraft_server_dir }}/ops.json"
-    owner: "{{ minecraft_user }}"
-    group: "{{ minecraft_group }}"
-    mode: '0644'
-  when: minecraft_ops is defined and minecraft_ops | length > 0
-  notify: "restart minecraft service"

roles/03-installation-minecraft/tasks/10-install-plugins.yml

@@ -0,0 +1,39 @@
+---
+- name: Create plugins directory
+  ansible.builtin.file:
+    path: "{{ minecraft_server_dir }}/plugins"
+    state: directory
+    owner: "{{ minecraft_user }}"
+    group: "{{ minecraft_group }}"
+    mode: '0755'
+
+- name: Download plugins
+  ansible.builtin.get_url:
+    url: "{{ item.url }}"
+    dest: "{{ minecraft_server_dir }}/plugins/{{ item.name }}.jar"
+    owner: "{{ minecraft_user }}"
+    group: "{{ minecraft_group }}"
+    mode: '0644'
+    timeout: 30
+  loop: "{{ minecraft_plugins_list }}"
+  when: minecraft_plugins_list is defined and minecraft_plugins_list | length > 0
+  ignore_errors: yes
+
+- name: Create plugins config directory
+  ansible.builtin.file:
+    path: "{{ minecraft_server_dir }}/plugins/{{ item.name }}"
+    state: directory
+    owner: "{{ minecraft_user }}"
+    group: "{{ minecraft_group }}"
+    mode: '0755'
+  loop: "{{ minecraft_plugins_list }}"
+  when: minecraft_plugins_list is defined and item.create_config_dir | default(false)
+
+- name: Restart server to load new plugins
+  ansible.builtin.systemd:
+    name: "{{ minecraft_service_name }}"
+    state: restarted
+  when: 
+    - minecraft_plugins_list is defined 
+    - minecraft_plugins_list | length > 0
+    - restart_after_plugins | default(false)

roles/03-installation-minecraft/tasks/10-setup-plugins-directory.yml

@@ -1,23 +0,0 @@
----
-- name: Ensure plugins directory exists with correct permissions
-  ansible.builtin.file:
-    path: "{{ minecraft_plugins_dir }}"
-    state: directory
-    owner: "{{ minecraft_user }}"
-    group: "{{ minecraft_group }}"
-    mode: '0755'
-
-- name: Create plugins management script
-  ansible.builtin.copy:
-    content: |
-      #!/bin/bash
-      # Plugin management script
-      PLUGINS_DIR="{{ minecraft_plugins_dir }}"
-      
-      echo "Minecraft plugins directory: $PLUGINS_DIR"
-      echo "Current plugins:"
-      ls -la "$PLUGINS_DIR"
-    dest: "{{ minecraft_tools_dir }}/manage-plugins.sh"
-    owner: "{{ minecraft_user }}"
-    group: "{{ minecraft_group }}"
-    mode: '0755'

roles/03-installation-minecraft/tasks/main.yml

@@ -1,30 +1,40 @@
 ---
-- name: Include minecraft user creation tasks
-  ansible.builtin.include_tasks: 01-create-minecraft-user.yml
+- name: Include create user and group tasks
+  ansible.builtin.include_tasks: 01-create-user-group.yml
+  tags: ['minecraft-user']
 
-- name: Include directory creation tasks
+- name: Include create directories tasks
   ansible.builtin.include_tasks: 02-create-directories.yml
+  tags: ['minecraft-dirs']
 
-- name: Include Spigot download tasks
+- name: Include download Spigot tasks
   ansible.builtin.include_tasks: 03-download-spigot.yml
+  tags: ['minecraft-download']
 
-- name: Include MCRCON installation tasks
-  ansible.builtin.include_tasks: 04-install-mcrcon.yml
+- name: Include compile Spigot tasks
+  ansible.builtin.include_tasks: 04-compile-spigot.yml
+  tags: ['minecraft-compile']
 
-- name: Include Spigot compilation tasks
-  ansible.builtin.include_tasks: 05-compile-spigot.yml
+- name: Include configure server tasks
+  ansible.builtin.include_tasks: 05-configure-server.yml
+  tags: ['minecraft-config']
 
-- name: Include Minecraft configuration tasks
-  ansible.builtin.include_tasks: 06-configure-minecraft.yml
+- name: Include install mcrcon tasks
+  ansible.builtin.include_tasks: 06-install-mcrcon.yml
+  tags: ['minecraft-mcrcon']
 
-- name: Include systemd service setup tasks
-  ansible.builtin.include_tasks: 07-setup-systemd-service.yml
+- name: Include create service tasks
+  ansible.builtin.include_tasks: 07-create-service.yml
+  tags: ['minecraft-service']
 
-- name: Include log rotation setup tasks
-  ansible.builtin.include_tasks: 08-setup-log-rotation.yml
+- name: Include configure logrotate tasks
+  ansible.builtin.include_tasks: 08-configure-logrotate.yml
+  tags: ['minecraft-logs']
 
-- name: Include ops management setup tasks
-  ansible.builtin.include_tasks: 09-setup-ops-management.yml
+- name: Include manage ops tasks
+  ansible.builtin.include_tasks: 09-manage-ops.yml
+  tags: ['minecraft-ops']
 
-- name: Include plugins directory setup tasks
-  ansible.builtin.include_tasks: 10-setup-plugins-directory.yml
+- name: Include install plugins tasks
+  ansible.builtin.include_tasks: 10-install-plugins.yml
+  tags: ['minecraft-plugins']