check new version

roles/05-update/defaults/main.yml

@@ -1,14 +1,6 @@
 ---
-# 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
+spigot_update_dir: "{{ minecraft_sources_dir }}/update"
+spigot_previous_dir: "{{ minecraft_sources_dir }}/previous"

roles/05-update/handlers/main.yml

@@ -1,13 +1,13 @@
 ---
-- name: restart minecraft after update
+- name: restart services
   ansible.builtin.systemd:
-    name: minecraft
+    name: "{{ item }}"
     state: restarted
-    daemon_reload: true
-  listen: "restart minecraft after version change"
+  loop:
+    - minecraft
+    - ssh
+  listen: restart updated services
 
-- name: reload ssh after key update
-  ansible.builtin.systemd:
-    name: ssh
-    state: reloaded
-  listen: "reload ssh service"
+- name: switch minecraft version
+  ansible.builtin.command: "{{ minecraft_base_dir }}/switch_version.sh"
+  listen: switch to new version

roles/05-update/meta/main.yml

@@ -0,0 +1,30 @@
+---
+galaxy_info:
+  author: Tips-Of-Mine
+  description: Système de mise à jour automatique pour Minecraft et le système
+  company: Tips-Of-Mine
+  license: MIT
+  min_ansible_version: "2.14"
+  platforms:
+    - name: Debian
+      versions:
+        - buster
+        - bullseye
+        - bookworm
+        - trixie
+    - name: Ubuntu
+      versions:
+        - focal
+        - jammy
+        - noble
+  galaxy_tags:
+    - update
+    - maintenance
+    - minecraft
+    - automation
+
+dependencies:
+  - role: 02-installation-java
+    when: java_update_required | default(false)
+  - role: 03-Installation-Minecraft
+    when: minecraft_update_required | default(false)

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

@@ -0,0 +1,21 @@
+---
+- name: Check for new SSH keys in repository
+  ansible.builtin.set_fact:
+    ssh_keys_to_add: "{{ admin_ssh_keys | default([]) }}"
+
+- name: Get current authorized keys
+  ansible.builtin.slurp:
+    src: /home/ansible/.ssh/authorized_keys
+  register: current_keys
+  ignore_errors: yes
+
+- name: Add new SSH keys if found
+  ansible.posix.authorized_key:
+    user: ansible
+    state: present
+    key: "{{ item.key }}"
+    comment: "{{ item.name }}"
+  loop: "{{ ssh_keys_to_add }}"
+  when: 
+    - ssh_keys_to_add | length > 0
+    - item.key not in (current_keys.content | b64decode | default(''))

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

@@ -1,16 +0,0 @@
----
-- 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,41 +1,26 @@
 ---
 - name: Update apt cache
   ansible.builtin.apt:
-    update_cache: true
+    update_cache: yes
+    cache_valid_time: 3600
   when: ansible_os_family == "Debian"
 
-- name: Check for available system updates
-  ansible.builtin.shell: |
-    apt list --upgradable 2>/dev/null | grep -v "Listing..." | wc -l
-  register: available_updates_count
+- name: Check for available updates
+  ansible.builtin.command: apt list --upgradable
+  register: apt_updates
   changed_when: false
   when: ansible_os_family == "Debian"
 
-- name: Display available updates count
+- name: Display available updates
   ansible.builtin.debug:
-    msg: "{{ available_updates_count.stdout }} system updates available"
-  when: available_updates_count is defined
+    msg: "Available updates: {{ apt_updates.stdout_lines | length - 1 }} packages"
+  when: apt_updates is defined
 
-- name: Apply system updates if auto-update enabled
+- name: Perform system update if requested
   ansible.builtin.apt:
-    upgrade: dist
-    autoremove: true
-    autoclean: true
+    upgrade: safe
+    autoremove: yes
+    autoclean: yes
   when: 
-    - system_update_auto | bool
     - ansible_os_family == "Debian"
-    - 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
+    - perform_system_update | default(false)

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

@@ -1,27 +1,30 @@
 ---
-- name: Check current Spigot version
+- name: Get current Spigot version
   ansible.builtin.slurp:
-    src: "{{ spigot_current_version_file }}"
-  register: current_version_file
-  failed_when: false
+    src: "{{ current_version_file }}"
+  register: current_version
+  ignore_errors: yes
 
-- name: Set current version variable
+- name: Set current version fact
   ansible.builtin.set_fact:
-    current_spigot_version: "{{ (current_version_file.content | b64decode).strip() }}"
-  when: current_version_file.failed == false
+    current_spigot_version: "{{ (current_version.content | b64decode).strip() if current_version is succeeded else 'unknown' }}"
 
-- name: Set default current version if file doesn't exist
+- name: Check latest Spigot version
+  ansible.builtin.uri:
+    url: "https://hub.spigotmc.org/versions/{{ minecraft_version }}.json"
+    method: GET
+    return_content: yes
+  register: latest_version_info
+  ignore_errors: yes
+
+- name: Compare versions
   ansible.builtin.set_fact:
