Skip to content

Commit

Permalink
Cosmetic changes (#69)
Browse files Browse the repository at this point in the history
* Remove downgrade docker step

* Remove run actions on push

* Add scheduled job

* Refactor ci.yml

* Change job name to release

* Update galaxy-action version

* Add git_branch parameter

* Add new distributions

* Remove old distributions

* Add new molecule scenarios

* Change rabbitmq's parameter name

* Remove idempotence test

* Refactoring molecule files

* Add wait task

* Remove unnecessary options

* Lint

* Add retries and delay

* Add workaround for Rockylinux

* Remove nginx from prepare.yml

* Remove redhat from vars

* Add unified variables for redhat

* Add RedHat.yml file

* Remove become statements from Debian.yml

* Remove become statements from RedHat_post.yml

* Remove become statements from ssl.yml

* Add become statements

* Remove old redhat tasks

* Refactor main.yml

* Remove become statements from handlers

* Format files

* Update example playbook

* Lint main.yml

* Add epel installation

* Add onlyoffice gpg key

* Rename variable

* Refactor RedHat.yml

* Add nginx gpg key

* Installation of xorg-x11-server-Xvfb for RedHat7

* Add condition for installation from repository

* Add msttcore fonts package

* Revert "Add msttcore fonts package"

This reverts commit 9e6a7bc.

* Add condition

* Update variable nginx_package

* Remove unused variables

* Move post install tasks into RedHat.yml

* Revert "Move post install tasks into RedHat.yml"

This reverts commit f3b0bc4.

* Revert "Remove old redhat tasks"

This reverts commit be11af4.

* Revert "Add RedHat.yml file"

This reverts commit 8bcfcf1.

* Revert "Remove redhat from vars"

This reverts commit 7b75b39.

* Revert "Add unified variables for redhat"

This reverts commit d4f23b8.

* Update include_vars and include_tasks

* Revert include variables and tasks
  • Loading branch information
xRTRx authored Nov 23, 2023
1 parent f3ca1d3 commit e59e0b3
Show file tree
Hide file tree
Showing 12 changed files with 254 additions and 283 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ The values in the `local.json` file can be redefined. To do this, you need to ov
## Example Playbook

- hosts: all

become: true
vars:
postgresql_global_config_options:
- option: listen_addresses
Expand Down Expand Up @@ -159,7 +159,7 @@ The values in the `local.json` file can be redefined. To do this, you need to ov
password: "{{ db_server_pass }}"

rabbitmq_users:
- name: "{{ rabbitmq_server_user }}"
- user: "{{ rabbitmq_server_user }}"
password: "{{ rabbitmq_server_pass }}"
vhost: "{{ rabbitmq_server_vpath }}"
configure_priv: .*
Expand Down
1 change: 1 addition & 0 deletions defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
db_server_host: localhost
db_server_name: onlyoffice
db_server_user: onlyoffice
Expand Down
25 changes: 12 additions & 13 deletions handlers/main.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
- name: Restart-ds
ansible.builtin.systemd:
name: "{{ item }}"
state: restarted
with_items:
- 'ds-converter'
- 'ds-docservice'
become: yes
---
- name: Restart-ds
ansible.builtin.systemd:
name: "{{ item }}"
state: restarted
with_items:
- "ds-converter"
- "ds-docservice"

- name: Restart-nginx
ansible.builtin.service:
name: "nginx"
state: restarted
become: yes
- name: Restart-nginx
ansible.builtin.service:
name: "nginx"
state: restarted
18 changes: 9 additions & 9 deletions meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ galaxy_info:
platforms:
- name: EL
versions:
- "7"
- "8"
- "9"
- "7"
- "8"
- "9"
- name: Ubuntu
versions:
- "trusty"
- "xenial"
- "bionic"
- "trusty"
- "xenial"
- "bionic"
- name: Debian
versions:
- "bullseye"
- "jessie"
- "stretch"
- "bullseye"
- "jessie"
- "stretch"
galaxy_tags:
- application
- cloud
Expand Down
1 change: 1 addition & 0 deletions molecule/default/converge.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
- name: Converge
hosts: all
become: true
vars:
postgresql_global_config_options:
- option: listen_addresses
Expand Down
6 changes: 3 additions & 3 deletions molecule/default/requirements.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
roles:
- src: geerlingguy.redis
- src: geerlingguy.postgresql
- src: onlyoffice.rabbitmq
- src: geerlingguy.redis
- src: geerlingguy.postgresql
- src: onlyoffice.rabbitmq
Loading

0 comments on commit e59e0b3

Please sign in to comment.