Skip to content

Commit

Permalink
FAB-3963 add missing license headers
Browse files Browse the repository at this point in the history
Change-Id: Ic46a1c18b03b4dca8425bf7e05211bfeb36a629e
Signed-off-by: Christopher Ferris <[email protected]>
  • Loading branch information
christo4ferris committed Jun 16, 2017
1 parent 989b563 commit 7e72c6e
Show file tree
Hide file tree
Showing 10 changed files with 61 additions and 5 deletions.
1 change: 0 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ This repository is part of the Fabric project.
Please consult [Fabric's CONTRIBUTING documentation](https://github.com/hyperledger/fabric/blob/master/docs/CONTRIBUTING.md) for information on how to contribute to this repository.

<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
s
1 change: 0 additions & 1 deletion MAINTAINERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ This repository is part of the Fabric project.
Please consult [Fabric's MAINTAINERS documentation](https://github.com/hyperledger/fabric/blob/master/docs/MAINTAINERS.md) for the list of people maintaining this repository.

<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
s
5 changes: 5 additions & 0 deletions docker/.env
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
CA_CERTIFICATE=ec.pem
CA_KEY_CERTIFICATE=ec-key.pem
FABRIC_CA_CONFIG=server-config.json
Expand Down
5 changes: 5 additions & 0 deletions docker/examples/client-server-flow/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
fabric-ca:
image: hyperledger/fabric-ca
container_name: fabric-ca
Expand Down
5 changes: 5 additions & 0 deletions docker/server/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
fabric-ca-server:
image: hyperledger/fabric-ca
container_name: fabric-ca-server
Expand Down
30 changes: 29 additions & 1 deletion docs/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,33 @@
# Minimal makefile for Sphinx documentation
#
# License for Sphinx
# ==================
#
# Copyright (c) 2007-2017 by the Sphinx team (see AUTHORS file).
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
# * Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

# You can set these variables from the command line.
SPHINXOPTS =
Expand All @@ -17,4 +45,4 @@ help:
# Catch-all target: route all unknown targets to Sphinx using the new
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
%: Makefile
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
1 change: 1 addition & 0 deletions release_notes/v1.0.0-beta.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ none
## Known Issues & Workarounds

## [Change Log](https://github.com/hyperledger/fabric-ca/blob/master/CHANGELOG.md#v100-beta)
<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
5 changes: 5 additions & 0 deletions scripts/fvt/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
version: "2"

services:
Expand Down
7 changes: 6 additions & 1 deletion scripts/fvt/fabric-ca_utils
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
#!/bin/bash
#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
export FABRIC_CA="$GOPATH/src/github.com/hyperledger/fabric-ca"
export FABRIC_CA_CLIENTEXEC="/usr/local/bin/fabric-ca-client"
export FABRIC_CA_SERVEREXEC="/usr/local/bin/fabric-ca-server"
Expand Down Expand Up @@ -270,7 +275,7 @@ reenroll() {
ENROLLCONFIG="$FABRIC_CA_CLIENT_HOME/enroll.yaml"
export FABRIC_CA_CLIENT_HOME
setTLS
$FABRIC_CA_CLIENTEXEC reenroll -u $PROTO$HOST:$PORT $TLSOPT -c $ENROLLCONFIG
$FABRIC_CA_CLIENTEXEC reenroll -u $PROTO$HOST:$PORT $TLSOPT -c $ENROLLCONFIG
RC=$?
$($FABRIC_CA_DEBUG) && printAuth $FABRIC_CA_CERT_FILE $FABRIC_CA_KEY_FILE
$SCRIPTDIR/fabric-ca_setup.sh -L -d $driver
Expand Down
6 changes: 5 additions & 1 deletion scripts/fvt/utils/pki
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#!/bin/bash

#
# Copyright IBM Corp. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
function usage {
echo ""
echo "pki - create self-signed, CA, user and CA-signed certificates"
Expand Down

0 comments on commit 7e72c6e

Please sign in to comment.