split validé

mail.yml

@@ -6,6 +6,7 @@
   gather_facts: yes
 
   roles:
+    - mariadb
     - mail
 
 # vim: set textwidth=0 ft=yaml ts=2 sw=2 expandtab:

roles/mail/tasks/main.yml

@@ -11,9 +11,9 @@
   shell: pwgen -y -B -s 80 1
   register: dbpassword
 
-- name: Randomly generate a root mysql password
-  shell: pwgen -y -B -s 80 1
-  register: rootpassword
+#- name: Randomly generate a root mysql password
+#  shell: pwgen -y -B -s 80 1
+#  register: rootpassword
 
 - name: Install packages
   apt: pkg={{item}} state=installed update_cache=yes
@@ -97,45 +97,45 @@
 - name: Copy postfix config files
   template: src=root-postfix.sql.j2 dest=/etc/postfix/ owner=root mode=655
 
-- name: Check mysql
-  fail: msg="Missing variable rootpassword"
-  when: rootpassword is not defined
-
-- name: Install mysql packages
-  tags: mysql
-  apt: pkg={{item}} state=installed
-  with_items:
-    - mysql-server
-    - mysql-client
-    - python-mysqldb
-    - automysqlbackup
-
-- name: Set root mysql password
-  tags: mysql
-  mysql_user: name=root password={{rootpassword}} login_unix_socket=/var/run/mysqld/mysqld.sock
-  ignore_errors: yes
-
-- name: Second attempt ?
-  tags: mysql
-  debconf: name=mysql-server-5.5 question='mysql-server/root_password_again' value='{{rootpassword}}' vtype=password
-  debconf: name=mysql-server-5.5 question='mysql-server/root_password' value='{{rootpassword}}' vtype=password
-  debconf: name=mysql-server question='mysql-server/root_password_again' value='{{rootpassword}}' vtype=password
-  debconf: name=mysql-server question='mysql-server/root_password' value='{{rootpassword}}' vtype=password
-  debconf: name=mysql-server-5.5 question='mysql-server/root_password_again' value='{{rootpassword}}' vtype=text
-  debconf: name=mysql-server-5.5 question='mysql-server/root_password' value='{{rootpassword}}' vtype=text
-  debconf: name=mysql-server question='mysql-server/root_password_again' value='{{rootpassword}}' vtype=text
-  debconf: name=mysql-server question='mysql-server/root_password' value='{{rootpassword}}' vtype=text
-  ignore_errors: yes
-
-- name: Copy automysqlbackup config file
-  tags: mysql
-  copy: src=etc-default-automysqlbackup dest=/etc/default/automysqlbackup
-
-- name: Template .my.cnf
-  tags: mysql
-  template: src=root-.my.cnf.j2 dest=/root/.my.cnf
-
-- name: Ensure 600 permissions on my.cnf
-  tags: mysql
-  file: path=/root/.my.cnf mode=600
+#- name: Check mysql
+#  fail: msg="Missing variable rootpassword"
+#  when: rootpassword is not defined
+
+#- name: Install mysql packages
+#  tags: mysql
+#  apt: pkg={{item}} state=installed
+#  with_items:
+#    - mysql-server
+#    - mysql-client
+#    - python-mysqldb
+#    - automysqlbackup
+
+#- name: Set root mysql password
+#  tags: mysql
+#  mysql_user: name=root password={{rootpassword}} login_unix_socket=/var/run/mysqld/mysqld.sock
+#  ignore_errors: yes
+#
+#- name: Second attempt ?
+#  tags: mysql
+#  debconf: name=mysql-server-5.5 question='mysql-server/root_password_again' value='{{rootpassword}}' vtype=password
+#  debconf: name=mysql-server-5.5 question='mysql-server/root_password' value='{{rootpassword}}' vtype=password
+#  debconf: name=mysql-server question='mysql-server/root_password_again' value='{{rootpassword}}' vtype=password
+#  debconf: name=mysql-server question='mysql-server/root_password' value='{{rootpassword}}' vtype=password
+#  debconf: name=mysql-server-5.5 question='mysql-server/root_password_again' value='{{rootpassword}}' vtype=text
+#  debconf: name=mysql-server-5.5 question='mysql-server/root_password' value='{{rootpassword}}' vtype=text
+#  debconf: name=mysql-server question='mysql-server/root_password_again' value='{{rootpassword}}' vtype=text
+#  debconf: name=mysql-server question='mysql-server/root_password' value='{{rootpassword}}' vtype=text
+#  ignore_errors: yes
+#
+#- name: Copy automysqlbackup config file
+#  tags: mysql
+#  copy: src=etc-default-automysqlbackup dest=/etc/default/automysqlbackup
+#
+#- name: Template .my.cnf
+#  tags: mysql
+#  template: src=root-.my.cnf.j2 dest=/root/.my.cnf
+#
+#- name: Ensure 600 permissions on my.cnf
+#  tags: mysql
+#  file: path=/root/.my.cnf mode=600
 # vim: set textwidth=0 ft=yaml ts=2 sw=2 expandtab:

roles/mariadb/tasks/main.yml

@@ -1,4 +1,7 @@
 ---
+- name: MySQL already installed ?
+  shell: dpkg -l|grep mysql|grep -iq serv
+  register: mysql
 
 - name: Install prerequisites packages
   apt: pkg={{item}} state=installed install_recommends=no 
@@ -6,12 +9,15 @@
     - python-software-properties
     - php5-cli 
     - php5-mysql
+  when: mysql|failed
 
 - name: Add MariaDB repository Key
   apt_key: keyserver=keyserver.ubuntu.com id=0xcbcb082a1bb943db state=present 
+  when: mysql|failed
 
 - name: Add Mariadb repository file
   template: src=etc_apt_sources.list.d_mariadb.list dest=/etc/apt/sources.list.d/mariadb.list  
+  when: mysql|failed
 
 - name: Install Mariadb packages
   apt: pkg={{item}} state=installed update_cache=yes
@@ -19,18 +25,22 @@
     - mariadb-server-{{ mariadb_version | default(10) }}
     - python-mysqldb
     - percona-toolkit
+  when: mysql|failed
 
 - name: Set root mysql password
-  mysql_user: name=root password={{mysql_root_password}}
+  mysql_user: name=root password={{ mysql_root_password | default("changeme") }}
+  when: mysql|failed
 
 - name: File .my.cnf for root
   template: src={{item.src}} dest={{item.dest}}
   with_items : 
     - { src: root-.my.cnf , dest: /root/.my.cnf }
+  when: mysql|failed
 
 
 - name: Ensure 600 permissions on my.cnf
   file: path=/root/.my.cnf mode=600
+  when: mysql|failed
 
 
 # vim: set textwidth=0 ft=yaml ts=2 sw=2 expandtab: