From b3ec7867bcb10b1fa58cd8e292148de0bfa03754 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
Date: Fri, 13 Mar 2015 15:26:45 +0000
Subject: [PATCH] More mailman changes

---
 .../lists-dev.cloud.fedoraproject.org.yml      | 18 ------------------
 roles/mailman/defaults/main.yml                |  2 --
 roles/mailman/tasks/main.yml                   | 11 +++++++++--
 3 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml b/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml
index 1606b9cb48..ee965ce330 100644
--- a/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml
@@ -105,16 +105,11 @@
     postgresql_user: name=hyperkittyadmin password={{ lists_dev_hk_db_pass }}
   - name: hyperkitty DB user
     postgresql_user: name=hyperkittyapp password={{ lists_dev_hk_db_pass }}
-  - name: kittystore DB admin user
-    postgresql_user: name=kittystoreadmin password={{ lists_dev_ks_db_pass }}
-  - name: kittystore DB user
-    postgresql_user: name=kittystoreapp password={{ lists_dev_ks_db_pass }}
   - name: databases creation
     postgresql_db: name={{ item }} owner="{{ item }}admin" encoding=UTF-8
     with_items:
     - mailman
     - hyperkitty
-    - kittystore
 
 - name: setup mailman and hyperkitty
   hosts: hyperkitty-stg
@@ -130,8 +125,6 @@
     mailman_mailman_db_pass: "{{ lists_dev_mm_db_pass }}"
     mailman_hyperkitty_admin_db_pass: "{{ lists_dev_hk_db_pass }}"
     mailman_hyperkitty_db_pass: "{{ lists_dev_hk_db_pass }}"
-    mailman_kittystore_admin_db_pass: "{{ lists_dev_ks_db_pass }}"
-    mailman_kittystore_db_pass: "{{ lists_dev_ks_db_pass }}"
     mailman_hyperkitty_cookie_key: "randomstringusedasacookiesecurekey-yesthisshouldbeinaprivaterepo_butidonthaveaccesstoit"
     mailman_url: "{{ ansible_fqdn }}"
   - collectd/base
@@ -142,7 +135,6 @@
     yum: pkg={{ item }} state=present
     with_items:
     - tar
-    - mailman # transition from mailman2.1
     - vim
     - tmux
     - patch
@@ -159,16 +151,6 @@
     - reload aliases
 
 
-  # Start services
-  - name: start services
-    service: state=started enabled=yes name={{ item }}
-    with_items:
-    - httpd
-    - postgresql
-    - mailman3
-    - postfix
-
-
   handlers:
   - include: "{{ handlers }}/restart_services.yml"
   - name: reload aliases
diff --git a/roles/mailman/defaults/main.yml b/roles/mailman/defaults/main.yml
index 748fc7c354..ce985a581c 100644
--- a/roles/mailman/defaults/main.yml
+++ b/roles/mailman/defaults/main.yml
@@ -5,6 +5,4 @@ mailman_db_server: localhost
 mailman_mailman_db_pass: changeme
 mailman_hyperkitty_admin_db_pass: changeme
 mailman_hyperkitty_db_pass: changeme
-mailman_kittystore_admin_db_pass: changeme
-mailman_kittystore_db_pass: changeme
 mailman_hyperkitty_cookie_key: changeme
diff --git a/roles/mailman/tasks/main.yml b/roles/mailman/tasks/main.yml
index bc1c3915c4..df82790339 100644
--- a/roles/mailman/tasks/main.yml
+++ b/roles/mailman/tasks/main.yml
@@ -265,5 +265,12 @@
 - name: start memcached
   service: state=started enabled=yes name=memcached
 
-#- name: start mailman3
-#  service: state=started enabled=yes name=mailman3
+# Start services
+- name: start services
+  service: state=started enabled=yes name={{ item }}
+  with_items:
+  - httpd
+  - postgresql
+  #- mailman3
+  - postfix
+  - memcached