Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
t2d authored Apr 14, 2023
2 parents 967db2e + 5e5936d commit 6eb8ff1
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 5 deletions.
4 changes: 2 additions & 2 deletions handlers/main.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
---
- name: Import database
mysql_db:
community.mysql.mysql_db:
name: "{{ roundcube_mysql_db }}"
state: import
target: "{{ roundcube_path }}/SQL/mysql.initial.sql"
login_unix_socket: /run/mysqld/mysqld.sock

- name: Update database for getmail
mysql_db:
community.mysql.mysql_db:
name: "{{ roundcube_mysql_db }}"
state: import
target: "{{ roundcube_path }}/plugins/getmail/drivers/database/SQL/mysql.initial.sql"
Expand Down
5 changes: 5 additions & 0 deletions requirements.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---

collections:
- ansible.posix
- community.mysql
6 changes: 4 additions & 2 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
install_recommends: False

- name: Ensure database user is present
mysql_user:
community.mysql.mysql_user:
name: "{{ roundcube_mysql_user }}"
password: "{{ roundcube_mysql_password }}"
priv: "{{ roundcube_mysql_db }}.*:ALL,GRANT"
state: present
login_unix_socket: /run/mysqld/mysqld.sock

- name: Ensure database is present
mysql_db:
community.mysql.mysql_db:
name: "{{ roundcube_mysql_db }}"
state: present
encoding: "utf8"
Expand All @@ -42,6 +42,7 @@
get_url:
url: "https://github.com/roundcube/roundcubemail/releases/download/{{ roundcube_version }}/roundcubemail-{{ roundcube_version }}-complete.tar.gz"
dest: "{{ roundcube_user_home }}"
mode: '0440'
when: not ansible_check_mode
register: download

Expand Down Expand Up @@ -80,6 +81,7 @@

- name: Run roundcube upgrade script
command: "{{ roundcube_path }}/bin/update.sh"
changed_when: true
when:
- link.changed
- not testing|default(False)
Expand Down
2 changes: 1 addition & 1 deletion tasks/skin.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---

- name: Create custom skin dir for elastic skin
synchronize:
ansible.posix.synchronize:
src: "{{ roundcube_skin }}"
dest: "{{ roundcube_path }}/skins/"
owner: false
Expand Down

0 comments on commit 6eb8ff1

Please sign in to comment.