From bd788e8a5c3c43e9ad50708872702587420b88b2 Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@geeklabor.de>
Date: Sun, 27 Oct 2019 16:17:08 +0100
Subject: [PATCH] remove postgres integration

---
 defaults/main.yml                | 40 ++++++--------------------------
 molecule/default/playbook.yml    | 12 +++++-----
 tasks/prepare.yml                | 37 -----------------------------
 templates/custom/conf/app.ini.j2 | 12 +++++-----
 4 files changed, 19 insertions(+), 82 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 753d848..4568935 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -26,40 +26,14 @@ gitea_run_mode: prod
 gitea_landing_page: explore
 gitea_disable_registration: "true"
 
-gitea_postgres_enabled: False
-gitea_postgres_ssl_mode: disabled
-gitea_postgres_server: "{{ inventory_hostname }}"
-gitea_postgres_port: 5432
-gitea_postgres_superuser: postgres
-gitea_postgres_password: postgres
+gitea_db_type: pgsql
+gitea_db_server: "{{ inventory_hostname }}"
+gitea_db_port: 5432
+gitea_db_name: gitea
+gitea_db_user: pggitea
+gitea_db_password: secret
 
-gitea_postgres_db:
-  name: gitea
-  lc_collate: en_US.UTF-8
-  lc_ctype: en_US.UTF-8'
-  encoding: UTF-8
-  template: template0
-  login_host: localhost
-  login_user: "{{ gitea_postgres_superuser }}"
-  login_password: "{{ gitea_postgres_password }}"
-  # login_unix_socket: # defaults to not set
-  port: "{{ gitea_postgres_port }}"
-  # owner: # defaults to not set
-  state: present
-
-gitea_postgres_user:
-  name: pggitea
-  password: gitea
-  encrypted: 'yes'
-  # priv: # defaults to not set
-  # role_attr_flags: # defaults to not set
-  db: "{{ gitea_postgres_db.name }}"
-  login_host: localhost
-  login_user: "{{ gitea_postgres_superuser }}"
-  login_password: "{{ gitea_postgres_password }}"
-  # login_unix_socket: # defaults to not set
-  port: "{{ gitea_postgres_port }}"
-  state: present
+gitea_db_ssl_mode: disabled
 
 gitea_iptables_enabled: False
 gitea_open_ports:
diff --git a/molecule/default/playbook.yml b/molecule/default/playbook.yml
index 352bbe7..5e2e30f 100644
--- a/molecule/default/playbook.yml
+++ b/molecule/default/playbook.yml
@@ -4,12 +4,12 @@
   vars:
     postgres_repository_enabled: True
     postgres_users:
-      - name: "postgres"
-        password: "postgres"
-        role_attr_flags: SUPERUSER
-        login_host: localhost
-        state: present
-        pam_user: True
+      - name: "pggitea"
+        password: "secure"
+        priv: ALL
+        db: "gitea"
+    postgres_dbs:
+      - name: "gitea"
 
   roles:
     - role: xoxys.postgres
diff --git a/tasks/prepare.yml b/tasks/prepare.yml
index e277586..da124a9 100644
--- a/tasks/prepare.yml
+++ b/tasks/prepare.yml
@@ -32,40 +32,3 @@
         - "{{ gitea_packages }}"
   become: True
   become_user: root
-
-- block:
-    - name: Setup postgres db '{{ gitea_postgres_db.name }}'
-      postgresql_db:
-        name: "{{ gitea_postgres_db.name }}"
-        lc_collate: "{{ gitea_postgres_db.lc_collate | default('en_US.UTF-8') }}"
-        lc_ctype: "{{ gitea_postgres_db.lc_ctype | default('en_US.UTF-8') }}"
-        encoding: "{{ gitea_postgres_db.encoding | default('UTF-8') }}"
-        template: "{{ gitea_postgres_db.template | default('template0') }}"
-        login_host: "{{ gitea_postgres_db.login_host | default('localhost') }}"
-        login_password: "{{ gitea_postgres_db.login_password | default(omit) }}"
-        login_user: "{{ gitea_postgres_db.login_user | default(postgresql_user) }}"
-        login_unix_socket: "{{ gitea_postgres_db.login_unix_socket | default(omit) }}"
-        port: "{{ gitea_postgres_db.port | default(omit) }}"
-        owner: "{{ gitea_postgres_db.owner | default(omit) }}"
-        state: "{{ gitea_postgres_db.state | default('present') }}"
-      no_log: True
-      when: gitea_postgres_db is defined
-
-    - name: Setup postgres user '{{ gitea_postgres_user.name }}'
-      postgresql_user:
-        name: "{{ gitea_postgres_user.name }}"
-        password: "{{ 'md5' + (gitea_postgres_user.password + gitea_postgres_user.name) | hash('md5') }}"
-        encrypted: "{{ gitea_postgres_user.encrypted | default('yes') }}"
-        priv: "{{ gitea_postgres_user.priv | default(omit) }}"
-        role_attr_flags: "{{ gitea_postgres_user.role_attr_flags | default(omit) }}"
-        db: "{{ gitea_postgres_user.db | default(omit) }}"
-        login_host: "{{ gitea_postgres_user.login_host | default('localhost') }}"
-        login_password: "{{ gitea_postgres_user.login_password | default(omit) }}"
-        login_user: "{{ gitea_postgres_user.login_user | default(omit) }}"
-        login_unix_socket: "{{ gitea_postgres_user.login_unix_socket | default(omit) }}"
-        port: "{{ gitea_postgres_user.port | default(omit) }}"
-        state: "{{ gitea_postgres_user.state | default('present') }}"
-      no_log: True
-      when: gitea_postgres_user is defined
-  delegate_to: "{{ gitea_postgres_server }}"
-  when: gitea_postgres_enabled | bool 
diff --git a/templates/custom/conf/app.ini.j2 b/templates/custom/conf/app.ini.j2
index c347745..f57541e 100644
--- a/templates/custom/conf/app.ini.j2
+++ b/templates/custom/conf/app.ini.j2
@@ -95,13 +95,13 @@ ECDSA   = 256
 RSA     = 2048
 
 [database]
-{% if gitea_postgres_enabled %}
+{% if gitea_db_type == "pgsql" %}
 DB_TYPE             = postgres
-HOST                = {{ gitea_postgres_server }}:{{ gitea_postgres_port }}
-NAME                = {{ gitea_postgres_db.name }}
-USER                = {{ gitea_postgres_user.name }}
-PASSWD              = {{ gitea_postgres_user.password }}
-SSL_MODE            = {{ gitea_postgres_ssl_mode }}
+HOST                = {{ gitea_db_server }}:{{ gitea_db_port }}
+NAME                = {{ gitea_db_name }}
+USER                = {{ gitea_db_user }}
+PASSWD              = {{ gitea_db_password }}
+SSL_MODE            = {{ gitea_db_ssl_mode }}
 {% else %}
 DB_TYPE             = sqlite3
 PATH                = {{ gitea_data_dir }}/gitea.db