From: Javier Bértoli Date: Wed, 21 Jul 2021 18:17:18 +0000 (-0300) Subject: Add copyright headers to comply with Arvados X-Git-Url: https://git.arvados.org/arvados-formula.git/commitdiff_plain/cee31d2e436a8751425f7180ae451fbe5163db6f Add copyright headers to comply with Arvados no issue# Arvados-DCO-1.1-Signed-off-by: Javier Bértoli --- diff --git a/arvados/api/package/install.sls b/arvados/api/package/install.sls index 54e20ef..4070775 100644 --- a/arvados/api/package/install.sls +++ b/arvados/api/package/install.sls @@ -1,6 +1,10 @@ # -*- coding: utf-8 -*- # vim: ft=sls +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 + {#- Get the `tplroot` from `tpldir` #} {%- set tplroot = tpldir.split('/')[0] %} {%- set sls_config_file = tplroot ~ '.config.file' %} diff --git a/arvados/controller/package/install.sls b/arvados/controller/package/install.sls index de2166a..a1c8a4d 100644 --- a/arvados/controller/package/install.sls +++ b/arvados/controller/package/install.sls @@ -1,6 +1,10 @@ # -*- coding: utf-8 -*- # vim: ft=sls +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 + {#- Get the `tplroot` from `tpldir` #} {%- set tplroot = tpldir.split('/')[0] %} {%- from tplroot ~ "/map.jinja" import arvados with context %} diff --git a/arvados/controller/resources/virtual_machines.sls b/arvados/controller/resources/virtual_machines.sls index 3ee67f3..c89b543 100644 --- a/arvados/controller/resources/virtual_machines.sls +++ b/arvados/controller/resources/virtual_machines.sls @@ -1,6 +1,10 @@ # -*- coding: utf-8 -*- # vim: ft=sls +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 + {#- Get the `tplroot` from `tpldir` #} {%- set tplroot = tpldir.split('/')[0] %} {%- set sls_config_file = tplroot ~ '.config.file' %} diff --git a/arvados/osfamilymap.yaml b/arvados/osfamilymap.yaml index d6e9df1..f4a628c 100644 --- a/arvados/osfamilymap.yaml +++ b/arvados/osfamilymap.yaml @@ -1,6 +1,10 @@ # -*- coding: utf-8 -*- # vim: ft=yaml # +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 + # Setup variables using grains['os_family'] based logic. # You just need to add the key:values for an `os_family` that differ # from `defaults.yaml` + `osarch.yaml`. diff --git a/arvados/ruby/package/install.sls b/arvados/ruby/package/install.sls index c76c043..4e26538 100644 --- a/arvados/ruby/package/install.sls +++ b/arvados/ruby/package/install.sls @@ -1,6 +1,10 @@ # -*- coding: utf-8 -*- # vim: ft=sls +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 + {#- Get the `tplroot` from `tpldir` #} {%- set tplroot = tpldir.split('/')[0] %} {%- from tplroot ~ "/map.jinja" import arvados with context %} diff --git a/arvados/workbench/package/install.sls b/arvados/workbench/package/install.sls index dff47f6..f8ce077 100644 --- a/arvados/workbench/package/install.sls +++ b/arvados/workbench/package/install.sls @@ -1,6 +1,10 @@ # -*- coding: utf-8 -*- # vim: ft=sls +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 + {#- Get the `tplroot` from `tpldir` #} {%- set tplroot = tpldir.split('/')[0] %} {%- set sls_config_file = tplroot ~ '.config.file' %} diff --git a/pillar.example b/pillar.example index ba5f228..ddd710c 100644 --- a/pillar.example +++ b/pillar.example @@ -1,6 +1,10 @@ # -*- coding: utf-8 -*- # vim: ft=yaml --- +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 + # The variables commented out are the default values that the formula uses. # The uncommented values are REQUIRED values. If you don't set them, running # this formula will fail. diff --git a/test/integration/api/controls/packages_spec.rb b/test/integration/api/controls/packages_spec.rb index 25641d3..7422ceb 100644 --- a/test/integration/api/controls/packages_spec.rb +++ b/test/integration/api/controls/packages_spec.rb @@ -1,4 +1,7 @@ # frozen_string_literal: true +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 control 'arvados api package' do title 'should be installed' diff --git a/test/salt/pillar/examples/nginx_controller_configuration.sls b/test/salt/pillar/examples/nginx_controller_configuration.sls index a79bd41..88d69f4 100644 --- a/test/salt/pillar/examples/nginx_controller_configuration.sls +++ b/test/salt/pillar/examples/nginx_controller_configuration.sls @@ -1,4 +1,8 @@ --- +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 + ### NGINX nginx: ### SERVER diff --git a/test/salt/pillar/examples/nginx_keepproxy_configuration.sls b/test/salt/pillar/examples/nginx_keepproxy_configuration.sls index f1729e7..8500afb 100644 --- a/test/salt/pillar/examples/nginx_keepproxy_configuration.sls +++ b/test/salt/pillar/examples/nginx_keepproxy_configuration.sls @@ -1,4 +1,8 @@ --- +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 + ### NGINX nginx: ### SERVER diff --git a/test/salt/pillar/examples/nginx_keepweb_configuration.sls b/test/salt/pillar/examples/nginx_keepweb_configuration.sls index 1250d89..5385430 100644 --- a/test/salt/pillar/examples/nginx_keepweb_configuration.sls +++ b/test/salt/pillar/examples/nginx_keepweb_configuration.sls @@ -1,4 +1,8 @@ --- +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 + ### NGINX nginx: ### SERVER diff --git a/test/salt/pillar/examples/nginx_passenger.sls b/test/salt/pillar/examples/nginx_passenger.sls index ec79746..404e861 100644 --- a/test/salt/pillar/examples/nginx_passenger.sls +++ b/test/salt/pillar/examples/nginx_passenger.sls @@ -1,4 +1,8 @@ --- +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 + {%- if grains.os_family in ('RedHat',) %} {%- set passenger_pkg = 'nginx-mod-http-passenger' %} {%- set passenger_mod = '/usr/lib64/nginx/modules/ngx_http_passenger_module.so' %} diff --git a/test/salt/pillar/examples/nginx_webshell_configuration.sls b/test/salt/pillar/examples/nginx_webshell_configuration.sls index 050adf9..661ce2c 100644 --- a/test/salt/pillar/examples/nginx_webshell_configuration.sls +++ b/test/salt/pillar/examples/nginx_webshell_configuration.sls @@ -1,4 +1,8 @@ --- +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 + # This parameter will be used here to generate a list of upstreams and vhosts. # This dict is here for convenience and should be managed some other way, but the # different ways of orchestration that can be used for this are outside the scope diff --git a/test/salt/pillar/examples/nginx_websocket_configuration.sls b/test/salt/pillar/examples/nginx_websocket_configuration.sls index f50f40e..5c228ba 100644 --- a/test/salt/pillar/examples/nginx_websocket_configuration.sls +++ b/test/salt/pillar/examples/nginx_websocket_configuration.sls @@ -1,4 +1,8 @@ --- +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 + ### NGINX nginx: ### SERVER diff --git a/test/salt/pillar/examples/nginx_workbench2_configuration.sls b/test/salt/pillar/examples/nginx_workbench2_configuration.sls index c633649..13c1da0 100644 --- a/test/salt/pillar/examples/nginx_workbench2_configuration.sls +++ b/test/salt/pillar/examples/nginx_workbench2_configuration.sls @@ -1,4 +1,8 @@ --- +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 + {%- if grains.os_family in ('RedHat',) %} {%- set group = 'nginx' %} {%- else %} diff --git a/test/salt/pillar/examples/nginx_workbench_configuration.sls b/test/salt/pillar/examples/nginx_workbench_configuration.sls index 34d8221..7c03d3a 100644 --- a/test/salt/pillar/examples/nginx_workbench_configuration.sls +++ b/test/salt/pillar/examples/nginx_workbench_configuration.sls @@ -1,4 +1,8 @@ --- +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 + {%- if grains.os_family in ('RedHat',) %} {%- set group = 'nginx' %} {%- else %} diff --git a/test/salt/states/examples/single_host/snakeoil_certs.sls b/test/salt/states/examples/single_host/snakeoil_certs.sls index 6ac8f87..87211f3 100644 --- a/test/salt/states/examples/single_host/snakeoil_certs.sls +++ b/test/salt/states/examples/single_host/snakeoil_certs.sls @@ -1,3 +1,7 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 + {%- set curr_tpldir = tpldir %} {%- set tpldir = 'arvados' %} {%- from "arvados/map.jinja" import arvados with context %}