From 2e53b1a248c14c3cf93c15dfa2f6844199801abf Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Fri, 27 Oct 2017 12:32:07 -0500 Subject: [PATCH] mysql --- roles/3-base-server/tasks/main.yml | 8 +++++--- roles/elgg/meta/main.yml | 3 --- roles/mysql/tasks/main.yml | 1 - roles/nextcloud/meta/main.yml | 3 --- roles/owncloud/meta/main.yml | 3 --- roles/rachel/meta/main.yml | 4 ---- roles/wordpress/meta/main.yml | 3 --- 7 files changed, 5 insertions(+), 20 deletions(-) delete mode 100644 roles/elgg/meta/main.yml delete mode 100644 roles/nextcloud/meta/main.yml delete mode 100644 roles/owncloud/meta/main.yml delete mode 100644 roles/rachel/meta/main.yml delete mode 100644 roles/wordpress/meta/main.yml diff --git a/roles/3-base-server/tasks/main.yml b/roles/3-base-server/tasks/main.yml index 279322513..26d4af235 100644 --- a/roles/3-base-server/tasks/main.yml +++ b/roles/3-base-server/tasks/main.yml @@ -15,13 +15,15 @@ # has no "when: XXXXX_install" flag tags: base, iiab-admin +- name: MYSQL + include_role: + name: mysql + tags: base, mysql + - name: Make sure there is a content directory file: dest={{ doc_root }}/local_content state=directory -- name: Base Server Installed - command: echo Base Server Installed - - name: Restart httpd service: name={{ apache_service }} state=restarted diff --git a/roles/elgg/meta/main.yml b/roles/elgg/meta/main.yml deleted file mode 100644 index 94e49405f..000000000 --- a/roles/elgg/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dependencies: - - { role: mysql } diff --git a/roles/mysql/tasks/main.yml b/roles/mysql/tasks/main.yml index e4819172a..1ff6a2920 100644 --- a/roles/mysql/tasks/main.yml +++ b/roles/mysql/tasks/main.yml @@ -105,7 +105,6 @@ state=stopped when: not mysql_enabled - - name: Add mysql to service list ini_file: dest='{{ service_filelist }}' section=mysql diff --git a/roles/nextcloud/meta/main.yml b/roles/nextcloud/meta/main.yml deleted file mode 100644 index 94e49405f..000000000 --- a/roles/nextcloud/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dependencies: - - { role: mysql } diff --git a/roles/owncloud/meta/main.yml b/roles/owncloud/meta/main.yml deleted file mode 100644 index 94e49405f..000000000 --- a/roles/owncloud/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dependencies: - - { role: mysql } diff --git a/roles/rachel/meta/main.yml b/roles/rachel/meta/main.yml deleted file mode 100644 index 09f9b4e28..000000000 --- a/roles/rachel/meta/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -allow_duplicates: yes -dependencies: - - { role: mysql, mysql_enabled: True } diff --git a/roles/wordpress/meta/main.yml b/roles/wordpress/meta/main.yml deleted file mode 100644 index 94e49405f..000000000 --- a/roles/wordpress/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dependencies: - - { role: mysql }