jenkins-bot has submitted this change and it was merged.
Change subject: Rewrite SmashPig config as YAML
......................................................................
Rewrite SmashPig config as YAML
Change-Id: Ifb2cacbde56f37352e5b6ff69bc61cda8a0f30d2
---
M puppet/modules/smashpig/manifests/init.pp
A puppet/modules/smashpig/templates/SmashPig.yaml.erb
D puppet/modules/smashpig/templates/config.php.erb
3 files changed, 11 insertions(+), 16 deletions(-)
Approvals:
Awight: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/smashpig/manifests/init.pp
b/puppet/modules/smashpig/manifests/init.pp
index affbfe9..5393b9c 100644
--- a/puppet/modules/smashpig/manifests/init.pp
+++ b/puppet/modules/smashpig/manifests/init.pp
@@ -20,8 +20,8 @@
update => true,
}
- file { "${dir}/config.php":
- content => template('smashpig/config.php.erb'),
+ file { '/etc/fundraising/SmashPig.yaml':
+ content => template('smashpig/SmashPig.yaml.erb'),
require => [
Git::Clone['wikimedia/fundraising/SmashPig'],
],
@@ -41,7 +41,7 @@
ensure => present,
content => template('smashpig/apache-site.erb'),
require => [
- File["${dir}/config.php"],
+ File['/etc/fundraising/SmashPig.yaml'],
File["${dir}/PublicHttp/.htaccess"],
Class['::apache::mod::rewrite'],
],
diff --git a/puppet/modules/smashpig/templates/SmashPig.yaml.erb
b/puppet/modules/smashpig/templates/SmashPig.yaml.erb
new file mode 100644
index 0000000..c8509de
--- /dev/null
+++ b/puppet/modules/smashpig/templates/SmashPig.yaml.erb
@@ -0,0 +1,8 @@
+adyen:
+ payment-provider:
+ adyen:
+ payments-wsdl: https://pal-test.adyen.com/pal/Payment.wsdl
+
+paypal:
+ listener:
+ postback-url: https://www.sandbox.paypal.com/cgi-bin/webscr
diff --git a/puppet/modules/smashpig/templates/config.php.erb
b/puppet/modules/smashpig/templates/config.php.erb
deleted file mode 100644
index 1d88c05..0000000
--- a/puppet/modules/smashpig/templates/config.php.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-// TODO: set test provider URLs
-
-$config = array(
- 'default' => array(
- 'data-store' => array(
- 'stomp' => array(
- 'lib-path' => "<%= scope.lookupvar('crm::dir')
%>/sites/all/modules/queue2civicrm/Stomp.php",
- ),
- ),
- ),
-);
--
To view, visit https://gerrit.wikimedia.org/r/293058
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb2cacbde56f37352e5b6ff69bc61cda8a0f30d2
Gerrit-PatchSet: 9
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Awight <[email protected]>
Gerrit-Reviewer: AndyRussG <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
Gerrit-Reviewer: Cdentinger <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: Eileen <[email protected]>
Gerrit-Reviewer: Ejegg <[email protected]>
Gerrit-Reviewer: Katie Horn <[email protected]>
Gerrit-Reviewer: Pcoombe <[email protected]>
Gerrit-Reviewer: XenoRyet <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
