From 3356b070658ffccdd60b471bd85ec04bc384642e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= <jakub@status.im>
Date: Tue, 29 Sep 2020 22:38:42 +0200
Subject: [PATCH] install s3cmd from apt
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jakub Sokołowski <jakub@status.im>
---
 defaults/main.yml   |  7 -------
 tasks/install.yml   | 10 ++++++++++
 tasks/main.yml      |  2 +-
 tasks/s3cmd.yml     | 30 ------------------------------
 templates/backup.sh |  2 +-
 5 files changed, 12 insertions(+), 39 deletions(-)
 create mode 100644 tasks/install.yml
 delete mode 100644 tasks/s3cmd.yml

diff --git a/defaults/main.yml b/defaults/main.yml
index 44bfbd0..0ae04e7 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,11 +1,4 @@
 ---
-# tool for uploading to s3 compatible backends
-s3cmd_version: '2.1.0'
-s3cmd_name: 's3cmd-{{ s3cmd_version }}'
-s3cmd_archive: '{{ s3cmd_name }}.tar.gz'
-s3cmd_checksum: 'md5:2637f1b36f5d9db4f60af3b18eb34958'
-s3cmd_url: 'https://github.com/s3tools/s3cmd/releases/download/v{{ s3cmd_version }}/{{ s3cmd_archive }}'
-
 backup_name: 'default'
 backup_directory: ~
 backup_script_dir: '/var/lib/backups'
diff --git a/tasks/install.yml b/tasks/install.yml
new file mode 100644
index 0000000..c1625fd
--- /dev/null
+++ b/tasks/install.yml
@@ -0,0 +1,10 @@
+---
+- name: Install s3cmd tool
+  apt:
+    name: s3cmd
+
+- name: Create s3cmd config
+  template:
+    src: s3cfg.j2
+    dest: /root/.s3cfg
+    mode: 0400
diff --git a/tasks/main.yml b/tasks/main.yml
index 5e3f7ea..23f7b2a 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,4 +1,4 @@
 ---
-- include_tasks: s3cmd.yml
+- include_tasks: install.yml
 - include_tasks: script.yml
 - include_tasks: timer.yml
diff --git a/tasks/s3cmd.yml b/tasks/s3cmd.yml
deleted file mode 100644
index b7c2de8..0000000
--- a/tasks/s3cmd.yml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-- name: Check if s3cmd is installed
-  stat:
-    path: /usr/local/bin/s3cmd
-  register: s3cmd
-
-- name: Download s3cmd archive
-  get_url:
-    url: '{{ s3cmd_url }}'
-    dest: /tmp
-  when: not s3cmd.stat.exists
-
-- name: Extract s3cmd archive
-  unarchive:
-    src: '/tmp/{{ s3cmd_archive }}'
-    dest: /tmp
-    remote_src: yes
-  when: not s3cmd.stat.exists
-
-- name: Install s3cmd
-  command: python setup.py install
-  args:
-    chdir: '/tmp/{{ s3cmd_name }}'
-  when: not s3cmd.stat.exists
-
-- name: Create s3cmd config
-  template:
-    src: s3cfg.j2
-    dest: /root/.s3cfg
-    mode: 0400
diff --git a/templates/backup.sh b/templates/backup.sh
index 39d17c6..c667483 100644
--- a/templates/backup.sh
+++ b/templates/backup.sh
@@ -8,5 +8,5 @@ ARCHIVES=$(ls -Art ${BACKUPS_DIR} | tail -n ${BACKUPS_NUM})
 
 for ARCHIVE in ${ARCHIVES}; do
     echo "Uploading: ${ARCHIVE} >> ${BUCKET_NAME}"
-    /usr/local/bin/s3cmd put "${BACKUPS_DIR}/${ARCHIVE}" "${BUCKET_NAME}"
+    /usr/bin/s3cmd put "${BACKUPS_DIR}/${ARCHIVE}" "${BUCKET_NAME}"
 done