jenkins-bot has submitted this change and it was merged.
Change subject: PHPMailer and Twig are included via Composer
......................................................................
PHPMailer and Twig are included via Composer
Delete Puppet provisioning
Change-Id: Ib5c7629448c00c0b810e31c43dc1e26dddc110c2
---
M puppet/hieradata/common.yaml
M puppet/modules/crm/manifests/init.pp
D puppet/modules/phpmailer/manifests/init.pp
D puppet/modules/twig/manifests/init.pp
4 files changed, 0 insertions(+), 40 deletions(-)
Approvals:
20after4: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 9c6ff3a..8f8b8dd 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -178,8 +178,6 @@
phabricator::deploy_dir: "%{hiera('mwv::services_dir')}"
phabricator::vhost_name: phabricator.local.wmftest.net
-phpmailer::dir: "%{hiera('mwv::services_dir')}/phpmailer"
-
# We are masterless and have no need to run an agent.
puppet::agent::ensure: stopped
puppet::agent::enable: false
@@ -222,7 +220,5 @@
sentry::admin_pass: vagrant
smtplog::log_file: /vagrant/logs/smtp.log
-
-twig::dir: "%{hiera('mwv::services_dir')}/twig"
xhprofgui::dir: "%{hiera('mwv::vendor_dir')}/xhprof"
diff --git a/puppet/modules/crm/manifests/init.pp
b/puppet/modules/crm/manifests/init.pp
index 771c851..235ae16 100644
--- a/puppet/modules/crm/manifests/init.pp
+++ b/puppet/modules/crm/manifests/init.pp
@@ -33,9 +33,7 @@
$repo = 'wikimedia/fundraising/crm'
include ::php
- include ::phpmailer
include ::postfix
- include ::twig
include ::crm::apache
include ::crm::civicrm
diff --git a/puppet/modules/phpmailer/manifests/init.pp
b/puppet/modules/phpmailer/manifests/init.pp
deleted file mode 100644
index 92242bf..0000000
--- a/puppet/modules/phpmailer/manifests/init.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-# == Class: phpmailer
-#
-# Wikimedia redistribution of the https://github.com/PHPMailer/PHPMailer
-# email sending library.
-#
-# === Parameters
-#
-# [*dir*]
-# Root directory for the package
-#
-class phpmailer(
- $dir,
-) {
- git::clone { 'wikimedia/fundraising/phpmailer':
- directory => $dir,
- }
-}
diff --git a/puppet/modules/twig/manifests/init.pp
b/puppet/modules/twig/manifests/init.pp
deleted file mode 100644
index 7ad519b..0000000
--- a/puppet/modules/twig/manifests/init.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-# == Class: twig
-#
-# Wikimedia Fundraising's fork of Twig, a PHP templating engine.
-# See <http://twig.sensiolabs.org/>.
-#
-# === Parameters
-#
-# [*dir*]
-# Root directory for the Twig package
-#
-class twig(
- $dir,
-) {
- git::clone { 'wikimedia/fundraising/twig':
- directory => $dir,
- }
-}
--
To view, visit https://gerrit.wikimedia.org/r/207036
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib5c7629448c00c0b810e31c43dc1e26dddc110c2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Awight <[email protected]>
Gerrit-Reviewer: 20after4 <[email protected]>
Gerrit-Reviewer: AndyRussG <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Ejegg <[email protected]>
Gerrit-Reviewer: Katie Horn <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Ssmith <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
