From 6fd07f53591aa686955c46c4f7164744428a6f95 Mon Sep 17 00:00:00 2001 From: Nakul Manchanda Date: Sun, 7 Apr 2019 18:10:21 -0500 Subject: [PATCH] updated cert and added scripts Signed-off-by: Nakul Manchanda --- package-lock.json | 6 ++-- package.json | 2 +- sample-node-api.yml | 2 +- scripts/restart-sample-node-api.sh | 2 +- scripts/start-sample-node-api.sh | 7 ++-- scripts/stop-sample-node-api.sh | 5 +++ sslcert/server.cert | 41 ++++++++++++----------- sslcert/server.key | 52 +++++++++++++++--------------- 8 files changed, 62 insertions(+), 55 deletions(-) create mode 100644 scripts/stop-sample-node-api.sh diff --git a/package-lock.json b/package-lock.json index 2b2e08e..1590c8a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -690,9 +690,9 @@ } }, "js-yaml": { - "version": "3.12.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz", - "integrity": "sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==", + "version": "3.13.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz", + "integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==", "requires": { "argparse": "^1.0.7", "esprima": "^4.0.0" diff --git a/package.json b/package.json index 815cf89..4d5e016 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "index.js", "scripts": { "start": "node server/app.js", - "test": "istanbul cover cucumber-js -- test/features/*feature --require test/support/ --report cobertura --report html --tags \"not @leave\"" + "test": "istanbul cover ./node_modules/cucumber/bin/cucumber-js -- test/features/*feature --require test/support/ --report cobertura --report html --tags \"not @leave\"" }, "author": "", "license": "ISC", diff --git a/sample-node-api.yml b/sample-node-api.yml index c744c2b..e4deede 100644 --- a/sample-node-api.yml +++ b/sample-node-api.yml @@ -17,5 +17,5 @@ services: catalogUiTiles: sample-node-api: - title: Sample-Node-api + title: Sample-Node-Api description: Example Node.js Application \ No newline at end of file diff --git a/scripts/restart-sample-node-api.sh b/scripts/restart-sample-node-api.sh index 79f30b8..dc4d5cc 100644 --- a/scripts/restart-sample-node-api.sh +++ b/scripts/restart-sample-node-api.sh @@ -4,4 +4,4 @@ echo 'restarting sample node api...' ps -elf | awk '/node/ && /app.js/ && !/sh -c/' | awk '{print $3}' | xargs kill -9 $1 ./start-sample-node-api.sh sleep 30 -echo 'restart done' \ No newline at end of file +echo 'restart sample node api done' \ No newline at end of file diff --git a/scripts/start-sample-node-api.sh b/scripts/start-sample-node-api.sh index 1c2caa8..c7e10e0 100644 --- a/scripts/start-sample-node-api.sh +++ b/scripts/start-sample-node-api.sh @@ -2,7 +2,9 @@ # find node bin # export NODE_HOME=/usr/lpp/IBM/cnj/IBM/node-v6.14.4-os390-s390x -# export NODE_HOME=/usr/lpp/IBM/cnj/IBM/node-v6.14.4-os390-s390x +# export NODE_HOME=/Z23B/usr/lpp/IBM/cnj/IBM/node-v6.14.4-os390-s390x + +echo 'starting sample node api...' if [ ! -z "$NODE_HOME" ]; then NODE_BIN=${NODE_HOME}/bin/node NPM_CLI=${NODE_HOME}/lib/node_modules/npm/bin/npm-cli.js @@ -18,4 +20,5 @@ SCRIPT_DIR=$(dirname "$0") cd "$SCRIPT_DIR/.." # start service -$NODE_BIN $NPM_CLI run start > sample-node-api.log & \ No newline at end of file +$NODE_BIN $NPM_CLI run start & +echo 'starting sample node api done' diff --git a/scripts/stop-sample-node-api.sh b/scripts/stop-sample-node-api.sh new file mode 100644 index 0000000..afd8dc6 --- /dev/null +++ b/scripts/stop-sample-node-api.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +echo 'stopping sample node api...' +ps -elf | awk '/node/ && /app.js/ && !/sh -c/' | awk '{print $2}' | xargs kill -9 $1 +echo 'stop sample node api done' \ No newline at end of file diff --git a/sslcert/server.cert b/sslcert/server.cert index 5c2fa81..089a6d9 100644 --- a/sslcert/server.cert +++ b/sslcert/server.cert @@ -1,23 +1,22 @@ -----BEGIN CERTIFICATE----- -MIIDzjCCArYCCQDD8e39qIYy8DANBgkqhkiG9w0BAQsFADCBqDELMAkGA1UEBhMC -VUsxEjAQBgNVBAgMCUhhbXBzaGlyZTEQMA4GA1UEBwwHSHVyc2xleTENMAsGA1UE -CgwEWm93ZTEZMBcGA1UECwwQSUJNIENvbnRyaWJ1dGlvbjEgMB4GA1UEAwwXWm93 -ZSBFeHBsb3JlciBVSSBTZXJ2ZXIxJzAlBgkqhkiG9w0BCQEWGGphY2stdGllZmVu -Zy5qaWFAaWJtLmNvbTAeFw0xODEyMTQyMDExNTNaFw0xOTAxMTMyMDExNTNaMIGo -MQswCQYDVQQGEwJVSzESMBAGA1UECAwJSGFtcHNoaXJlMRAwDgYDVQQHDAdIdXJz -bGV5MQ0wCwYDVQQKDARab3dlMRkwFwYDVQQLDBBJQk0gQ29udHJpYnV0aW9uMSAw -HgYDVQQDDBdab3dlIEV4cGxvcmVyIFVJIFNlcnZlcjEnMCUGCSqGSIb3DQEJARYY -amFjay10aWVmZW5nLmppYUBpYm0uY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A -MIIBCgKCAQEA24xKwcttg982Rzx5OTgx2VE/9bhzQudCt9qed8rGaigpXrDo5Led -sStq53n76kBXGCc8v2yGqbXRcKp6pVjTHWLqltNV7NNUAy4qfkWLkGxeN4HCo9Cf -CdKR5caYsToBsyeLUx1GXAPhSkvR3fi6ItAb/7KMAREWVW3Z/NvYYnclzXJsVNIl -tLzC64A5OrgrEDzVxuLkMcz6GgjPD3BSEKOyYxJlnvs9N9Xk3I0keNfSEKzAsMtn -uVnvse2TLrVS/b4W4jMNLq0alRrBOcP9SxA6X+jK3cCpASEFjmm6yf+PFjBbgY56 -4M/bUYKnzI/JNpHQyDLj0MxfRosECcL79QIDAQABMA0GCSqGSIb3DQEBCwUAA4IB -AQCeaURSLVtoB+OoXdzZAbP6+oZVlx4pMYKjFN3am0RB3LBlvz6tHcMrQ1lRrJ8w -KaIcjV5zJMecswutdlqYGsbA+fOeisSJxSVLWaWt80U+nwWhRL4Y+GXBKzoFArl+ -OeaJIicTRnV/CDLC5SeBcbtrBJAjHbDXRNW7Ezm4TOeeBHEz5QCQ9l5EtRQ/PMYp -Q/y3z8Gmkrm1X7s6Yd25ELM7d9mOPc753w7Y6vqdOeH1/6meNP7cC3f/u2Y7DUk9 -HjuUwWtXkpHBMFkb7Zp8l7mZsczf142yDUo7oD2+rSDf3al6f+c9hRU/VylX7jQ4 -Clrk5EZYl1xu/wKrlavYxfN8 +MIIESTCCAzGgAwIBAgIEENQ8UDANBgkqhkiG9w0BAQsFADCBnjELMAkGA1UEBhMCQ1oxDzANBgNV +BAgTBlByYWd1ZTEPMA0GA1UEBxMGUHJhZ3VlMRQwEgYDVQQKEwtab3dlIFNhbXBsZTEcMBoGA1UE +CxMTQVBJIE1lZGlhdGlvbiBMYXllcjE5MDcGA1UEAxMwWm93ZSBEZXZlbG9wbWVudCBJbnN0YW5j +ZXMgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MB4XDTE5MDIyNTE1MDgwN1oXDTI5MDIyMjE1MDgwN1ow +ejELMAkGA1UEBhMCQ1oxDzANBgNVBAgTBlByYWd1ZTEPMA0GA1UEBxMGUHJhZ3VlMRQwEgYDVQQK +Ewtab3dlIFNhbXBsZTEcMBoGA1UECxMTQVBJIE1lZGlhdGlvbiBMYXllcjEVMBMGA1UEAxMMWm93 +ZSBTZXJ2aWNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8RkvVhBXm3jlaTpGWIZ5 +O8vCEeiMMNk9x85mGPgAIkcJaUtUQ0dJvqoKfyD92VbWZQUvlVnlIdz0Wu9guaJAhByw70mdk89r +0qccAKwhPs/xwXLgnpCI0essvHKmMumbrcg5bXOyFqv/9YHfEn27k3we/1s8+fHuV454UQ6tj4dj +9lhvQ2BpYVz2GtzYOEubur5Ys66QTuDGugRuCiE4purNro5kDW8WsCagK2mo+a74SEE4gE2JlMIy +rxL+QCZdJXpc7E0ZyYOn1xkSeYq46ht+xSCrNNwLKXaX4WdxAFpB/GoT5PtUQPaCvIEpwxcjpnDL +Mt6DusgYG9o2DRv9VQIDAQABo4GxMIGuMB8GA1UdIwQYMBaAFBzzpabG3xATspaHCeBk4ZT8loEM +MB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAOBgNVHQ8BAf8EBAMCBPAwPQYDVR0RBDYw +NIIEUzBXMYcECpU8koIVbG9jYWxob3N0LmxvY2FsZG9tYWlugglsb2NhbGhvc3SHBH8AAAEwHQYD +VR0OBBYEFM4X/BNrNwKnqa6bt77KN4xzV6OIMA0GCSqGSIb3DQEBCwUAA4IBAQBrcOlS0GKO3Jen +xrMKJOht+Siq6e6CZWz+hzoRU52Jy7Zw/oIiBgzVqND97iC/pxprbh/q8rkJsxom6Zv93qCpsz9K +BYBgcmokFIsAoOaEJBdWK1moaG1+EHkNX5PVWgTHsHoYU3DTRfCOZm8xrVIs7Itp7jGn9yCP3p0d +JjEcImj9cqgZz7eXKYeO3EnU4s/NacVEKNj2oULhsjNs3DWQS5GJ6gwkn9k/mUVe0NertQMScGxP +GabrXEiAin00Yw6Zg9gv295OXcqGCRcsYuFx+7pPcuHca7NG/6nrWU8/yujwxn72tjmrmFAlRaZk +Xb9jJhqwP2mMevHeYUqh2s2P -----END CERTIFICATE----- \ No newline at end of file diff --git a/sslcert/server.key b/sslcert/server.key index 2c1f286..68383d8 100644 --- a/sslcert/server.key +++ b/sslcert/server.key @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDbjErBy22D3zZH -PHk5ODHZUT/1uHNC50K32p53ysZqKClesOjkt52xK2rnefvqQFcYJzy/bIaptdFw -qnqlWNMdYuqW01Xs01QDLip+RYuQbF43gcKj0J8J0pHlxpixOgGzJ4tTHUZcA+FK -S9Hd+Loi0Bv/sowBERZVbdn829hidyXNcmxU0iW0vMLrgDk6uCsQPNXG4uQxzPoa -CM8PcFIQo7JjEmWe+z031eTcjSR419IQrMCwy2e5We+x7ZMutVL9vhbiMw0urRqV -GsE5w/1LEDpf6MrdwKkBIQWOabrJ/48WMFuBjnrgz9tRgqfMj8k2kdDIMuPQzF9G -iwQJwvv1AgMBAAECggEAYzoA/52lnZhgu8mFMGtJfGLQeYon7fD/ooDYZmPrUUdd -i0KBv/2M8+ofowbq6HCz7GKvfgTayBE426bxT5HZuMpgJFLX3vWUXuuaoP9lmJyh -6IxpIAjGGHZnImaj1FXXNtWEjsgIaMYIKMAj1iL4XYuZW/Oie0jxwyKnBzWFktpY -lmRzJYTz9iXBTOMYaPAJc7DOMZnXLpMVdFNEq9XRG0MQT1vhcHjyfA0gMwek46u7 -6xxYNoK4abFXdSNIIZf6FBUrneSuGxRiFlLXb/lY7A2LxLmvvIa1UpbL6mSxedIx -AVTc+EOml+OLFSzhJ0E0qia9qEsFUNbFT6LT60+CgQKBgQDwLC3jlqXuYqDG3A0B -b06k7JT4wt+yW9Qb7d+ZJISBfQpMpGrow498Rkk8hLU50Y5Yt66cBeI3jALFW6Wb -pKQOJhx2wFXij366ZzhIQixj33wPBeDQUoLAJ/4U9g9F4PTEkLn/IHQhcyAtjddh -kGxyhB2TVEvH5ORAOCA8jY2heQKBgQDqBCrD6WukOlgS/ik5a0zg20dS/It3vDtH -aZZ7T1Q/DpFPvIszmP0rWF4fXtzcaoFhFq7O3yhBY9gbLGRFEzXq0XvyCiU/XdrF -uePf7jdy7irmxvy0WF3NhpRP1B8rC1/P2XRNH6d6nu6JxPuqu3pjxUQVfyrJH+av -cIdxULArXQKBgQCBLxJDz31TGyPlsukf83H2zfZXU+Kk+jW+DBXwNq87Qzmt/eYv -azkbnGa6MZuVDP2nBK3b6GJEhH/dDi2m6UkA/0jiKxRHN+3vb6PbYhSkZ8o//mZt -R2Ri3WASgEO4z4Z40GvrKdatQ1J0jk3igZ+DfUK3Q2k7jQek70uPpoge6QKBgA/7 -kOAohQ2GXpWNfktJpMqGr2xfizb2SCYsc/agCGT2Hb6QZgF0JXZcZrFFzVfQfl2f -Kvk+DIXKx+uzMHX3Retvu0NgpgKZ6mMuuv2ES40x7wQr+v5mOqHa2y5IkohiEn0j -oOnTi6C4UhpetcGHZGiEBI5jTQzHfP3mdZmrpRyRAoGBALfk6nv7lASfiLK2S2Jx -4dY9GpzlURGB4DHTIIM+Bky0IZns1VlQ2PtI5hlhMpXEWxuzXAUOx+Hbac5j574L -I7kRaMrytPesaRoBLCs1axwx5kAQf9t+vQhy9uRjF/V42Nw2K/Nw6Kj9inqIcy/e -1SiZl7tZKk5EYCABZVOhILRO +MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDxGS9WEFebeOVp +OkZYhnk7y8IR6Iww2T3HzmYY+AAiRwlpS1RDR0m+qgp/IP3ZVtZlBS+VWeUh3PRa +72C5okCEHLDvSZ2Tz2vSpxwArCE+z/HBcuCekIjR6yy8cqYy6ZutyDltc7IWq//1 +gd8SfbuTfB7/Wzz58e5XjnhRDq2Ph2P2WG9DYGlhXPYa3Ng4S5u6vlizrpBO4Ma6 +BG4KITim6s2ujmQNbxawJqAraaj5rvhIQTiATYmUwjKvEv5AJl0lelzsTRnJg6fX +GRJ5irjqG37FIKs03AspdpfhZ3EAWkH8ahPk+1RA9oK8gSnDFyOmcMsy3oO6yBgb +2jYNG/1VAgMBAAECggEANwvL/fdfOTUCE+NlOkMBnQBpf9M7Zs/CxkK+lsbQqQLV +CEBVrcKx+KE0IlBzBNNJwejMM2pB4VhkRfrPd7KuzjsKvqdtHdlGweK7hv/F22R4 +yvUiibFwO5VZMnFutsMVczj6u52ltH1yxCfxuXQRhpvZK+413s843q69k6wpPlJ2 +ps/Jbc5Re01PDHHwosWBCrQI28ZJ/8dsSFE4/KNtzhgKwAErrpec+CRAFgXemaBy +vRyEbZOnv7XOvtYTiAwBiqixJccRFAQL6CYaL1EuQChyo5eWjb1Q7xDXzc2nor4k +zHS3ZVPhw2KtXB5N89mLWdRGPBztNTXPwJGmwrr5JQKBgQD/1LCWI/Nq4dll766z +OVOBjRmSFHn4vqcv9V8/0Yg5u5Tjfqc5X6z5SrzkD3vvtNQ2G6KSsEIUIamjg2Ex +QkN8DGeqnk8UiMY4mDLaInjoGDU6cUDbkzbuL1vgEnU/xZ4L6eLr+aA5BTMpykPm +AGs5gCzkTJ7K+ETwJiXrznwZkwKBgQDxQgBDPSpQ4kC2esm7LrwWaSoCl3yfzwY+ +gggiDx5ecj3cxeF1LMCZghEOPn1BpwHc9Qu1H53e9CfdKLQaqfVC4X/auZG07OMk +0ZuRgR3vqVKJCUIzoI1fJcUf4z8W0tqauw8AvUKE9jDdnKY+VZOvX8ZJnGd+jZgh +2GyQYmu+dwKBgBF++DysZL9Qhs+j3qy/JOjdP3xwDg9m6oQrIcJ5j/lyzLHqPYF8 ++5Vo+RYXwQAZu9GffjTN/RbnXnSiTYlS4M6hAo32ma3r1LKWJhQo+1/UF//RMwBR +RxZvAreGS6J6314tNqmwvrZnlqIrBQ27xZl/HJLYcpuq8vwBf+Jqkq4lAoGAO8px +qjhUbmtEQnU33a39a0hw4ueMOUbjc0ZioZ5BloKVlktsTs/ig6jadT9DZ6vuKEaK +uj61r3WvE35s9Fa+s+6S8zAeTkqPGKbh+TOYqba6/79NquHVZ4lCy15UWmGzT7mg +RDyjabRh8+pIwRYQXdxMlh2vAIwy8eBjN31M2o0CgYAPxN2JrFyd8nfr3QdGSPV3 +x6eeiRVRx9IXxj2Ne/KbZfjyRUgvPW57dhSLGH7T4cb5H6EcY1ZSipfsZqiirIEg +9gYpeG0mUUFdAmpQRFLK6o1BmEVLLVaV/0lfF7sCSfuAhPeVctE1H6qZ6mBNSM3A +rJFUSZQcCZgWGIl+BcCyKg== -----END PRIVATE KEY----- \ No newline at end of file