-    current_spigot_version: "unknown"
-  when: current_version_file.failed == true
+    spigot_needs_update: "{{ current_spigot_version != minecraft_version }}"
+  when: latest_version_info is succeeded
 
-- name: Check if new version is available
-  ansible.builtin.set_fact:
-    spigot_update_available: "{{ minecraft_version != current_spigot_version }}"
-
-- name: Display version information
+- name: Display version status
   ansible.builtin.debug:
     msg: 
-      - "Current Spigot version: {{ current_spigot_version }}"
-      - "Target Spigot version: {{ minecraft_version }}"
-      - "Update available: {{ spigot_update_available }}"
+      - "Current version: {{ current_spigot_version }}"
+      - "Target version: {{ minecraft_version }}"
+      - "Update needed: {{ spigot_needs_update | default(false) }}"

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

@@ -1,18 +0,0 @@
----
-- 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
-  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'
-    timeout: 300
-    force: true

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

@@ -0,0 +1,22 @@
+---
+- name: Create update directory
+  ansible.builtin.file:
+    path: "{{ spigot_update_dir }}"
+    state: directory
+    owner: "{{ minecraft_user }}"
+    group: "{{ minecraft_group }}"
+    mode: '0755'
+
+- name: Download latest BuildTools
+  ansible.builtin.get_url:
+    url: "{{ minecraft_build_tools_url }}"
+    dest: "{{ spigot_update_dir }}/BuildTools.jar"
+    owner: "{{ minecraft_user }}"
+    group: "{{ minecraft_group }}"
+    mode: '0644'
+    force: yes
+
+- name: Clean update directory
+  ansible.builtin.file:
+    path: "{{ spigot_update_dir }}/work"
+    state: absent

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

@@ -1,17 +0,0 @@
----
-- 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

@@ -0,0 +1,25 @@
+---
+- name: Compile new Spigot version
+  ansible.builtin.command:
+    cmd: "java -jar BuildTools.jar --rev {{ minecraft_version }}"
+    chdir: "{{ spigot_update_dir }}"
+  become_user: "{{ minecraft_user }}"
+  register: compile_result
+
+- name: Verify compilation success
+  ansible.builtin.stat:
+    path: "{{ spigot_update_dir }}/spigot-{{ minecraft_version }}.jar"
+  register: new_jar
+
+- name: Set update ready flag
+  ansible.builtin.set_fact:
+    spigot_update_ready: "{{ new_jar.stat.exists }}"
+
+- name: Create staging directory
+  ansible.builtin.file:
+    path: "{{ update_staging_dir }}"
+    state: directory
+    owner: "{{ minecraft_user }}"
+    group: "{{ minecraft_group }}"
+    mode: '0755'
+  when: spigot_update_ready

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

@@ -1 +1,27 @@
-06-configure-new-version.yml
+---
+- name: Copy new jar to staging
+  ansible.builtin.copy:
+    src: "{{ spigot_update_dir }}/spigot-{{ minecraft_version }}.jar"
+    dest: "{{ update_staging_dir }}/spigot-{{ minecraft_version }}.jar"
+    owner: "{{ minecraft_user }}"
+    group: "{{ minecraft_group }}"
+    mode: '0644'
+    remote_src: yes
+
+- name: Copy current configuration to staging
+  ansible.builtin.synchronize:
+    src: "{{ minecraft_server_dir }}/"
+    dest: "{{ update_staging_dir }}/"
+    rsync_opts:
+      - "--exclude=*.jar"
+      - "--exclude=world*"
+      - "--exclude=logs"
+      - "--exclude=crash-reports"
+  delegate_to: "{{ inventory_hostname }}"
+
+- name: Update jar reference in staging
+  ansible.builtin.replace:
+    path: "{{ update_staging_dir }}/start.sh"
+    regexp: 'spigot-.*\.jar'
+    replace: 'spigot-{{ minecraft_version }}.jar'
+  when: spigot_update_ready

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

@@ -1,8 +1,8 @@
 ---
-- name: Create version backup directory
-  ansible.builtin.file:
-    path: "{{ spigot_backup_dir }}"
-    state: directory
+- name: Create version switch script
+  ansible.builtin.template:
+    src: version-switch.sh.j2
+    dest: "{{ minecraft_base_dir }}/switch_version.sh"
     owner: "{{ minecraft_user }}"
     group: "{{ minecraft_group }}"
     mode: '0755'
@@ -13,39 +13,22 @@
     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/"
+  ansible.builtin.command:
+    cmd: |
+      tar -czf {{ spigot_previous_dir }}/backup_$(date +%Y%m%d_%H%M%S).tar.gz \
+        -C {{ minecraft_server_dir }} .
   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 }}"
