Merge pull request #472 from jvonau/DB

Db - avoids MySQL & PostgreSQL Install-A-Thon

Closes #368

roles/3-base-server/tasks/main.yml

@@ -15,13 +15,16 @@
   # has no "when: XXXXX_install" flag
   tags: base, iiab-admin
 
+- name: MYSQL
+  include_role:
+    name: mysql
+  # has no "when: XXXXX_install" flag
+  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

roles/4-server-options/tasks/main.yml

@@ -27,6 +27,12 @@
   # has no "when: XXXXX_install" flag
   tags: base, homepage
 
+- name: POSTGRESQL
+  include_role:
+    name: postgresql
+  when: postgresql_install
+  tags: postgresql, pathagar, moodle
+
 - name: AUTHSERVER
   include_role:
     name: authserver

roles/elgg/meta/main.yml

@@ -1,3 +0,0 @@
----
-dependencies:
-    - { role: mysql }

roles/moodle/meta/main.yml

@@ -1,3 +0,0 @@
----
-dependencies:
-    - { role: postgresql }

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

roles/nextcloud/meta/main.yml

@@ -1,3 +0,0 @@
----
-dependencies:
-    - { role: mysql }

roles/owncloud/meta/main.yml

@@ -1,3 +0,0 @@
----
-dependencies:
-    - { role: mysql }

roles/pathagar/meta/main.yml

@@ -1,3 +0,0 @@
----
-dependencies:
-    - { role: postgresql }

roles/rachel/meta/main.yml

@@ -1,4 +0,0 @@
----
-allow_duplicates: yes
-dependencies:
-    - { role: mysql, mysql_enabled: True }

roles/wordpress/meta/main.yml

@@ -1,3 +0,0 @@
----
-dependencies:
-    - { role: mysql }