Merge pull request #104 from zepgram/develop

[v1.6.2] validate install 2.4.5 + replace mailcatcher by mailhog

Author: Benjamin Calef

README.md

@@ -76,7 +76,7 @@ If your ssh key has been created with a passphrase, please create another one.
 Parent Node  |  Name  |  Default Value  |  Allowed Value  |  Is optional  |  Description
 | --- | --- | --- | --- | --- |---
 | vmconf |  machine_name |  Vagrant Magento 2 | string | no | Vagrant machine name
-| |  network_ip |  192.168.200.50 | IP address |  no  | Accessible IP address /etc/hosts
+| |  network_ip |  192.168.60.0 | IP address |  no  | Accessible IP address /etc/hosts
 | |  host_name |  zepgram | string |  no |  Virtual host name
 | |  memory |  4096  |  number  |  no |  RAM allocated
 | |  cpus |  1 |  number  |  no |  CPU allocated
@@ -92,7 +92,7 @@ Parent Node  |  Name  |  Default Value  |  Allowed Value  |  Is optional  |  Des
 | magento |  url |  dev.magento.com  | url |  no |  Magento site host name
 | |  source |  composer | composer / (master/develop..) |  no |  Define source installation. On git install set the branch name to clone.
 | |  edition |  community | community / enterprise |  no |  Magento project edition
-| |  version |  2.4.4 |  >=2.2 |  no |  Magento version release
+| |  version |  2.4.5 |  >=2.2 |  no |  Magento version release
 | |  php_version |  default | default / 7.x |  no |  PHP version
 | |  sample |  true | true / false |  no |  Install sample data
 | |  mode |  developer | developer / production |  no |  Magento execution mode
@@ -179,7 +179,7 @@ Disable cron:
 - elasticsearch
 - grunt
 - postfix
-- mailcatcher
+- mailhog
 - pestle
 - magereun
 - adminer
@@ -197,8 +197,8 @@ Disable cron:
   * user: vagrant
   * pass: vagrant
   * name: magento
-* Mailcatcher
-  * url: [network_ip]:1080
+* Mailhog
+  * url: [network_ip]:8025
 * Adminer
   * url: [network_ip]/adminer
 * Phpinfo

Vagrantfile

@@ -155,7 +155,7 @@ Vagrant machine ready to use for #{git['name']}
    magento         http://#{magento['url']}
    phpinfo         http://#{vmconf['network_ip']}/php
    adminer         http://#{vmconf['network_ip']}/adminer
-   mailcatcher     http://#{vmconf['network_ip']}:1080
+   mailhog         http://#{vmconf['network_ip']}:8025
 "
 
   # Triggers

config.yaml.example

@@ -19,7 +19,7 @@ magento:
   url: 'dev.magento.com'
   source: 'composer'
   edition: 'community'
-  version: '2.4.4'
+  version: '2.4.5'
   php_version: 'default'
   sample: 'true'
   mode: 'developer'

provision/010-system-packages.sh

@@ -37,7 +37,7 @@ apt-get update -y && apt-get install -y \
   libsqlite3-dev libxml2-utils build-essential software-properties-common \
   postfix mailutils libsasl2-2 libsasl2-modules ca-certificates libnss3-tools \
   apt-transport-https openssl redis-server nginx \
-  python ruby ruby-dev rubygems openjdk-11-jdk openjdk-11-jre \
+  python golang-go openjdk-11-jdk openjdk-11-jre \
   vim git git-flow
 
 # Php Repository
@@ -95,9 +95,9 @@ wget -P ~/ https://www.thawte.com/roots/thawte_Premium_Server_CA.pem && \
     mv ~/thawte_Premium_Server_CA.pem /usr/local/share/ca-certificates/thawte_Premium_Server_CA.crt && \
     update-ca-certificates;
 
-# Mailcatcher
-gem install mime-types --version "< 3" --no-ri --no-rdoc
-gem install mailcatcher --no-ri --no-rdoc
+# Mailhog
+go get github.com/mailhog/MailHog
+ln -sfn /root/go/bin/MailHog /usr/local/bin/mailhog
 
 # Grunt
 curl -sL https://deb.nodesource.com/setup_10.x | bash -

provision/020-system-services.sh

@@ -42,30 +42,21 @@ echo 'relayhost = 127.0.0.1:1025
 mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128' | tee -a /etc/postfix/main.cf
 
 # Configuration on booting
-cat <<'EOF' > /etc/init.d/mailcatcher
-#!/bin/sh
-
-### BEGIN INIT INFO
-# Provides:          mailcatcher
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Start daemon at boot time
-# Description:       Enable service provided by daemon.
-### END INIT INFO
-
-set -x
-lsof -ti :1025 | xargs --no-run-if-empty kill -9
-mailcatcher --http-ip=0.0.0.0
+cat <<'EOF' > /etc/systemd/system/mailhog.service
+[Unit]
+Description=MailHog service
+
+[Service]
+ExecStart=/usr/local/bin/mailhog
+
+[Install]
+WantedBy=multi-user.target
 EOF
-chmod +x /etc/init.d/mailcatcher
-update-rc.d mailcatcher defaults
+systemctl start mailhog
+systemctl enable mailhog
 
-lsof -ti :1025 | xargs --no-run-if-empty kill -9
-mailcatcher --http-ip=0.0.0.0
 /usr/sbin/sendmail -t -i -f $PROJECT_GIT_EMAIL <<MAIL_END
-Subject: Vagrant: MailCatcher
+Subject: Vagrant: MailHog
 To: $PROJECT_GIT_EMAIL
 
 Test to validate catch email.