Skip to content

Commit

Permalink
Merge pull request #825 from roots/remove-db-import
Browse files Browse the repository at this point in the history
Remove db_import option
  • Loading branch information
swalkinshaw authored Apr 9, 2017
2 parents c7ad193 + dd4cc70 commit dd4e728
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 19 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
### HEAD
* Remove potentially dangerous `db_import` option ([#825](https://github.com/roots/trellis/pull/825))

### 1.0.0-rc.1: April 7th, 2017
* Add vault_wordpress_sites validation ([#823](https://github.com/roots/trellis/pull/823))
* Use dynamic HostKeyAlgorithms SSH option for unknown hosts ([#798](https://github.com/roots/trellis/pull/798))
Expand Down
19 changes: 0 additions & 19 deletions roles/wordpress-setup/tasks/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,3 @@
login_password: "{{ mysql_root_password }}"
with_dict: "{{ wordpress_sites }}"
when: site_uses_local_db and item.value.db_create | default(True)

- name: Copy database dump
copy:
src: "{{ item.value.db_import }}"
dest: /tmp
with_dict: "{{ wordpress_sites }}"
when: item.value.db_import | default(False)

- name: Import database
mysql_db:
name: "{{ site_env.db_name }}"
state: import
target: "/tmp/{{ item.value.db_import | basename }}"
login_host: "{{ site_env.db_host }}"
login_user: "{{ site_env.db_user }}"
login_password: "{{ site_env.db_password }}"
with_dict: "{{ wordpress_sites }}"
when: item.value.db_import | default(False)
notify: reload nginx

0 comments on commit dd4e728

Please sign in to comment.