Skip to content

Commit

Permalink
Finally having nginx configured properly, yeey me
Browse files Browse the repository at this point in the history
  • Loading branch information
iuliana committed Sep 13, 2021
1 parent ef5cfe6 commit 8d8d7f1
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 8 deletions.
2 changes: 1 addition & 1 deletion catalog/common-types/nginx.bom
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ brooklyn.catalog:
dontRequireTtyForSudo: true
start.timeout: 20m
sshMonitoring.enabled: false
app.port: 8080
app.port: 80

shell.env:
APP_PORT: $brooklyn:config("app.port")
Expand Down
15 changes: 12 additions & 3 deletions catalog/common-types/tomcat9.bom
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,16 @@ brooklyn.catalog:
enricher.targetSensor: $brooklyn:sensor("main.uri")
enricher.targetValue:
$brooklyn:formatString:
- "http://%s:%s"
- $brooklyn:attributeWhenReady("host.name")
- $brooklyn:config("app.port")
- "http://%s:%s"
- $brooklyn:attributeWhenReady("host.name")
- $brooklyn:config("app.port")
- type: org.apache.brooklyn.enricher.stock.Transformer
brooklyn.config:
enricher.sourceSensor: $brooklyn:sensor("host.name")
enricher.targetSensor: $brooklyn:sensor("main.page.url")
enricher.targetValue:
$brooklyn:formatString:
- "%s:%s"
- $brooklyn:attributeWhenReady("host.name")
- $brooklyn:config("app.port")

7 changes: 3 additions & 4 deletions catalog/three-tier-webapp/three-tier-webapp.bom
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ brooklyn.catalog:
items:
- id: brooklyn-three-tier-webapp
name: *threeTierWebappName
iconUrl: classpath://icons/3tier.png
description: *threeTierWebappDescription
itemType: entity
item:
Expand Down Expand Up @@ -71,7 +72,7 @@ brooklyn.catalog:
transformation: average
- type: org.apache.brooklyn.enricher.stock.Aggregator
brooklyn.config:
enricher.sourceSensor: $brooklyn:sensor("host.public.address") # not sure about this one
enricher.sourceSensor: $brooklyn:sensor("main.page.url")
enricher.targetSensor: $brooklyn:sensor("addr.list")
enricher.aggregating.fromMembers: true
- type: org.apache.brooklyn.enricher.stock.Joiner
Expand All @@ -95,11 +96,9 @@ brooklyn.catalog:
id: nginx
name: Load Balancer (nginx)
brooklyn.config:
app.port: 8080
#loadbalancer.serverpool: $brooklyn:entity("cluster")
app.port: 80
server.list: $brooklyn:entity("cluster").attributeWhenReady("addr.list.string")
nginx.sticky: false
#ssl: $brooklyn:config("ssl")
- type: org.apache.brooklyn.entity.database.mysql5
id: db
name: DB (MySQL)
Expand Down
Binary file added resources/icons/3tier.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 8d8d7f1

Please sign in to comment.