Dzahn has submitted this change and it was merged. Change subject: Revert "contacts/outreach - move to module" ......................................................................
Revert "contacts/outreach - move to module" i don't know why, but puppet refuses to find my class ::contacts This reverts commit e453ec06eae29b8954bcd55cc84883da10ec69d6. Change-Id: I5d9bc3bcbb55a43d8e688d9e6338ff9ab74d3e4c --- R manifests/misc/outreach.pp D manifests/role/contacts.pp M manifests/site.pp R templates/apache/sites/contacts.wikimedia.org.erb 4 files changed, 4 insertions(+), 9 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/contacts/manifests/init.pp b/manifests/misc/outreach.pp similarity index 66% rename from modules/contacts/manifests/init.pp rename to manifests/misc/outreach.pp index 477051f..d0ed323 100644 --- a/modules/contacts/manifests/init.pp +++ b/manifests/misc/outreach.pp @@ -1,5 +1,7 @@ # https://contacts.wikimedia.org | http://en.wikipedia.org/wiki/CiviCRM -class contacts { +class misc::outreach::civicrm { + + system::role { 'misc::outreach::civicrm': description => 'contacts.wikimedia.org - Drupal/CiviCRM' } apache::site { 'contacts.wikimedia.org': content => template('contacts/contacts.wikimedia.org.erb'), diff --git a/manifests/role/contacts.pp b/manifests/role/contacts.pp deleted file mode 100644 index 8780306..0000000 --- a/manifests/role/contacts.pp +++ /dev/null @@ -1,7 +0,0 @@ -# https://contacts.wikimedia.org | http://en.wikipedia.org/wiki/CiviCRM -class role::contacts { - - system::role { 'role::contacts': description => 'contacts.wikimedia.org - Drupal/CiviCRM' } - - include ::contacts -} diff --git a/manifests/site.pp b/manifests/site.pp index cf90a69..adbda3c 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -3007,7 +3007,7 @@ include standard include admin include role::planet - include role::contacts + include misc::outreach::civicrm # contacts.wikimedia.org include role::etherpad include role::wikimania_scholarships include role::bugzilla diff --git a/modules/contacts/templates/contacts.wikimedia.org.erb b/templates/apache/sites/contacts.wikimedia.org.erb similarity index 100% rename from modules/contacts/templates/contacts.wikimedia.org.erb rename to templates/apache/sites/contacts.wikimedia.org.erb -- To view, visit https://gerrit.wikimedia.org/r/169261 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5d9bc3bcbb55a43d8e688d9e6338ff9ab74d3e4c Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <[email protected]> Gerrit-Reviewer: Dzahn <[email protected]> Gerrit-Reviewer: John F. Lewis <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
