Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

URL Cleanup #41

Open
wants to merge 1 commit into
base: edgware
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Here is the UI

![UI](img/Brewery_UI.png)

- Go to the presenting service (http://localhost:9991 or to http://brewery-presenting.${PCF_DOMAIN}) and order ingredients. `PCF_DOMAIN` is the domain set to your CF installation. If you deploy to Pivotal Web Services it will default to `cfapps.io` (so the link for PWS will be http://brewery-presenting.cfapps.io) **(1)**
- Go to the presenting service (http://localhost:9991 or to http://brewery-presenting.${PCF_DOMAIN}) and order ingredients. `PCF_DOMAIN` is the domain set to your CF installation. If you deploy to Pivotal Web Services it will default to `cfapps.io` (so the link for PWS will be https://brewery-presenting.cfapps.io) **(1)**
- A request from the presenting service is sent to the aggregating service when order is placed **(2)**
- A "PROCESS-ID" header is set and will be passed through each part of beer brewing

Expand Down
4 changes: 2 additions & 2 deletions acceptance-tests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ from that enum. E.g.
In addition to this you can provide a couple of more parameters:

```
# will point to the desired URL to find the all services (e.g. http://192.168.99.100), Useful when working
# will point to the desired URL to find the all services (e.g. https://192.168.99.100), Useful when working
# with docker-machine
-DLOCAL_URL=http://192.168.99.100
-DLOCAL_URL=https://192.168.99.100
```
2 changes: 1 addition & 1 deletion brewing/manifest-brewery.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ applications:
- brewery-config-server
env:
SPRING_PROFILES_ACTIVE: cloud
spring.cloud.config.uri: http://brewery-config-server.cfapps.io
spring.cloud.config.uri: https://brewery-config-server.cfapps.io
DEBUG: "true"
JAVA_OPTS: -Djava.security.egd=file:///dev/urandom
2 changes: 1 addition & 1 deletion brewing/manifest-docsbrewing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ applications:
- docsbrewing-config-server
env:
SPRING_PROFILES_ACTIVE: cloud,cloud-docsbrewing
spring.cloud.config.uri: http://docsbrewing-config-server.cfapps.io
spring.cloud.config.uri: https://docsbrewing-config-server.cfapps.io
DEBUG: "true"
JAVA_OPTS: -Djava.security.egd=file:///dev/urandom
2 changes: 1 addition & 1 deletion presenting/src/main/resources/static/js/bootstrap.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion presenting/src/main/resources/static/js/dhtmlxslider.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion presenting/src/main/resources/static/js/exporting.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions presenting/src/main/resources/static/js/highcharts.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion zookeeper/src/main/resources/zoo.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ clientPort=2181
# Be sure to read the maintenance section of the
# administrator guide before turning on autopurge.
#
# http://zookeeper.apache.org/doc/current/zookeeperAdmin.html#sc_maintenance
# https://zookeeper.apache.org/doc/current/zookeeperAdmin.html#sc_maintenance
#
# The number of snapshots to retain in dataDir
#autopurge.snapRetainCount=3
Expand Down