test other version

roles/05-update/defaults/main.yml

@@ -1,5 +1,14 @@
 ---
-update_check_interval: daily
-ssh_keys_check_enabled: true
-system_update_check_enabled: true
-spigot_update_check_enabled: true
+# Update configuration
+update_check_ssh_keys: true
+update_check_system: true
+update_check_spigot: true
+
+# Spigot update settings
+spigot_current_version_file: "{{ minecraft_server_dir }}/.version"
+spigot_new_version_dir: "{{ minecraft_base_dir }}/new_version"
+spigot_backup_dir: "{{ minecraft_base_dir }}/version_backups"
+
+# System update settings
+system_update_auto: false
+system_reboot_required_check: true

roles/05-update/handlers/main.yml

@@ -1,7 +1,13 @@
 ---
-- name: reboot if needed
-  reboot:
-    reboot_timeout: 300
-  when: 
-    - ansible_kernel != ansible_kernel_before_update | default(ansible_kernel)
-    - reboot_required | default(false)
+- name: restart minecraft after update
+  ansible.builtin.systemd:
+    name: minecraft
+    state: restarted
+    daemon_reload: true
+  listen: "restart minecraft after version change"
+
+- name: reload ssh after key update
+  ansible.builtin.systemd:
+    name: ssh
+    state: reloaded
+  listen: "reload ssh service"

roles/05-update/tasks/01-check-ssh-keys.yml

@@ -1,14 +0,0 @@
----
-- name: Check for new SSH keys in authorized_keys
-  stat:
-    path: /home/{{ ansible_user }}/.ssh/authorized_keys
-  register: ssh_keys_stat
-
-- name: Update SSH keys if changed
-  authorized_key:
-    user: "{{ ansible_user }}"
-    key: "{{ item }}"
-    state: present
-  loop: "{{ ssh_public_keys | default([]) }}"
-  when: ssh_public_keys is defined
-  tags: ['ssh-keys-update']

roles/05-update/tasks/01-update-ssh-keys.yml

@@ -0,0 +1,16 @@
+---
+- name: Check for new SSH keys to add
+  ansible.posix.authorized_key:
+    user: ansible
+    key: "{{ item.key }}"
+    comment: "{{ item.comment | default('') }}"
+    state: present
+  loop: "{{ admin_users }}"
+  when: admin_users is defined and admin_users | length > 0
+  notify: "reload ssh service"
+  register: ssh_keys_result
+
+- name: Log SSH keys update
+  ansible.builtin.debug:
+    msg: "SSH keys updated for {{ ssh_keys_result.results | selectattr('changed', 'equalto', true) | list | length }} users"
+  when: ssh_keys_result is defined

roles/05-update/tasks/02-check-system-updates.yml

@@ -1,23 +1,41 @@
 ---
-- name: Check for system updates (Debian/Ubuntu)
-  apt:
-    update_cache: yes
-    cache_valid_time: 3600
-  register: apt_cache_update
+- name: Update apt cache
+  ansible.builtin.apt:
+    update_cache: true
   when: ansible_os_family == "Debian"
 
-- name: Check available upgrades
-  shell: apt list --upgradable 2>/dev/null | grep -v WARNING | wc -l
-  register: available_upgrades
+- name: Check for available system updates
+  ansible.builtin.shell: |
+    apt list --upgradable 2>/dev/null | grep -v "Listing..." | wc -l
+  register: available_updates_count
   changed_when: false
   when: ansible_os_family == "Debian"
 
-- name: Apply system updates if available
-  apt:
-    upgrade: yes
-    autoremove: yes
-    autoclean: yes
+- name: Display available updates count
+  ansible.builtin.debug:
+    msg: "{{ available_updates_count.stdout }} system updates available"
+  when: available_updates_count is defined
+
+- name: Apply system updates if auto-update enabled
+  ansible.builtin.apt:
+    upgrade: dist
+    autoremove: true
+    autoclean: true
   when: 
+    - system_update_auto | bool
     - ansible_os_family == "Debian"
-    - available_upgrades.stdout | int > 1
-  notify: reboot if needed
+    - available_updates_count.stdout | int > 0
+  register: system_update_result
+
+- name: Check if reboot is required
+  ansible.builtin.stat:
+    path: /var/run/reboot-required
+  register: reboot_required_file
+  when: system_reboot_required_check | bool
+
+- name: Warn about required reboot
+  ansible.builtin.debug:
+    msg: "ATTENTION: System reboot is required to complete updates"
+  when: 
+    - reboot_required_file is defined
+    - reboot_required_file.stat.exists

roles/05-update/tasks/03-check-spigot-version.yml

@@ -1,26 +1,27 @@
 ---
