diff --git a/.travis.yml b/.travis.yml index ede60e93..ba9cd614 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,9 +16,9 @@ before_install: - docker exec build git clone https://github.com/Comcast/talaria.git - docker exec build git clone https://github.com/Comcast/talaria.git codecovio_build - - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then openssl aes-256-cbc -K $encrypted_dd7f1049d1ce_key -iv $encrypted_dd7f1049d1ce_iv -in keys/RPM-GPG-KEY-comcast-webpa.private.enc -out keys/RPM-GPG-KEY-comcast-webpa.private -d; fi' - - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker cp keys/RPM-GPG-KEY-comcast-webpa.private build:/RPM-GPG-KEY-comcast-webpa.private; fi' - - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker exec build bash -c "gpg --allow-secret-key-import --import /RPM-GPG-KEY-comcast-webpa.private"; fi' + - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then openssl aes-256-cbc -K $encrypted_80fea5e24838_key -iv $encrypted_80fea5e24838_iv -in keys/RPM-GPG-KEY-comcast-xmidt.private.enc -out keys/RPM-GPG-KEY-comcast-xmidt.private -d; fi' + - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker cp keys/RPM-GPG-KEY-comcast-xmidt.private build:/RPM-GPG-KEY-comcast-xmidt.private; fi' + - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then docker exec build bash -c "gpg --allow-secret-key-import --import /RPM-GPG-KEY-comcast-xmidt.private"; fi' - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then docker exec build bash -c "pushd talaria; git fetch origin +refs/pull/${TRAVIS_PULL_REQUEST}/merge && git checkout -qf FETCH_HEAD; popd"; fi' - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then docker exec build bash -c "pushd codecovio_build; git fetch origin +refs/pull/${TRAVIS_PULL_REQUEST}/merge && git checkout -qf FETCH_HEAD; popd"; fi' @@ -39,7 +39,7 @@ deploy: api_key: "$AUTH_TOKEN_BUILD" file: - x86_64/$BINARY_NAME - - keys/RPM-GPG-KEY-comcast-webpa + - keys/RPM-GPG-KEY-comcast-xmidt skip_cleanup: true on: condition: "$TRAVIS_PULL_REQUEST = false" diff --git a/README.md b/README.md index 7ab9e786..0cccaf1b 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ [![Go Report Card](https://goreportcard.com/badge/github.com/Comcast/talaria)](https://goreportcard.com/report/github.com/Comcast/talaria) [![Apache V2 License](http://img.shields.io/badge/license-Apache%20V2-blue.svg)](https://github.com/Comcast/talaria/blob/master/LICENSE) -The Webpa routing agent. +The Xmidt routing agent. # How to Install @@ -16,7 +16,7 @@ The Webpa routing agent. 1. Import the public GPG key (replace `v0.0.1-65alpha` with the release you want) ``` -rpm --import https://github.com/Comcast/talaria/releases/download/v0.0.1-65alpha/RPM-GPG-KEY-comcast-webpa +rpm --import https://github.com/Comcast/talaria/releases/download/v0.0.1-65alpha/RPM-GPG-KEY-comcast-xmidt ``` 2. Install the rpm with yum (so it installs any/all dependencies for you) diff --git a/build_rpm.sh b/build_rpm.sh index dca6a9ea..60ba0add 100755 --- a/build_rpm.sh +++ b/build_rpm.sh @@ -35,7 +35,7 @@ cat ChangeLog >> ${NAME}.spec yes "" | rpmbuild -ba --sign \ --define "_signature gpg" \ - --define "_gpg_name Comcast Webpa Team " \ + --define "_gpg_name Comcast Xmidt Team " \ --define "_ver $release" \ --define "_releaseno ${BUILD_NUMBER}" \ --define "_fullver $new_release" \ diff --git a/keys/RPM-GPG-KEY-comcast-webpa b/keys/RPM-GPG-KEY-comcast-webpa deleted file mode 100644 index 763fbd4a..00000000 --- a/keys/RPM-GPG-KEY-comcast-webpa +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQINBFjZUOcBEAC31Y+C01Bc9kiXfSI3we/K7s2Jdw1wYnIhPkkQx+ptUmTZDjqn -ZSi4WznyuQJEUmSpgrd/gVfbKeh8YYd3fHg5iyI4AVxy1yIsS7231K28Yly8Xe6B -CYB7USzIFy8lS18cZRmv/7UXDJeZMQtPPbr/BlIaxpdvl3tPPlRehOmgyNI1i5Cz -3c2Q2RffsgnprBluGtiiEn8ov9bFwjFsJ9YsO78qvptlecu+s3gY8WQgv3cuhe7y -6BqXENNBNvOhmyost2cRxnwVkBWTHErAOAP/UFD1hZAp7EcrKIpq2HnVYmTbPv4v -k3MM9M7+SiwrEz7iQAoxnDOEzKmZ8Ebcbqi1/E1Ve+YJ9SHUnF7RYupW7tUZN/6i -2cJDTX5h9RMY86Qxr9TAHgy49u8p+Foiw+HCWtlUlQH7bhtBuuUGrn1Y7LAO2mIX -Jea6hgVrAfgbRDfVi6ajJQT2EU/LlgqFUMkJnmgkTgPxg0ZFvux5yqm1ILgFtT28 -tcb/iSoNMllnhYAX5lSFTZj9iQlRi7pZZFlbMygzfaDJirsiDY+JrgK3+nOY6FFi -f1rqDY3bNWAzBZiSlZENckD8RmFtJEL7ge2OzKkJ52GYOxcn4CHU4IjUWbo1o0Lh -JWe+CnxGNnRIMChNy+yioE9YDooZdnzEt9T4dQlrCx0/n00m3vpKTt76vwARAQAB -tDBDb21jYXN0IFdlYnBhIFRlYW0gPENIUVNWLVdlYnBhLUdwZ0Bjb21jYXN0LmNv -bT6JAjgEEwECACIFAljZUOcCGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJ -EH7U9YbWQlPwmJMP/1HJfa2mkCkkx2UxxesbVTG9TiYJGBcfOH7mXMaZvNREZKms -i3q0a61CALrl/qExHY6xWfPcENuT+okeiaAEOcayV8UgaNzLQnArvjlzL4T3OElX -3PFEQVXcoNx7DwxU9gIvvv0snUFokXwmNIbmrSpXKdfjLKZ0HDVfGE5JQ8ZFBHhC -ihXV6CXugHrt2i6ttPpcsIwXXQpVWtDyJ+NXptuRclfNa2a1RCZZNe28w2kTwSOR -NWCZ6b0+L6zAl7TMw/yiP/SsgIpTotB+q5z/DxiFShYM9iFpJPmbBPu7ESERsoCy -j5AKFxVg/q/gPl46w6Yqn5HF/OH3l2pBp9snu7moN6g2BbxXsrN30Ji4gVnsS4VS -ndl9yRrks54Q/WpXWT32WErlTktnv0nCjFFqpgCwyK6JMjS3Qgo9xcifU37r9vdk -8gtnZTMOErqjNNJZxBYzbt8ayZQMSmOa89Fu6cLlSg5kfMfHeh/QLhChsDtxseU0 -P/Ncu7aZMuivuQPIIvjZNsmzg7uJTdIMGaxiSzVUfTuYu+nEHQOZLAbTlnV6FTRh -cL9Bqel/He2E6zRYjMcq2JKsAtGD70FaFXhvUlkOm5t0v5smNb6dH578zGhmiPRa -rfsutIwleQj5P1La98gg2VkTcxsTzANbdjhbOpFqnFH6pDjQ1o4p0BhNLCWt -=fVTl ------END PGP PUBLIC KEY BLOCK----- diff --git a/keys/RPM-GPG-KEY-comcast-webpa.private.enc b/keys/RPM-GPG-KEY-comcast-webpa.private.enc deleted file mode 100644 index 277fee5f..00000000 Binary files a/keys/RPM-GPG-KEY-comcast-webpa.private.enc and /dev/null differ diff --git a/keys/RPM-GPG-KEY-comcast-xmidt b/keys/RPM-GPG-KEY-comcast-xmidt new file mode 100644 index 00000000..1ea9da1f --- /dev/null +++ b/keys/RPM-GPG-KEY-comcast-xmidt @@ -0,0 +1,51 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +Suha8WoyLT01KdFY6j4t +=WjGo +-----END PGP PUBLIC KEY BLOCK----- diff --git a/keys/RPM-GPG-KEY-comcast-xmidt.private.enc b/keys/RPM-GPG-KEY-comcast-xmidt.private.enc new file mode 100644 index 00000000..58fc46fb Binary files /dev/null and b/keys/RPM-GPG-KEY-comcast-xmidt.private.enc differ diff --git a/talaria.spec b/talaria.spec index 01c03cff..b40672f5 100644 --- a/talaria.spec +++ b/talaria.spec @@ -3,7 +3,7 @@ Name: talaria Version: %{_ver} Release: %{_releaseno}%{?dist} -Summary: The Webpa router agent. +Summary: The Xmidt router agent. Group: System Environment/Daemons License: ASL 2.0 @@ -14,7 +14,7 @@ BuildRequires: golang >= 1.8 Requires: supervisor %description -The Webpa router agent. +The Xmidt router agent. %prep %setup -q