From 0e97dd86c89142469da28e7144d0256704217fb5 Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@geeklabor.de>
Date: Wed, 20 May 2020 09:45:21 +0200
Subject: [PATCH] remove version handling

---
 defaults/main.yml                             |  6 ++--
 tasks/setup.yml                               | 34 +++++++++----------
 templates/etc/systemd/system/minio.service.j2 |  2 +-
 vars/main.yml                                 |  5 +--
 4 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 12f6562..ad0faa1 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,5 +1,6 @@
 ---
-minio_version: 2020-05-06T23-23-25Z
+minio_server_version: latest
+minio_client_version: latest
 
 minio_user: "minio"
 minio_user_home: "/home/{{ minio_user }}"
@@ -9,9 +10,8 @@ minio_extra_groups: []
 minio_packages: []
 
 minio_base_dir: /opt/minio
-minio_bin_dir: /opt/minio/bin
 minio_data_dirs:
-  - /opt/minio/data
+  - "{{ minio_base_dir }}/data"
 
 minio_bind_ip: 127.0.0.1
 minio_bind_port: 61000
diff --git a/tasks/setup.yml b/tasks/setup.yml
index 75b54ad..f829f9f 100644
--- a/tasks/setup.yml
+++ b/tasks/setup.yml
@@ -9,30 +9,28 @@
   become: True
   become_user: root
 
-- name: Prepare folder structure
-  file:
-    path: "{{ item }}"
-    state: directory
-  loop: "{{ __minio_dirs + minio_data_dirs }}"
-  become: True
-  become_user: "{{ minio_user }}"
-
 - block:
+    - name: Prepare folder structure
+      file:
+        path: "{{ item }}"
+        state: directory
+      loop: "{{ minio_data_dirs }}"
+
     - name: Download Minio binary
       get_url:
-        url: "https://dl.min.io/server/minio/release/linux-amd64/archive/minio.RELEASE.{{ minio_version }}"
-        dest: "{{ minio_bin_dir }}/minio.{{ minio_version }}"
+        url: "{{ __minio_server_source }}{{ '/archive/minio.RELEASE.' + minio_server_version if minio_server_version != 'latest' else '/minio' }}"
+        dest: "{{ minio_base_dir }}/minio"
         mode: 0750
-
-    - name: Link Version {{ minio_version }} to latest
-      file:
-        src: "{{ minio_bin_dir }}/minio.{{ minio_version }}"
-        dest: "{{ minio_base_dir }}/minio-latest"
-        state: link
-      notify: __minio_restart
   become: True
   become_user: "{{ minio_user }}"
-  when: not minio_installed.stat.exists or ((minio_version | to_datetime('%Y-%m-%dT%H-%M-%SZ') - minio_current.stdout | to_datetime('%Y-%m-%dT%H-%M-%SZ')).total_seconds() / 3600) | int > 0
+
+- name: Download Minio client
+  get_url:
+    url: "{{ __minio_client_source }}{{ '/' + minio_client_version if minio_client_version != 'latest' else '/mc' }}"
+    dest: "/usr/local/bin/mc"
+    mode: 0755
+  become: True
+  become_user: root
 
 - block:
     - name: Copy sysconfig file
diff --git a/templates/etc/systemd/system/minio.service.j2 b/templates/etc/systemd/system/minio.service.j2
index a855100..d0edd83 100644
--- a/templates/etc/systemd/system/minio.service.j2
+++ b/templates/etc/systemd/system/minio.service.j2
@@ -20,7 +20,7 @@ Group={{ minio_group }}
 PermissionsStartOnly=true
 EnvironmentFile={{ __minio_sysconfig }}
 ExecStartPre=/bin/bash -c "[ -n \"${MINIO_VOLUMES}\" ] || echo \"Variable MINIO_VOLUMES not set in {{ __minio_sysconfig }}\""
-ExecStart={{ minio_base_dir }}/minio-latest server $MINIO_OPTS $MINIO_VOLUMES
+ExecStart={{ minio_base_dir }}/minio server $MINIO_OPTS $MINIO_VOLUMES
 
 Restart=always
 
diff --git a/vars/main.yml b/vars/main.yml
index 5bf0eec..391c537 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,4 +1,5 @@
 ---
+__minio_server_source: "https://dl.min.io/server/minio/release/linux-amd64"
+__minio_client_source: "https://dl.minio.io/client/mc/release/linux-amd64"
+
 __minio_sysconfig: /etc/sysconfig/minio
-__minio_dirs:
-  - "{{ minio_bin_dir }}"