Skip to content

Commit

Permalink
Merge pull request #37 from migibert/lint
Browse files Browse the repository at this point in the history
Linting
  • Loading branch information
migibert authored Oct 23, 2019
2 parents 6007c38 + e592a71 commit 5dc5826
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 38 deletions.
10 changes: 7 additions & 3 deletions meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 5 additions & 2 deletions tasks/configure-Debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand All @@ -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
4 changes: 2 additions & 2 deletions tasks/configure-RedHat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
51 changes: 27 additions & 24 deletions tasks/install.yml
Original file line number Diff line number Diff line change
@@ -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"
14 changes: 7 additions & 7 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 5dc5826

Please sign in to comment.