From e592a716d920076d7b71ba5300933c0e5c4c3342 Mon Sep 17 00:00:00 2001
From: Mikael Gibert <mikael@teemo.co>
Date: Wed, 23 Oct 2019 11:30:45 +0200
Subject: [PATCH] Linting

---
 meta/main.yml              | 10 +++++---
 tasks/configure-Debian.yml |  7 ++++--
 tasks/configure-RedHat.yml |  4 +--
 tasks/install.yml          | 51 ++++++++++++++++++++------------------
 tasks/main.yml             | 14 +++++------
 5 files changed, 48 insertions(+), 38 deletions(-)

diff --git a/meta/main.yml b/meta/main.yml
index 6bcf92a..85733d1 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -7,10 +7,14 @@ galaxy_info:
   platforms:
     - name: EL
       versions:
-        - 7
+      - all
     - name: Ubuntu
       versions:
       - all
-  categories:
+    - name: Debian
+      versions:
+      - all
+  galaxy_tags:
     - database
-    - database:nosql
+    - nosql
+    - graph
diff --git a/tasks/configure-Debian.yml b/tasks/configure-Debian.yml
index b9f8bda..7c5ea7c 100644
--- a/tasks/configure-Debian.yml
+++ b/tasks/configure-Debian.yml
@@ -13,7 +13,7 @@
     dest: /etc/systemd/system/orientdb.service
     owner: root
     group: root
-    mode: 400
+    mode: 0400
   register: orientdb_systemd_unit
   when: ansible_facts.service_mgr == 'systemd'
 
@@ -29,4 +29,7 @@
     name: orientdb
     state: restarted
     enabled: yes
-  when: (orientdb_sysvinit_unit is defined and orientdb_sysvinit_unit is changed) or (orientdb_systemd_unit and orientdb_systemd_unit is changed) or orientdb_force_install == True
+  when: >
+    (orientdb_sysvinit_unit is defined and orientdb_sysvinit_unit is changed) or
+    (orientdb_systemd_unit and orientdb_systemd_unit is changed) or
+    orientdb_force_install
diff --git a/tasks/configure-RedHat.yml b/tasks/configure-RedHat.yml
index 3c095d7..97e0823 100644
--- a/tasks/configure-RedHat.yml
+++ b/tasks/configure-RedHat.yml
@@ -4,7 +4,7 @@
     dest: /etc/systemd/system/orientdb.service
     owner: root
     group: root
-    mode: 400
+    mode: 0400
   register: orientdb_service_unit
 
 - name: Start service
@@ -13,4 +13,4 @@
     state: restarted
     enabled: yes
     daemon_reload: yes
-  when: orientdb_service_unit is changed or orientdb_force_install == True
+  when: orientdb_service_unit is changed or orientdb_force_install
diff --git a/tasks/install.yml b/tasks/install.yml
index 27589db..dda0d93 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -1,65 +1,68 @@
 - name: Download OrientDB tarball
   get_url:
-    url: "{{orientdb_url}}"
-    dest: "/tmp/orientdb-{{orientdb_version}}.tar.gz"
+    url: "{{ orientdb_url }}"
+    dest: "/tmp/orientdb-{{ orientdb_version }}.tar.gz"
 
-- stat:
-    path: "{{orientdb_path}}"
+- name: Register orientdb_dir stat
+  stat:
+    path: "{{ orientdb_path }}"
   register: stat_orientdb_dir
 
-- stat:
-    path: "{{orientdb_path}}/bin"
+- name: Register binary directory stat
+  stat:
+    path: "{{ orientdb_path }}/bin"
   register: stat_orientdb_bin_path
 
-- stat:
-    path: "{{orientdb_path}}/config"
+- name: Register config directory stat
+  stat:
+    path: "{{ orientdb_path }}/config"
   register: stat_orientdb_config_path
 
 - name: Unarchive OrientDB tarball
   unarchive:
     copy: no
-    src: "/tmp/orientdb-{{orientdb_version}}.tar.gz"
-    dest: "{{orientdb_dir}}"
+    src: "/tmp/orientdb-{{ orientdb_version }}.tar.gz"
+    dest: "{{ orientdb_dir }}"
   when: >
-    orientdb_force_install == True or
-    stat_orientdb_dir.stat.exists == False or
-    stat_orientdb_bin_path.stat.exists == False or
-    stat_orientdb_config_path.stat.exists == False
+    orientdb_force_install or
+    not stat_orientdb_dir.stat.exists or
+    not stat_orientdb_bin_path.stat.exists or
+    not stat_orientdb_config_path.stat.exists
 
 - name: Make orientdb_user owns directory #Issue 234 with unarchive owner attribute
   file:
-    path: "{{orientdb_path}}"
-    owner: "{{orientdb_user}}"
-    group: "{{orientdb_group}}"
+    path: "{{ orientdb_path }}"
+    owner: "{{ orientdb_user }}"
+    group: "{{ orientdb_group }}"
     state: directory
     recurse: yes
-
 - name: Configure orientdb launch script
+
   template:
     src: orientdb-server.sh.j2
-    dest: "{{orientdb_path}}/bin/orientdb.sh"
+    dest: "{{ orientdb_path }}/bin/orientdb.sh"
 
 - name: Configure orientdb server
   template:
     src: orientdb-server-config.xml.j2
-    dest: "{{orientdb_path}}/config/orientdb-server-config.xml"
+    dest: "{{ orientdb_path }}/config/orientdb-server-config.xml"
 
 - name: Configure orientdb logger
   template:
     src: orientdb-server-log.properties.j2
-    dest: "{{orientdb_path}}/config/orientdb-server-log.properties"
+    dest: "{{ orientdb_path }}/config/orientdb-server-log.properties"
 
 - name: Configure distributed DB
   template:
     src: default-distributed-db-config.j2
-    dest: "{{orientdb_path}}/config/default-distributed-db-config.json"
+    dest: "{{ orientdb_path }}/config/default-distributed-db-config.json"
 
 - name: Configure hazelcast
   template:
     src: hazelcast.xml.j2
-    dest: "{{orientdb_path}}/config/hazelcast.xml"
+    dest: "{{ orientdb_path }}/config/hazelcast.xml"
 
 - name: Configure automatic backup
   template:
     src: automatic-backup.json.j2
-    dest: "{{orientdb_path}}/config/automatic-backup.json"
+    dest: "{{ orientdb_path }}/config/automatic-backup.json"
diff --git a/tasks/main.yml b/tasks/main.yml
index 0642022..fdfd0f2 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -6,21 +6,21 @@
 
 - name: Create orientdb group
   group:
-    name: "{{orientdb_group}}"
+    name: "{{ orientdb_group }}"
     state: present
 
 - name: Create orientdb user
   user:
-    name: "{{orientdb_user}}"
-    password: "{{orientdb_user_password}}"
-    group: "{{orientdb_group}}"
+    name: "{{ orientdb_user }}"
+    password: "{{ orientdb_user_password }}"
+    group: "{{ orientdb_group }}"
 
 - name: Create log directory
   file:
-    path: "{{orientdb_log_dir}}"
+    path: "{{ orientdb_log_dir }}"
     state: directory
-    owner: "{{orientdb_user}}"
-    group: "{{orientdb_group}}"
+    owner: "{{ orientdb_user }}"
+    group: "{{ orientdb_group }}"
 
 - include: install.yml