From 64633aaf2c35f8635657d4252d1168d7e99ca2e3 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Thu, 2 Apr 2015 20:10:04 +0200
Subject: [PATCH] Let's try using the postgresql_server group for pagure

---
 .../host_vars/pagure-stg01.fedoraproject.org  |  6 ++
 playbooks/groups/pagure.yml                   |  1 +
 roles/pagure/tasks/main.yml                   | 77 -------------------
 3 files changed, 7 insertions(+), 77 deletions(-)

diff --git a/inventory/host_vars/pagure-stg01.fedoraproject.org b/inventory/host_vars/pagure-stg01.fedoraproject.org
index cedfb7625e..e42a39b201 100644
--- a/inventory/host_vars/pagure-stg01.fedoraproject.org
+++ b/inventory/host_vars/pagure-stg01.fedoraproject.org
@@ -14,3 +14,9 @@ postfix_group: vpn
 
 vmhost: osuosl02.fedoraproject.org
 datacenter: osuosl
+
+#
+# PostgreSQL configuration
+#
+
+shared_buffers: "32MB"
diff --git a/playbooks/groups/pagure.yml b/playbooks/groups/pagure.yml
index 1a5fb51d8d..477fbf2b8f 100644
--- a/playbooks/groups/pagure.yml
+++ b/playbooks/groups/pagure.yml
@@ -33,6 +33,7 @@
   - sudo
   - collectd/base
   - openvpn/client
+  - postgresql_server
   - git/server
 
   tasks:
diff --git a/roles/pagure/tasks/main.yml b/roles/pagure/tasks/main.yml
index 268d3164d3..5207b505be 100644
--- a/roles/pagure/tasks/main.yml
+++ b/roles/pagure/tasks/main.yml
@@ -88,83 +88,6 @@
   - pagure
 
 
-# Set-up PostgresQL
-
-- name: install needed packages
-  yum: pkg=postgresql-server state=present
-  tags:
-  - pagure
-  - postgresql
-  - packages
-
-- name: Initialize postgres if necessary
-  command: /usr/bin/postgresql-setup initdb
-           creates=/var/lib/pgsql/data
-  notify:
-  - restart postgresql
-  tags:
-  - postgresql
-  - pagure
-
-- name: Set postgresql-server to run on boot
-  service: name=postgresql enabled=yes
-  ignore_errors: true
-  notify:
-  - restart postgresql
-  tags:
-  - service
-  - postgresql
-  - pagure
-
-- name: Ensure postgres has a place to backup to
-  file: dest=/backups state=directory owner=postgres
-  tags:
-  - postgresql
-  - pagure
-
-- name: Copy over backup scriplet
-  copy: src=backup-database dest=/usr/local/bin/backup-database mode=0755
-  tags:
-  - postgresql
-  - pagure
-
-- name: Set up some cronjobs to backup databases as configured
-  template: >
-    src=cron-backup-database
-    dest=/etc/cron.d/cron-backup-database-{{ item }}
-  with_items:
-  - anitya
-  tags:
-  - cron
-  - postgresql
-  - pagure
-
-- name: Add our postgres config file.
-  copy: >
-    src={{ item }}
-    dest=/var/lib/pgsql/data/{{ item }}
-    owner=postgres
-  with_items:
-  - pg_hba.conf
-  notify:
-  - restart postgresql
-  tags:
-  - config
-  - postgresql
-  - pagure
-
-- name: Set up some cronjobs to backup databases as configured
-  template: >
-    src=cron-backup-database
-    dest=/etc/cron.d/cron-backup-database-{{ item }}
-  with_items:
-  - "{{ dbs_to_backup }}"
-  when: dbs_to_backup != []
-  tags:
-  - cron
-  - pagure
-
-
 # Set-up Pagure
 
 - name: copy sundry pagure configuration