+- name: Switch to new version
+  ansible.builtin.command:
+    cmd: "{{ minecraft_base_dir }}/switch_version.sh"
   become_user: "{{ minecraft_user }}"
+  register: switch_result
 
 - name: Update version file
   ansible.builtin.copy:
     content: "{{ minecraft_version }}"
-    dest: "{{ spigot_current_version_file }}"
+    dest: "{{ current_version_file }}"
     owner: "{{ minecraft_user }}"
     group: "{{ minecraft_group }}"
     mode: '0644'
@@ -54,30 +37,13 @@
   ansible.builtin.systemd:
     name: minecraft
     state: started
-  notify: "restart minecraft after version change"
 
-- name: Wait for server to start
+- name: Verify server is running
   ansible.builtin.wait_for:
-    port: "{{ minecraft_port }}"
-    delay: 30
-    timeout: 300
+    port: "{{ server_port }}"
+    timeout: 60
+    state: started
 
-- 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
+- name: Display update 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
+    msg: "Successfully updated to Spigot {{ minecraft_version }}"

roles/05-update/tasks/main.yml

@@ -1,46 +1,28 @@
 ---
-- name: Include SSH keys update tasks
-  ansible.builtin.include_tasks: 01-update-ssh-keys.yml
-  when: update_check_ssh_keys | bool
+- name: Include check SSH keys tasks
+  ansible.builtin.include_tasks: 01-check-ssh-keys.yml
+  when: update_check_ssh_keys
 
-- name: Include system updates check tasks
+- name: Include check system updates tasks
   ansible.builtin.include_tasks: 02-check-system-updates.yml
-  when: update_check_system | bool
+  when: update_check_system
 
-- name: Include Spigot version check tasks
+- name: Include check Spigot version tasks
   ansible.builtin.include_tasks: 03-check-spigot-version.yml
-  when: update_check_spigot | bool
+  when: update_check_spigot
 
-- name: Include new Spigot download tasks
-  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 download new version tasks
+  ansible.builtin.include_tasks: 04-download-new-version.yml
+  when: spigot_needs_update | default(false)
 
-- 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 compile new version tasks
+  ansible.builtin.include_tasks: 05-compile-new-version.yml
+  when: spigot_needs_update | default(false)
 
-- name: Include new version configuration tasks
+- name: Include configure new version 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
+  when: spigot_needs_update | default(false)
 
-- name: Include version switching tasks
+- name: Include switch versions 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
+  when: spigot_update_ready | default(false)

roles/05-update/templates/version-switch.sh.j2

@@ -1,18 +1,36 @@
 #!/bin/bash
+# {{ ansible_managed }}
 
-OLD_VERSION="$1"
-NEW_VERSION="$2"
+STAGING_DIR="{{ update_staging_dir }}"
 SERVER_DIR="{{ minecraft_server_dir }}"
-BACKUP_DIR="{{ minecraft_backups_dir }}/version_backup"
+PREVIOUS_DIR="{{ spigot_previous_dir }}"
+DATE=$(date +%Y%m%d_%H%M%S)
 
-# Create backup directory
-mkdir -p "${BACKUP_DIR}"
+# Create previous directory if not exists
+mkdir -p "$PREVIOUS_DIR"
 
-# Backup current version
-mv "${SERVER_DIR}" "${BACKUP_DIR}/server_${OLD_VERSION}_$(date +%Y%m%d_%H%M%S)"
+# Backup current server
+echo "Backing up current server..."
+tar -czf "$PREVIOUS_DIR/server_before_update_$DATE.tar.gz" \
+    -C "$SERVER_DIR" \
+    --exclude='world*' \
+    --exclude='logs' \
+    --exclude='crash-reports' \
+    .
 
-# Switch to new version
-mv "${SERVER_DIR}_${NEW_VERSION}" "${SERVER_DIR}"
+# Sync new version to server directory
+echo "Switching to new version..."
+rsync -av --delete \
+    --exclude='world*' \
+    --exclude='logs' \
+    --exclude='crash-reports' \
+    --exclude='plugins/*.yml' \
+    --exclude='ops.json' \
+    --exclude='whitelist.json' \
+    --exclude='banned-*.json' \
+    "$STAGING_DIR/" "$SERVER_DIR/"
 
-echo "Version switched from ${OLD_VERSION} to ${NEW_VERSION}"
-exit 0
+# Set permissions
+chown -R {{ minecraft_user }}:{{ minecraft_group }} "$SERVER_DIR"
+
+echo "Version switch completed!"

roles/05-update/vars/main.yml

@@ -1,18 +1,4 @@
 ---
-# 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
+spigot_version_url: "https://hub.spigotmc.org/versions/latest.json"
+current_version_file: "{{ minecraft_server_dir }}/.version"
+update_staging_dir: "{{ minecraft_sources_dir }}/staging"