Skip to content
Permalink
Browse files

Merge pull request #3134 from forseti-security/forsetisecurity.org-dev

[WEBSITE] Updates for v2.19.1 merge dev into org
  • Loading branch information...
red2k18 committed Aug 23, 2019
2 parents 21781d4 + 86bc438 commit 7fce514a33ab058ea4c3d27361a9ef839ff613af
Showing with 5 additions and 5 deletions.
  1. +2 −2 .travis.yml
  2. +1 −1 _config.yml
  3. +1 −1 _docs/_latest/setup/manual.md
  4. +1 −1 travis/jekyll_build.sh
@@ -16,10 +16,10 @@ branches:
env:
global:
- NOKOGIRI_USE_SYSTEM_LIBRARIES=true
- secure: Br1GCNbRB0Q3lgUW1xq9ULFd+wQdE6YdHYqDlt51007s88KBsY5J/yhvfGQss4EDodxCTZQRPfvDqngdUKjFVARjSezv91vRBIuE5JJfJGLuYTmRmLlUj0I7P5tdJPgkPBbIBy7Nwf8ztjS1qvkib1/Yi+DEvC8CfQ/34zvTpyiAmYuOrON7ThCm+20r3boVEwpKZ9xUjTPU7rkaDPEv8ksQwek/rie9VCGGOdyv3sOascICTCsyZjYCYitSQ2oqSXfRBN3K6+4Pb8UufeE1hLvoDOBrbJIikSTk+1o6+gXFd2ME0IHvgS2pR2vNkoFCM3Wgg1dT4XNMKk1MZopDBQNMTX0DeNbw6wkfr/bIGzzrCGf7t2cc7ziK45Neup1vDldfuwWrvV3IWsIaAeYuLmQ8r6CUSd9Th/x+keg+Lt1r1OODz5pTV+lheNErrFs3PJpJwsFFc2FkuCCTuwSDxf3UveWIgmHKX6aZWr6TwMU7xpclWftb0bJKxn9+sS8zsXNM/V2Wj90YgpMJpqIXIGN3/8+bJzGXn/5+pz0WfzAczHfkyu/PyCmcleRxody3pE/YoiXrM6kIUNOGDqp6pSkZxYt/DtRRvr/G67oyz2aTKML0wpvThezxiWcGv0tKyrYAeL+7ES9dOYJM0CwNkgVt3/UNR17pAgDYDb3FuBs=
- secure: V/fso4UUFIQuDFR5P16BjjvzlmTatZH4lAJfbOoG+bphdYgUljrakaGHY7dmFKP8AbTaK9iU897m/gRS2e8wowVZETaac6KBulkbZNoFpaYAju4MAZ/5GAkznOnlC7OuFBWRqnFr49BD9cWd7oTIOGjyX6DcmQTcAZbW63sJElA0tTX0l+o//f9IyCSROclo8WJT0Pa7jqbQINpfNLjdsoeyhcfMtERCFnhL+4vxEdptwAd/lZaoEisYKVMFzZz8VQoredNColkGzqFFqs63FVYWWiAIDxVK5quBPt0ASBO5VwC7X3xq/+yMRKcnTk53j7XTaMPT2kLUZyJDa1I3xElkJmlngezBfO2gwHo7nQQJa6qVyP6x2mjmLeQieWHUrM88wEbmRJGXXKmrp80MBq1G+lkmpMHjUts/kxLwzEcJmCBMcLslbcXUYaHx+XDM0nf8jBlQ8sd/rxp1pKVm+xaBWJQ43/qJ6TKvNp4ewhJWx8sDen1INDgjAIGLB3A4R4+wFA4KX1nvZT1/PGuihc4qNFMx5HtdbE2IAtEvKfhrOp6ug9OBTWicwH6PX73hs23tMIIXD2WRLB1e8X8uSrA9ea1OsOeW9/FxHqtNSHmy3j51wG3YyAR5O/Gvse2fkuz+/VSBLlnm76NykrkmAf7Tu/pyuIHPbDnFmzb5m+g=
script:
- 'if [[ "$TRAVIS_SECURE_ENV_VARS" = "true" ]]; then bash ./travis/jekyll_build.sh; fi'
- 'if [[ "$TRAVIS_SECURE_ENV_VARS" != "true" ]]; then bundle exec jekyll build; fi'
- 'if [[ "$TRAVIS_SECURE_ENV_VARS" != "true" ]]; then travis_wait bundle exec jekyll build; fi'
before_deploy:
- openssl aes-256-cbc -K $encrypted_5d3a31857ace_key -iv $encrypted_5d3a31857ace_iv -in client-secrets.json.enc -out client-secrets.json -d
- mv _www/www/app.yaml _www/
@@ -46,7 +46,7 @@ markdown: kramdown
destination: _www/www/

# Needed for local builds and using {{ site.github }}.
repository: GoogleCloudPlatform/forseti-security
repository: forseti-security/forseti-security
title: "Forseti Security"

# Jekyll related directives.
@@ -36,7 +36,7 @@ gcloud services enable <API URI>

## Deploy a server VM

### Create a Forseti server service sccount
### Create a Forseti server service account

Create a server service account by running the following command:

@@ -29,7 +29,7 @@ kill %1
bundle exec htmlproofer --check-img-http --check-html \
--internal-domains 'forsetisecurity.org' \
--check-favicon --report-missing-names --report-script-embeds \
--url-ignore '/GoogleCloudPlatform/forseti-security/edit/,/maxcdn.bootstrapcdn.com/,/d3js.org/' \
--url-ignore '/GoogleCloudPlatform/forseti-security/edit/,/forseti-security/forseti-security/edit/,/maxcdn.bootstrapcdn.com/,/d3js.org/' \
--file-ignore '/develop/reference/' './_www/www/'

exit ${return_code}

0 comments on commit 7fce514

Please sign in to comment.
You can’t perform that action at this time.