From ebac164ee0ab14189304381390681d61e8b3d6f7 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Wed, 4 Jan 2012 10:49:40 -0800 Subject: [PATCH] Add CLA config to gerrit. Also add the echosign "cla" which just points devs to the wiki page. Change-Id: I0ef37511d9f7e7495d78f2f3cd9fde47f88aa99c --- modules/gerrit/files/echosign-cla.html | 15 +++++++++++++++ modules/gerrit/manifests/init.pp | 9 +++++++++ modules/gerrit/templates/gerrit.config.erb | 1 + 3 files changed, 25 insertions(+) create mode 100644 modules/gerrit/files/echosign-cla.html diff --git a/modules/gerrit/files/echosign-cla.html b/modules/gerrit/files/echosign-cla.html new file mode 100644 index 0000000000..770efc757f --- /dev/null +++ b/modules/gerrit/files/echosign-cla.html @@ -0,0 +1,15 @@ + + +
+

In order to contribute to OpenStack, you need to sign the Contributor License Agreement.

+ +

+Follow these instructions to sign the agreement. Once your membership in the openstack-cla group has been approved, +you will be able to submit changes. +

+ +

(This page is not the actual agreement, do not fill out the form below.)

+ +
+ + diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp index 2a968ceca1..eadb3c4ae2 100644 --- a/modules/gerrit/manifests/init.pp +++ b/modules/gerrit/manifests/init.pp @@ -98,6 +98,15 @@ $commentlinks = [ { name => 'changeid', source => 'puppet:///modules/gerrit/patchset-created', replace => 'true', } + + file { '/home/gerrit2/review_site/static/echosign-cla.html': + owner => 'root', + group => 'root', + mode => 444, + ensure => 'present', + source => 'puppet:///modules/gerrit/echosign-cla.html', + replace => 'true', + } } else { notice('Gerrit is not installed') diff --git a/modules/gerrit/templates/gerrit.config.erb b/modules/gerrit/templates/gerrit.config.erb index a007a912fe..8d0d99d1f8 100644 --- a/modules/gerrit/templates/gerrit.config.erb +++ b/modules/gerrit/templates/gerrit.config.erb @@ -13,6 +13,7 @@ type = OPENID_SSO openIdSsoUrl = <%= openidssourl %> cookieSecure = true + contributorAgreements = true [sendemail] smtpServer = localhost [container]