-- name: Get current Spigot version
-  stat:
-    path: "{{ minecraft_server_dir }}/spigot.jar"
-  register: current_spigot
-
-- name: Check latest Spigot version available
-  uri:
-    url: "https://api.papermc.io/v2/projects/paper/versions"
-    method: GET
-    return_content: yes
-  register: spigot_versions_api
+- name: Check current Spigot version
+  ansible.builtin.slurp:
+    src: "{{ spigot_current_version_file }}"
+  register: current_version_file
   failed_when: false
 
-- name: Parse latest version
-  set_fact:
-    latest_spigot_version: "{{ (spigot_versions_api.json.versions | last) if spigot_versions_api.json is defined else minecraft_version }}"
+- name: Set current version variable
+  ansible.builtin.set_fact:
+    current_spigot_version: "{{ (current_version_file.content | b64decode).strip() }}"
+  when: current_version_file.failed == false
 
-- name: Compare versions
-  set_fact:
-    new_spigot_available: "{{ latest_spigot_version != minecraft_version }}"
-  when: latest_spigot_version is defined
+- name: Set default current version if file doesn't exist
+  ansible.builtin.set_fact:
+    current_spigot_version: "unknown"
+  when: current_version_file.failed == true
+
+- name: Check if new version is available
+  ansible.builtin.set_fact:
+    spigot_update_available: "{{ minecraft_version != current_spigot_version }}"
 
 - name: Display version information
-  debug:
-    msg: "Current: {{ minecraft_version }}, Latest: {{ latest_spigot_version | default('Unknown') }}, Update available: {{ new_spigot_available | default(false) }}"
+  ansible.builtin.debug:
+    msg: 
+      - "Current Spigot version: {{ current_spigot_version }}"
+      - "Target Spigot version: {{ minecraft_version }}"
+      - "Update available: {{ spigot_update_available }}"

roles/05-update/tasks/04-download-new-spigot.yml

@@ -1,16 +1,18 @@
 ---
-- name: Create temporary build directory
-  file:
-    path: "{{ minecraft_sources_dir }}/build_{{ latest_spigot_version }}"
+- name: Create new version directory
+  ansible.builtin.file:
+    path: "{{ spigot_new_version_dir }}"
     state: directory
     owner: "{{ minecraft_user }}"
     group: "{{ minecraft_group }}"
     mode: '0755'
 
 - name: Download BuildTools for new version
-  get_url:
-    url: "{{ spigot_build_tools_url }}"
-    dest: "{{ minecraft_sources_dir }}/build_{{ latest_spigot_version }}/BuildTools.jar"
+  ansible.builtin.get_url:
+    url: "https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar"
+    dest: "{{ spigot_new_version_dir }}/BuildTools.jar"
     owner: "{{ minecraft_user }}"
     group: "{{ minecraft_group }}"
-    mode: '0644'
+    mode: '0644'
+    timeout: 300
+    force: true

roles/05-update/tasks/05-compile-new-spigot.yml

@@ -0,0 +1,17 @@
+---
+- name: Compile new Spigot version
+  ansible.builtin.shell: |
+    cd {{ spigot_new_version_dir }}
+    java -jar BuildTools.jar --rev {{ minecraft_version }}
+  become_user: "{{ minecraft_user }}"
+  register: new_spigot_compilation
+  failed_when: new_spigot_compilation.rc != 0
+  timeout: 1800
+
+- name: Set compilation success flag
+  ansible.builtin.set_fact:
+    spigot_compilation_successful: "{{ new_spigot_compilation.rc == 0 }}"
+
+- name: Display compilation result
+  ansible.builtin.debug:
+    msg: "New Spigot compilation {{ 'successful' if spigot_compilation_successful else 'failed' }}"

roles/05-update/tasks/05-compile-new-version.yml

