From 370c3c630089c86386bf56f1e25308792f381ef6 Mon Sep 17 00:00:00 2001
From: Kris Lamoureux <KrisPublicEmail@gmail.com>
Date: Mon, 20 Jan 2020 22:27:13 -0500
Subject: [PATCH] Replaced Postgres with MariaDB for Nextcloud role

---
 roles/nextcloud/tasks/main.yml | 35 ++++++++++++----------------------
 roles/timetrex/tasks/main.yml  |  5 +++++
 roles/wordpress/tasks/main.yml | 10 ++++++----
 3 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml
index 9df4620..b1d7121 100644
--- a/roles/nextcloud/tasks/main.yml
+++ b/roles/nextcloud/tasks/main.yml
@@ -1,4 +1,4 @@
-# Copyright (C) 2019  Free I.T. Athens
+# Copyright (C) 2019-2020  Free I.T. Athens
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -12,34 +12,24 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-# psycopg2 is required for database tasks
-- name: Install PostgreSQL Support for Python
-  apt: name=python-psycopg2 state=present
-
-- name: Install PostgreSQL
-  apt: name=postgresql state=present
+- name: Install MySQL Support for Python
+  apt:
+    name: python-pymysql
+    state: present
 
 - name: Create Database
-  postgresql_db:
+  mysql_db:
     name: "{{ nc_db_name }}"
     state: present
-  become_user: postgres
+    login_unix_socket: /var/run/mysqld/mysqld.sock
 
 - name: Create Database User
-  postgresql_user:
-    user: "{{ nc_db_user }}"
+  mysql_user:
+    name: "{{ nc_db_user }}"
     password: "{{ nc_db_pass }}"
-    db: "{{ nc_db_name }}"
+    priv: "{{ nc_db_name }}.*:ALL,GRANT"
     state: present
-  become_user: postgres
-
-- name: Add Database User Permissions
-  postgresql_privs:
-    db: "{{ nc_db_name }}"
-    role: "{{ nc_db_user }}"
-    objs: ALL_IN_SCHEMA
-    privs: SELECT,INSERT,UPDATE,DELETE
-  become_user: postgres
+    login_unix_socket: /var/run/mysqld/mysqld.sock
 
 - name: Install PHP Modules
   apt:
@@ -100,7 +90,7 @@
 
 - name: Install Nextcloud
   command: |
-    php occ maintenance:install --database pgsql \
+    php occ maintenance:install --database mysql \
     --database-name {{ nc_db_name }} --database-host {{ nc_db_host }} \
     --database-user {{ nc_db_user }} --database-pass {{ nc_db_pass }} \
     --admin-user {{ nc_admin }} --admin-pass {{ nc_admin_pass }} \
@@ -131,4 +121,3 @@
   args:
     creates: /etc/apache2/sites-enabled/{{ nc_domain }}.conf
   notify: Reload Apache2
-
diff --git a/roles/timetrex/tasks/main.yml b/roles/timetrex/tasks/main.yml
index 18198cc..117b822 100644
--- a/roles/timetrex/tasks/main.yml
+++ b/roles/timetrex/tasks/main.yml
@@ -1,3 +1,8 @@
+- name: Install PostgreSQL Support for Python
+  apt:
+    name: python-psycopg2
+    state: present
+
 - name: Install PostgreSQL
   apt:
     name: postgresql
diff --git a/roles/wordpress/tasks/main.yml b/roles/wordpress/tasks/main.yml
index e6d4258..1c9bce6 100644
--- a/roles/wordpress/tasks/main.yml
+++ b/roles/wordpress/tasks/main.yml
@@ -15,16 +15,18 @@
 
 # PyMySQL or MySQL-python is required for database tasks
 - name: Install MySQL Support for Python
-  apt: name=python-pymysql state=present
+  apt:
+    name: python-pymysql
+    state: present
 
 - name: Create Database
-  mysql_db: 
+  mysql_db:
     name: "{{ wp_db_name }}"
     state: present
     login_unix_socket: /var/run/mysqld/mysqld.sock
 
 - name: Create Database User
-  mysql_user: 
+  mysql_user:
     name: "{{ wp_db_user }}"
     password: "{{ wp_db_pass }}"
     priv: "{{ wp_db_name }}.*:ALL,GRANT"
@@ -57,7 +59,7 @@
     remote_src: yes
 
 - name: Generate Keys and Salts
-  get_url: 
+  get_url:
     url: https://api.wordpress.org/secret-key/1.1/salt/
     dest: "{{ wp_dir }}/salts.txt"