From fc7cc6c1854519b839000c7f9963fd1804cb7291 Mon Sep 17 00:00:00 2001
From: Victor LABORIE <vlaborie@evolix.fr>
Date: Thu, 13 Sep 2018 17:59:51 +0200
Subject: [PATCH] Use vlaborie/packmail box for test with Vagrant

---
 Vagrantfile                    | 22 ++++++----------
 test/ansible/evoadmin-mail.yml | 48 ----------------------------------
 test/ansible/requirements.yml  |  5 ----
 3 files changed, 8 insertions(+), 67 deletions(-)
 delete mode 100644 test/ansible/evoadmin-mail.yml
 delete mode 100644 test/ansible/requirements.yml

diff --git a/Vagrantfile b/Vagrantfile
index f1648ac..1c6f902 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -14,26 +14,20 @@ Vagrant.configure('2') do |config|
   config.vm.network "forwarded_port", guest: 443, host: 8443, auto_correct: true
 
   $deps = <<SCRIPT
-DEBIAN_FRONTEND=noninteractive apt-get -yq install ansible git
-ansible-galaxy install -r /vagrant/test/ansible/requirements.yml
-echo "[defaults]" > '/vagrant/test/ansible/ansible.cfg'
-echo "roles_path = /etc/ansible/roles/evolix" >> '/vagrant/test/ansible/ansible.cfg'
-> /etc/hosts
+sed -e '/Rewrite/ s/^#*/#/' -i /etc/apache2/sites-available/evoadminmail.conf
+service apache2 reload
+[ -d /home/evoadmin-mail/www/htdocs/config ] && php /vagrant/scripts/config-migrate.php > /vagrant/config/config.ini
+chmod 644 /vagrant/config/config.ini
+chown vagrant:vagrant /vagrant/config/config.ini
+rm -rf /home/evoadmin-mail/www/
+ln -s /vagrant/ /home/evoadmin-mail/www
 SCRIPT
 
   config.vm.define :packmail do |node|
     node.vm.hostname = "evoadmin-mail"
-    node.vm.box = "debian/stretch64"
+    node.vm.box = "vlaborie/packmail"
 
     node.vm.provision "deps", type: "shell", :inline => $deps
-    node.vm.provision "ansible", type: "ansible_local" do |ansible|
-      ansible.provisioning_path = "/vagrant/test/ansible"
-      ansible.playbook = "evoadmin-mail.yml"
-      ansible.install_mode = ":default"
-      ansible.raw_arguments = [
-        "--become"
-      ]
-    end
 
   end
 
diff --git a/test/ansible/evoadmin-mail.yml b/test/ansible/evoadmin-mail.yml
deleted file mode 100644
index fac773f..0000000
--- a/test/ansible/evoadmin-mail.yml
+++ /dev/null
@@ -1,48 +0,0 @@
----
-- hosts: all
-  gather_facts: yes
-  become: yes
-
-  vars:
-    evolinux_hostname: "evoadmin-mail"
-    evolinux_domain: "example.com"
-    evolinux_fqdn: "{{ evolinux_hostname }}.{{ evolinux_domain }}"
-    evomaintenance_alert_email: "evomaintenance-{{ evolinux_hostname }}@example.com"
-
-  roles:
-    - evolinux-base
-    - { role: postfix, postfix_packmail: True, postfix_force_main_cf: True }
-    - apache
-    - { role: php, php_apache_enable: True }
-    - { role: webapps/evoadmin-mail }
-
-  tasks:
-  - name: Disable redirection for evoadminmail vhost
-    lineinfile:
-      dest: /etc/apache2/sites-enabled/evoadminmail.conf
-      regexp: "Rewrite"
-      state: absent
-
-  - name: Fix rights on /etc/evolinux
-    file:
-      dest: /etc/evolinux
-      state: directory
-      mode: "0711"
-
-  - name: Link config.ini to evoadmin-mail.ini
-    file:
-      src: /etc/evolinux/evoadmin-mail.ini
-      dest: /vagrant/config/config.ini
-      state: link
-
-  - name: Remove distant htdocs dir
-    file:
-      dest: /home/evoadmin-mail/www
-      state: absent
-
-  - name: Use local htdocs dir
-    file:
-      src: /vagrant
-      dest: /home/evoadmin-mail/www
-      state: link
-      force: yes
diff --git a/test/ansible/requirements.yml b/test/ansible/requirements.yml
deleted file mode 100644
index 4ce5ed5..0000000
--- a/test/ansible/requirements.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- name: evolix
-  src: https://forge.evolix.org/ansible-roles.git
-  scm: git
-  version: evoadmin-mail