-In order to clarify the intellectual property license granted with -Contributions from any person or entity, the OpenStack Project (the "Project") -must have a Contributor License Agreement ("Agreement") on file that has been -signed by each Contributor, indicating agreement to the license terms below. -This license is for your protection as a Contributor as well as the protection -of OpenStack Foundation as Project manager (the "Project Manager") and the -Project users; it does not change your rights to use your own Contributions for -any other purpose. -
- --You accept and agree to the following terms and conditions for Your present and -future Contributions submitted to the Project Manager. In return, the Project -Manager shall not use Your Contributions in a way that is contrary to the -public benefit or inconsistent with its nonprofit status and bylaws in effect -at the time of the Contribution. Except for the license granted herein to the -Project Manager and recipients of software distributed by the Project Manager, -You reserve all right, title, and interest in and to Your Contributions. -
- --Definitions. - -"You" (or "Your") shall mean the copyright owner or legal entity authorized by -the copyright owner that is making this Agreement with the Project Manager. For -legal entities, the entity making a Contribution and all other entities that -control, are controlled by, or are under common control with that entity are -considered to be a single Contributor. For the purposes of this definition, -"control" means (i) the power, direct or indirect, to cause the direction or -management of such entity, whether by contract or otherwise, or (ii) ownership -of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial -ownership of such entity. "Contribution" shall mean any original work of -authorship, including any modifications or additions to an existing work, that -is intentionally submitted by You to the Project Manager for inclusion in, or -documentation of, any of the projects owned or managed by the Project Manager -(the "Work"). For the purposes of this definition, "submitted" means any form of -electronic, verbal, or written communication sent to the Project Manager or its -representatives, including but not limited to communication on electronic -mailing lists, source code control systems, and issue tracking systems that are -managed by, or on behalf of, the Project Manager for the purpose of discussing -and improving the Work, but excluding communication that is conspicuously marked -or otherwise designated in writing by You as "Not a Contribution." -
-Grant of Copyright License. - -Subject to the terms and conditions of this Agreement, You hereby grant to the -Project Manager and to recipients of software distributed by the Project -Manager a perpetual, worldwide, non-exclusive, no-charge, royalty-free, -irrevocable copyright license to reproduce, prepare derivative works of, -publicly display, publicly perform, sublicense, and distribute Your -Contributions and such derivative works. -
-Grant of Patent License. - -Subject to the terms and conditions of this Agreement, You hereby grant to the -Project Manager and to recipients of software distributed by the Project -Manager a perpetual, worldwide, non-exclusive, no-charge, royalty-free, -irrevocable (except as stated in this section) patent license to make, have -made, use, offer to sell, sell, import, and otherwise transfer the Work, where -such license applies only to those patent claims licensable by You that are -necessarily infringed by Your Contribution(s) alone or by combination of Your -Contribution(s) with the Work to which such Contribution(s) was submitted. If -any entity institutes patent litigation against You or any other entity -(including a cross-claim or counterclaim in a lawsuit) alleging that Your -Contribution, or the Work to which You have contributed, constitutes direct or -contributory patent infringement, then any patent licenses granted to that -entity under this Agreement for that Contribution or Work shall terminate as of -the date such litigation is filed. -
-You represent that you are legally entitled to grant the above license. If your -employer(s) has rights to intellectual property that you create that includes -your Contributions, You represent that you have received permission to make -Contributions on behalf of that employer, that your employer has waived such -rights for your Contributions to the Project Manager, or that your employer has -executed a separate Corporate Contributor License Agreement with the Project -Manager. -
-You represent that each of Your Contributions is Your original creation (see -Section 7 for submissions on behalf of others). You represent that Your -Contribution submissions include complete details of any third-party license or -other restriction (including, but not limited to, related patents and -trademarks) of which you are personally aware and which are associated with any -part of Your Contributions. -
-You are not expected to provide support for Your Contributions, except to the -extent You desire to provide support. You may provide support for free, for a -fee, or not at all. Unless required by applicable law or agreed to in writing, -You provide Your Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied, including, without -limitation, any warranties or conditions of TITLE, NONINFRINGEMENT, -MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. -
-Should You wish to submit work that is not Your original creation, You may -submit it to the Project Manager separately from any Contribution, identifying -the complete details of its source and of any license or other restriction -(including, but not limited to, related patents, trademarks, and license -agreements) of which you are personally aware, and conspicuously marking the -work as "Submitted on behalf of a third-party: [named here]". -
-You agree to notify the Project Manager of any facts or circumstances of which -you become aware that would make these representations inaccurate in any -respect. -
-In addition, if you have provided a Contribution (as defined in the LLC -Contribution License Agreement below) to the Project under the Contribution -License Agreement to OpenStack, LLC ("LLC Contribution Agreement"), you agree -that OpenStack, LLC may assign the LLC Contribution Agreement along with all -its rights and obligations under the LLC Contribution License Agreement to the -Project Manager. -
-- -In order to clarify the intellectual property license granted with -Contributions from any person or entity, the OpenStack Project (the "Project") -must have a Contributor License Agreement ("Agreement") on file that has been -signed by each Contributor, indicating agreement to the license terms below. -This license is for your protection as a Contributor as well as the protection -of OpenStack, LLC as Project manager (the "Project Manager") and the Project -users; it does not change your rights to use your own Contributions for any -other purpose. If you have not already done so, please complete and sign this -Individual License Agreement by following the instructions embedded below. -After you fill in the required information and apply your digital signature to -the Agreement, the signature service will generate an email to you. You must -confirm your digital signature as instructed in this email to complete the -signing process. The signature service will then send you a signed copy of this -Agreement for your records.
- -You accept and agree to the following terms and conditions for Your -present and future Contributions submitted to the Project Manager. Except for -the license granted herein to the Project Manager and recipients of software -distributed by the Project Manager, You reserve all right, title, and interest -in and to Your Contributions.
- -- -
- -- - -
Definitions"You" (or "Your") shall mean the copyright -owner or legal entity authorized by the copyright owner that is making this -Agreement with the Project Manager. For legal entities, the entity making a -Contribution and all other entities that control, are controlled by, or are -under common control with that entity are considered to be a single -Contributor. For the purposes of this definition, "control" means (i) the -power, direct or indirect, to cause the direction or management of such entity, -whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or -more of the outstanding shares, or (iii) beneficial ownership of such -entity. "Contribution" shall mean any original work of authorship, including -any modifications or additions to an existing work, that is intentionally -submitted by You to the Project Manager for inclusion in, or documentation of, -any of the projects owned or managed by the Project Manager (the "Work"). For -the purposes of this definition, "submitted" means any form of electronic, -verbal, or written communication sent to the Project Manager or its -representatives, including but not limited to communication on electronic -mailing lists, source code control systems, and issue tracking systems that are -managed by, or on behalf of, the Project Manager for the purpose of discussing -and improving the Work, but excluding communication that is conspicuously -marked or otherwise designated in writing by You as "Not a -Contribution."
- - -
Grant of Copyright License. Subject to the terms and -conditions of this Agreement, You hereby grant to the Project Manager and to -recipients of software distributed by the Project Manager a perpetual, -worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright -license to reproduce, prepare derivative works of, publicly display, publicly -perform, sublicense, and distribute Your Contributions and such derivative -works.
- - -
Grant of Patent License. Subject to the terms and -conditions of this Agreement, You hereby grant to the Project Manager and to -recipients of software distributed by the Project Manager a perpetual, -worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as -stated in this section) patent license to make, have made, use, offer to sell, -sell, import, and otherwise transfer the Work, where such license applies only -to those patent claims licensable by You that are necessarily infringed by Your -Contribution(s) alone or by combination of Your Contribution(s) with the Work -to which such Contribution(s) was submitted. If any entity institutes patent -litigation against You or any other entity (including a cross-claim or -counterclaim in a lawsuit) alleging that Your Contribution, or the Work to -which You have contributed, constitutes direct or contributory patent -infringement, then any patent licenses granted to that entity under this -Agreement for that Contribution or Work shall terminate as of the date such -litigation is filed.
- - -
You represent that you are legally entitled to grant the above license. -If your employer(s) has rights to intellectual property that you create that -includes your Contributions, You represent that you have received permission to -make Contributions on behalf of that employer, that your employer has waived -such rights for your Contributions to the Project Manager, or that your -employer has executed a separate Corporate Contributor License Agreement with -the Project Manager.
- - -
You represent that each of Your Contributions is Your original creation -(see Section 7 for submissions on behalf other others). You represent that Your -Contribution submissions include complete details of any third-party license or -other restriction (including, but not limited to, related patents and -trademarks) of which you are personally aware and which are associated with any -part of Your Contributions.
- - -
You are not expected to provide support for Your Contributions, except -to the extent You desire to provide support. You may provide support for free, -for a fee, or not at all. Unless required by applicable law or agreed to in -writing, You provide Your Contributions on as "AS IS" BASIS, WITHOUT WARRANTIES -OR CONDITIONS OR ANY KIND, either express or implied, including, without -limitation, any warranties or conditions of TITLE, NONINFRINGEMENT, -MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.
- - -
Should You wish to submit work that is not Your original creation, You -may submit it to the Project Manager separately from any Contribution, -identifying the complete details of its source and of any license or other -restriction (including, but not limited to, related patents, trademarks, and -license agreements) of which you are personally aware, and conspicuously -marking the work as "Submitted on behalf of a third-party: [named -here]".
- - -
You agree to notify the Project Manager of any facts or circumstances of -which you become aware that would make these representations inaccurate in any -respect.
-This is not a real CLA and cannot be signed. See the -account setup instructions for more information on OpenStack Contributor -License Agreements. -
- --This agreement is not managed through Gerrit. If you need to sign the U.S. -Government Contributor License Agreement, please contact the OpenStack -Foundation to initiate the process. See the -account setup instructions for more information on OpenStack Contributor -License Agreements. -
- -|[\\\\s(])([0-9a-f]{40})(
|[\\\\s.,;:)])', - html => '$1$2$3', - }, - ], - its_plugins => [ - { - name => 'its-storyboard', - password => $storyboard_password, - url => 'https://storyboard.openstack.org', - }, - ], - # See https://gerrit.googlesource.com/plugins/its-storyboard - # /+/stable-2.13/src/main/resources/Documentation - # /quick-install-guide.md#its_actions_its_actionsconfigure-its-actions - # for documentation on these options. - its_rules => [ - { - name => 'comment-on-status-update', - event_type => 'patchset-created,change-abandoned,change-restored,change-merged', - action => 'add-standard-comment', - }, - { - name => 'change_abandoned', - event_type => 'change-abandoned', - action => 'set-status TODO', - }, - { - name => 'change_in_progress', - event_type => 'patchset-created,change-restored', - action => 'set-status REVIEW', - }, - { - name => 'change_merged', - event_type => 'change-merged', - action => 'set-status MERGED', - }, - ], - download => { - 'command' => ['checkout', 'cherry_pick', 'pull', 'format_patch'], - 'scheme' => ['ssh', 'anon_http', 'anon_git'], - 'archive' => ['tar', 'tbz2', 'tgz', 'txz'], - }, - replication_force_update => true, - replication => [ - { - name => 'github', - url => 'git@github.com:', - authGroup => 'Anonymous Users', - replicationDelay => '1', - replicatePermissions => false, - mirror => true, - projects => [ - '^openstack/(?!ara$|ara-web$|ara-infra$).*', - 'openstack-dev/*', - 'openstack-infra/*', - ] - }, - { - name => 'gitea01', - url => 'ssh://git@gitea01.opendev.org:222/', - authGroup => 'Anonymous Users', - replicationDelay => '1', - replicatePermissions => false, - mirror => true, - threads => '4', - }, - { - name => 'gitea02', - url => 'ssh://git@gitea02.opendev.org:222/', - authGroup => 'Anonymous Users', - replicationDelay => '1', - replicatePermissions => false, - mirror => true, - threads => '4', - }, - { - name => 'gitea03', - url => 'ssh://git@gitea03.opendev.org:222/', - authGroup => 'Anonymous Users', - replicationDelay => '1', - replicatePermissions => false, - mirror => true, - threads => '4', - }, - { - name => 'gitea04', - url => 'ssh://git@gitea04.opendev.org:222/', - authGroup => 'Anonymous Users', - replicationDelay => '1', - replicatePermissions => false, - mirror => true, - threads => '4', - }, - { - name => 'gitea05', - url => 'ssh://git@gitea05.opendev.org:222/', - authGroup => 'Anonymous Users', - replicationDelay => '1', - replicatePermissions => false, - mirror => true, - threads => '4', - }, - { - name => 'gitea06', - url => 'ssh://git@gitea06.opendev.org:222/', - authGroup => 'Anonymous Users', - replicationDelay => '1', - replicatePermissions => false, - mirror => true, - threads => '4', - }, - { - name => 'gitea07', - url => 'ssh://git@gitea07.opendev.org:222/', - authGroup => 'Anonymous Users', - replicationDelay => '1', - replicatePermissions => false, - mirror => true, - threads => '4', - }, - { - name => 'gitea08', - url => 'ssh://git@gitea08.opendev.org:222/', - authGroup => 'Anonymous Users', - replicationDelay => '1', - replicatePermissions => false, - mirror => true, - threads => '4', - }, - { - name => 'local', - url => 'file:///opt/lib/git/', - replicationDelay => '1', - threads => '4', - mirror => true, - }, - ], - require => $::project_config::config_dir, - } - - gerrit::plugin { 'javamelody': version => 'v2.13.3.e4233d6' } - gerrit::plugin { 'its-storyboard': version => '805f9ac' } - - class { 'gerritbot': - nick => 'openstackgerrit', - password => $gerritbot_password, - server => 'irc.freenode.net', - user => 'gerritbot', - vhost_name => 'review.openstack.org', - ssh_rsa_key_contents => $gerritbot_ssh_rsa_key_contents, - ssh_rsa_pubkey_contents => $gerritbot_ssh_rsa_pubkey_contents, - channel_file => $::project_config::gerritbot_channel_file, - require => $::project_config::config_dir, - } - - class { 'gerrit::remotes': - ensure => absent, - } - } else { - # Only create gerrit user / group so we can bring a server online. - include ::gerrit::user - } - - package { 'python-launchpadlib': - ensure => present, - } - file { '/home/gerrit2/.launchpadlib': - ensure => directory, - owner => 'gerrit2', - group => 'gerrit2', - mode => '0775', - require => User['gerrit2'], - } - file { '/home/gerrit2/.launchpadlib/creds': - ensure => present, - owner => 'gerrit2', - group => 'gerrit2', - mode => '0600', - content => template('openstack_project/infra_lp_creds.erb'), - replace => true, - require => User['gerrit2'], - } - - include bup - bup::site { 'ord.rax': - backup_user => 'bup-review', - backup_server => 'backup01.ord.rax.ci.openstack.org', - } - - # Compatibility layer for old domain name below here - include ::httpd - - if ! defined(Httpd::Mod['alias']) { - httpd::mod { 'alias': - ensure => present, - before => Service['httpd'], - } - } - - ::httpd::vhost { 'review.openstack.org': - port => 443, # Is required despite not being used. - docroot => 'MEANINGLESS_ARGUMENT', - priority => '50', - template => 'openstack_project/review-openstack-redirect.vhost.erb', - } -} diff --git a/modules/openstack_project/templates/gerrit_patchset-created.erb b/modules/openstack_project/templates/gerrit_patchset-created.erb deleted file mode 100755 index 7c43d3daa0..0000000000 --- a/modules/openstack_project/templates/gerrit_patchset-created.erb +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -# Use timeout to kill any process running longer than 10 minutes. -timeout -k 2m 10m /usr/local/bin/update-blueprint patchset-created "$@" -timeout -k 2m 10m /usr/local/bin/update-bug patchset-created "$@" -timeout -k 2m 10m /usr/local/bin/notify-impact patchset-created "$@" --impact SecurityImpact --dest-address 'openstack-security@lists.openstack.org' -<% if @ssh_welcome_rsa_key_contents != "" -%> -timeout -k 2m 10m /usr/local/bin/welcome-message patchset-created \ - --verbose --ssh-user=welcome-message \ - --ssh-key=/home/gerrit2/review_site/etc/ssh_welcome_rsa_key "$@" -<% end -%> diff --git a/modules/openstack_project/templates/review-dev.projects.ini.erb b/modules/openstack_project/templates/review-dev.projects.ini.erb deleted file mode 100644 index 06467fd189..0000000000 --- a/modules/openstack_project/templates/review-dev.projects.ini.erb +++ /dev/null @@ -1,12 +0,0 @@ -[projects] -homepage=http://openstack.org -acl-dir=/home/gerrit2/acls -local-git-dir=<%= @local_git_dir %> -jeepyb-cache-dir=<%= @jeepyb_cache_dir %> -gerrit-host=<%= @fqdn %> -gerrit-user=openstack-dev-project-creator -gerrit-key=<%= @ssh_project_key %> -github-config=/etc/github/github-projects.secure.config -has-wiki=False -has-issues=False -has-downloads=False diff --git a/modules/openstack_project/templates/review-openstack-redirect.vhost.erb b/modules/openstack_project/templates/review-openstack-redirect.vhost.erb deleted file mode 100644 index e8e89377e1..0000000000 --- a/modules/openstack_project/templates/review-openstack-redirect.vhost.erb +++ /dev/null @@ -1,38 +0,0 @@ -# ************************************ -# Managed by Puppet -# ************************************ - -