@@ -1,38 +0,0 @@
----
-- name: Compile new Spigot version
-  shell: |
-    cd {{ minecraft_sources_dir }}/build_{{ latest_spigot_version }}
-    java -jar BuildTools.jar --rev {{ latest_spigot_version }}
-  become_user: "{{ minecraft_user }}"
-  args:
-    creates: "{{ minecraft_sources_dir }}/build_{{ latest_spigot_version }}/spigot-{{ latest_spigot_version }}.jar"
-  register: spigot_compile_result
-
-- name: Set compilation success flag
-  set_fact:
-    new_spigot_compiled: "{{ spigot_compile_result.rc == 0 }}"
-
-- name: Create new server directory
-  file:
-    path: "{{ minecraft_server_dir }}_{{ latest_spigot_version }}"
-    state: directory
-    owner: "{{ minecraft_user }}"
-    group: "{{ minecraft_group }}"
-    mode: '0755'
-  when: new_spigot_compiled
-
-- name: Copy new Spigot jar to new server directory
-  copy:
-    src: "{{ minecraft_sources_dir }}/build_{{ latest_spigot_version }}/spigot-{{ latest_spigot_version }}.jar"
-    dest: "{{ minecraft_server_dir }}_{{ latest_spigot_version }}/spigot.jar"
-    owner: "{{ minecraft_user }}"
-    group: "{{ minecraft_group }}"
-    mode: '0644'
-    remote_src: yes
-  when: new_spigot_compiled
-
-- name: Copy configuration files to new server directory
-  shell: |
-    cp -r {{ minecraft_server_dir }}/* {{ minecraft_server_dir }}_{{ latest_spigot_version }}/
-    chown -R {{ minecraft_user }}:{{ minecraft_group }} {{ minecraft_server_dir }}_{{ latest_spigot_version }}
-  when: new_spigot_compiled

roles/05-update/tasks/06-configure-new-version.yml

@@ -0,0 +1 @@
+06-configure-new-version.yml

roles/05-update/tasks/06-switch-versions.yml

@@ -1,29 +0,0 @@
----
-- name: Stop Minecraft service
-  systemd:
-    name: minecraft
-    state: stopped
-
-- name: Create version switch script
-  template:
-    src: version-switch.sh.j2
-    dest: "{{ minecraft_tools_dir }}/version-switch.sh"
-    owner: "{{ minecraft_user }}"
-    group: "{{ minecraft_group }}"
-    mode: '0755'
-
-- name: Execute version switch
-  shell: "{{ minecraft_tools_dir }}/version-switch.sh {{ minecraft_version }} {{ latest_spigot_version }}"
-  become_user: "{{ minecraft_user }}"
-  register: version_switch_result
-
-- name: Update minecraft_version variable
-  set_fact:
-    minecraft_version: "{{ latest_spigot_version }}"
-  when: version_switch_result.rc == 0
-
-- name: Start Minecraft service
-  systemd:
-    name: minecraft
-    state: started
-  when: version_switch_result.rc == 0

roles/05-update/tasks/07-cleanup.yml

@@ -1,13 +0,0 @@
----
-- name: Clean up old build directories
-  file:
-    path: "{{ minecraft_sources_dir }}/build_{{ item }}"
-    state: absent
-  loop: "{{ old_versions | default([]) }}"
-
-- name: Clean up old server directories
-  file:
-    path: "{{ minecraft_server_dir }}_{{ item }}"
-    state: absent
-  loop: "{{ old_versions | default([]) }}"
-  when: cleanup_old_versions | default(true)

roles/05-update/tasks/07-switch-versions.yml

@@ -0,0 +1,83 @@
+---
+- name: Create version backup directory
+  ansible.builtin.file:
+    path: "{{ spigot_backup_dir }}"
+    state: directory
+    owner: "{{ minecraft_user }}"
+    group: "{{ minecraft_group }}"
+    mode: '0755'
+
+- name: Stop Minecraft server
+  ansible.builtin.systemd:
+    name: minecraft
+    state: stopped
+
+- name: Backup current version
+  ansible.builtin.shell: |
+    BACKUP_NAME="version_backup_$(date +%Y%m%d_%H%M%S)"
+    mkdir -p "{{ spigot_backup_dir }}/$BACKUP_NAME"
+    cp -r "{{ minecraft_server_dir }}"/* "{{ spigot_backup_dir }}/$BACKUP_NAME/"
+  become_user: "{{ minecraft_user }}"
+
+- name: Copy world data to new version
+  ansible.builtin.shell: |
+    if [ -d "{{ minecraft_server_dir }}/world" ]; then
+        cp -r "{{ minecraft_server_dir }}/world" "{{ spigot_new_version_dir }}/"
+    fi
+    if [ -d "{{ minecraft_server_dir }}/world_nether" ]; then
+        cp -r "{{ minecraft_server_dir }}/world_nether" "{{ spigot_new_version_dir }}/"
+    fi
+    if [ -d "{{ minecraft_server_dir }}/world_the_end" ]; then
+        cp -r "{{ minecraft_server_dir }}/world_the_end" "{{ spigot_new_version_dir }}/"
+    fi
+    if [ -d "{{ minecraft_server_dir }}/plugins" ]; then
+        cp -r "{{ minecraft_server_dir }}/plugins" "{{ spigot_new_version_dir }}/"
+    fi
+  become_user: "{{ minecraft_user }}"
+
+- name: Replace server directory with new version
+  ansible.builtin.shell: |
+    rm -rf "{{ minecraft_server_dir }}.old"
+    mv "{{ minecraft_server_dir }}" "{{ minecraft_server_dir }}.old"
+    mv "{{ spigot_new_version_dir }}" "{{ minecraft_server_dir }}"
+  become_user: "{{ minecraft_user }}"
+
+- name: Update version file
+  ansible.builtin.copy:
+    content: "{{ minecraft_version }}"
+    dest: "{{ spigot_current_version_file }}"
+    owner: "{{ minecraft_user }}"
+    group: "{{ minecraft_group }}"
+    mode: '0644'
+
+- name: Start Minecraft server with new version
+  ansible.builtin.systemd:
+    name: minecraft
+    state: started
+  notify: "restart minecraft after version change"
+
+- name: Wait for server to start
+  ansible.builtin.wait_for:
+    port: "{{ minecraft_port }}"
+    delay: 30
+    timeout: 300
+
+- name: Verify server is running new version
+  ansible.builtin.shell: |
+    sleep 10
+    /usr/local/bin/mcrcon -H 127.0.0.1 -P {{ rcon_port }} -p "{{ rcon_password }}" "version"
+  register: version_check
+  failed_when: false
+
+- name: Display version switch result
+  ansible.builtin.debug:
+    msg: 
+      - "Version switch completed successfully"
+      - "Server response: {{ version_check.stdout | default('No response') }}"
+      - "Old version backed up to: {{ minecraft_server_dir }}.old"
+
+- name: Clean up old version after successful switch
+  ansible.builtin.file:
+    path: "{{ minecraft_server_dir }}.old"
+    state: absent
+  when: version_check.rc == 0

roles/05-update/tasks/main.yml

@@ -1,34 +1,46 @@
 ---
-- name: Include SSH keys check tasks
-  include_tasks: 01-check-ssh-keys.yml
-  when: ssh_keys_check_enabled
-  tags: ['update', 'ssh-keys']
+- name: Include SSH keys update tasks
+  ansible.builtin.include_tasks: 01-update-ssh-keys.yml
+  when: update_check_ssh_keys | bool
 
 - name: Include system updates check tasks
-  include_tasks: 02-check-system-updates.yml
-  when: system_update_check_enabled
-  tags: ['update', 'system']
+  ansible.builtin.include_tasks: 02-check-system-updates.yml
+  when: update_check_system | bool
 
 - name: Include Spigot version check tasks
-  include_tasks: 03-check-spigot-version.yml
-  when: spigot_update_check_enabled
-  tags: ['update', 'spigot']
+  ansible.builtin.include_tasks: 03-check-spigot-version.yml
+  when: update_check_spigot | bool
 
 - name: Include new Spigot download tasks
-  include_tasks: 04-download-new-spigot.yml
-  when: new_spigot_available | default(false)
-  tags: ['update', 'download']
+  ansible.builtin.include_tasks: 04-download-new-spigot.yml
+  when: 
+    - update_check_spigot | bool
+    - spigot_update_available is defined
+    - spigot_update_available | bool
 
-- name: Include new version compilation tasks
-  include_tasks: 05-compile-new-version.yml
-  when: new_spigot_available | default(false)
-  tags: ['update', 'compile']
+- name: Include new Spigot compilation tasks
+  ansible.builtin.include_tasks: 05-compile-new-spigot.yml
+  when: 
+    - update_check_spigot | bool
+    - spigot_update_available is defined
+    - spigot_update_available | bool
 
-- name: Include version switch tasks
-  include_tasks: 06-switch-versions.yml
-  when: new_spigot_compiled | default(false)
-  tags: ['update', 'switch']
+- name: Include new version configuration tasks
+  ansible.builtin.include_tasks: 06-configure-new-version.yml
+  when: 
+    - update_check_spigot | bool
+    - spigot_update_available is defined
+    - spigot_update_available | bool
+    - spigot_compilation_successful is defined
+    - spigot_compilation_successful | bool
 
-- name: Include cleanup tasks
-  include_tasks: 07-cleanup.yml
-  tags: ['update', 'cleanup']
+- name: Include version switching tasks
+  ansible.builtin.include_tasks: 07-switch-versions.yml
+  when: 
+    - update_check_spigot | bool
+    - spigot_update_available is defined
+    - spigot_update_available | bool
+    - spigot_compilation_successful is defined
+    - spigot_compilation_successful | bool
+    - spigot_configuration_successful is defined
+    - spigot_configuration_successful | bool

roles/05-update/vars/main.yml

@@ -0,0 +1,18 @@
+---
+# Internal update variables
+update_scripts:
+  - check-updates.sh
+  - apply-updates.sh
+
+spigot_version_pattern: "spigot-(.*?)\\.jar"
+
+system_packages_to_update:
+  - openjdk-17-jdk
+  - git
+  - build-essential
+  - rsync
+  - fail2ban
+  - ufw
+
+# Backup retention for version backups
+version_backup_retention_days: 30