From fb9cad0ed2a83beed5c855772f5d241001cdcd85 Mon Sep 17 00:00:00 2001 From: Jason Moore Date: Fri, 14 Feb 2020 13:05:36 -0500 Subject: [PATCH 1/3] Adding hiera lookup for php version instead of hardcoding php7.1. --- custom-modules/mailhog/manifests/init.pp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/custom-modules/mailhog/manifests/init.pp b/custom-modules/mailhog/manifests/init.pp index c56595c..9be170f 100644 --- a/custom-modules/mailhog/manifests/init.pp +++ b/custom-modules/mailhog/manifests/init.pp @@ -1,5 +1,9 @@ class mailhog { +$php_version = lookup('php::globals::php_version') +$php_version_fpm = "php${php_version}-fpm" +$php_path = "/etc/php/${php_version}/fpm/php.ini" + package { 'postfix': ensure => 'absent', }-> @@ -67,13 +71,13 @@ file_line { 'mhsendmail php.ini': ensure => present, - path => '/etc/php/7.1/fpm/php.ini', + path => $php_path, line => 'sendmail_path = /usr/local/bin/mhsendmail', match => '^;?sendmail_path', require => Class['drupal_php::fpm'], notify => [ Service['httpd'], - Service['php7.1-fpm'], + Service[$php_version_fpm], Class['::php::fpm::service'], ], } From 64de383f466f96bf7c87ee484f2471a65c51e82d Mon Sep 17 00:00:00 2001 From: Jason Moore Date: Fri, 14 Feb 2020 13:18:27 -0500 Subject: [PATCH 2/3] Removing source_hash from wp_cli install. --- custom-modules/wp_cli/manifests/init.pp | 1 - 1 file changed, 1 deletion(-) diff --git a/custom-modules/wp_cli/manifests/init.pp b/custom-modules/wp_cli/manifests/init.pp index 8d8cbd4..087776e 100644 --- a/custom-modules/wp_cli/manifests/init.pp +++ b/custom-modules/wp_cli/manifests/init.pp @@ -5,7 +5,6 @@ destination => '/usr/local/bin/wp', timeout => 0, verbose => false, - source_hash => '179fc8dacbfe3ebc2d00ba57a333c982', }-> file { '/usr/local/bin/wp': From d1698a33ce84c96d5bd67bac763be616867e1199 Mon Sep 17 00:00:00 2001 From: Jason Moore Date: Fri, 14 Feb 2020 13:21:45 -0500 Subject: [PATCH 3/3] Optimizing code a bit. --- custom-modules/mailhog/manifests/init.pp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/custom-modules/mailhog/manifests/init.pp b/custom-modules/mailhog/manifests/init.pp index 9be170f..04039b4 100644 --- a/custom-modules/mailhog/manifests/init.pp +++ b/custom-modules/mailhog/manifests/init.pp @@ -1,8 +1,6 @@ class mailhog { -$php_version = lookup('php::globals::php_version') -$php_version_fpm = "php${php_version}-fpm" -$php_path = "/etc/php/${php_version}/fpm/php.ini" +$php_version = $::php::globals::php_version package { 'postfix': ensure => 'absent', @@ -71,13 +69,13 @@ file_line { 'mhsendmail php.ini': ensure => present, - path => $php_path, + path => "/etc/php/${php_version}/fpm/php.ini", line => 'sendmail_path = /usr/local/bin/mhsendmail', match => '^;?sendmail_path', require => Class['drupal_php::fpm'], notify => [ Service['httpd'], - Service[$php_version_fpm], + Service["php${php_version}-fpm"], Class['::php::fpm::service'], ], }