From fe7be78bc9a051c6f2b248ae0023c96050396a88 Mon Sep 17 00:00:00 2001
From: L3D <l3d@c3woc.de>
Date: Tue, 25 May 2021 10:28:58 +0200
Subject: [PATCH] update ansible version

---
 tasks/main.yml                  | 18 ++++++++++++------
 tasks/manual_install_websvn.yml |  6 +++---
 tasks/packages.yml              |  4 ++--
 tasks/pear_setup.yml            |  4 ++--
 tasks/user.yml                  |  4 ++--
 vars/main.yml                   |  2 +-
 6 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index c186e8e..d639381 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,22 +1,28 @@
 ---
-- include_tasks: versioncheck.yml
+- name: optional versionscheck
+  ansible.builtin.include_tasks: versioncheck.yml
   when: submodules_versioncheck|bool
 
-- include_tasks: packages.yml
+- name: install websvn packages
+  ansible.builtin.include_tasks: packages.yml
   when: websvn__manage_packages | bool
 
-- include_tasks: user.yml
+- name: websvn users
+  ansible.builtin.include_tasks: user.yml
   when: websvn__adduser | bool
 
-- include_tasks: pear_setup.yml
+- name: setup php pear stuff
+  ansible.builtin.include_tasks: pear_setup.yml
   when: not websvn__skip_peap | bool
+
 - name: install websvn
   become: true
-  package:
+  ansible.builtin.package:
     name: "{{ websvn__packages }}"
     state: "{{ websvn__state }}"
   register: websvn
   ignore_errors: true
 
-- include_tasks: manual_install_websvn.yml
+- name: install websvn manually
+  ansible.builtin.include_tasks: manual_install_websvn.yml
   when: websvn.failed | bool
diff --git a/tasks/manual_install_websvn.yml b/tasks/manual_install_websvn.yml
index 94c5fdf..1bdb042 100644
--- a/tasks/manual_install_websvn.yml
+++ b/tasks/manual_install_websvn.yml
@@ -1,7 +1,7 @@
 ---
 - name: make sure /var/www exist
   become: true
-  file:
+  ansible.builtin.file:
     path: /var/www
     recurse: yes
     state: directory
@@ -11,14 +11,14 @@
 - name: clone websvn
   become: true
   become_user: "{{ websvn__web_user }}"
-  git:
+  ansible.builtin.git:
     repo: https://github.com/websvnphp/websvn.git
     dest: /var/www/websvn
     version: "{{ websvn__version }}"
 
 - name: copy config template
   become: true
-  template:
+  ansible.builtin.template:
     src: "{{ websvn__config_src }}"
     dest: "/var/www/websvn/include/config.php"
     backup: true
diff --git a/tasks/packages.yml b/tasks/packages.yml
index 263967c..9f3831c 100644
--- a/tasks/packages.yml
+++ b/tasks/packages.yml
@@ -1,13 +1,13 @@
 ---
 - name: install required packages for websvn
   become: true
-  package:
+  ansible.builtin.package:
     name: "{{ websvn__required_packages }}"
     state: "{{ websvn__state }}"
 
 - name: install optional OS dependencis (primary for testing)
   become: true
-  package:
+  ansible.builtin.package:
     name: "{{ websvn__optional_packages }}"
     state: "{{ websvn__state }}"
   when: websvn__install_optional_packages | bool
diff --git a/tasks/pear_setup.yml b/tasks/pear_setup.yml
index a0faa01..7deb519 100644
--- a/tasks/pear_setup.yml
+++ b/tasks/pear_setup.yml
@@ -1,14 +1,14 @@
 ---
 - name: add pear channel '{{ websvn__pear_channel }}'
   become: true
-  command: "pear channel-discover {{ websvn__pear_channel }}"
+  ansible.builtin.command: "pear channel-discover {{ websvn__pear_channel }}"
   register: command_result
   changed_when: command_result.rc == 0
   failed_when: false
 
 - name: Install pear packages
   become: true
-  pear:
+  community.general.pear:
     name: "{{ item }}"
     state: "{{ websvn__state }}"
   with_items: "{{ websvn__pear_packages }}"
diff --git a/tasks/user.yml b/tasks/user.yml
index c422d0a..94cd454 100644
--- a/tasks/user.yml
+++ b/tasks/user.yml
@@ -1,13 +1,13 @@
 ---
 - name: "add group {{ websvn__web_group }}"
   become: true
-  group:
+  ansible.builtin.group:
     name: "{{ websvn__web_group }}"
     state: present
 
 - name: "add user {{ websvn__web_user }}"
   become: true
-  user:
+  ansible.builtin.user:
     name: "{{ websvn__web_user }}"
     group: "{{ websvn__web_group }}"
     append: true
diff --git a/vars/main.yml b/vars/main.yml
index ce3b879..5b4a964 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -13,6 +13,6 @@ websvn__packages:
 
 
 # versionscheck
-playbook_version_number: 15  # should be over ninethousand
+playbook_version_number: 16  # should be over ninethousand
 playbook_version_path: 'role-websvn_roles-ansible_github.com.version'