Provide uaa.port default value through spec file

cloudfoundry-attic · Dec 30, 2014 · ffcfe44 · ffcfe44
1 parent 01c0e9b
commit ffcfe44
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/jobs/uaa/spec b/jobs/uaa/spec
@@ -66,7 +66,8 @@ properties:
   uaa.jwt.verification_key:
     description:
   uaa.port:
-    description:
+    description: Port that uaa will accept connections on
+    default: 8080
   uaa.scim.user:
     description:
   uaa.scim.user.override:

diff --git a/jobs/uaa/templates/cf-registrar.config.yml.erb b/jobs/uaa/templates/cf-registrar.config.yml.erb
@@ -13,7 +13,7 @@ uri:
   - uaa.<%= properties.domain %>
 host: <%= spec.networks.send(properties.networks.apps).ip %>
 index: <%= spec.index %>
-port: <%= (properties.uaa && properties.uaa.port) ? properties.uaa.port : 8080 %>
+port: <%= p("uaa.port") %>
 tags:
   component: uaa
 varz:

diff --git a/jobs/uaa/templates/tomcat.server.xml.erb b/jobs/uaa/templates/tomcat.server.xml.erb
@@ -8,7 +8,7 @@
 
   <Service name="Catalina">
 
-    <Connector class="org.apache.coyote.http11.Http11NioProtocol" port="<%= (properties.uaa && properties.uaa.port) ? properties.uaa.port : 8080 %>" protocol="HTTP/1.1" connectionTimeout="20000"/>
+    <Connector class="org.apache.coyote.http11.Http11NioProtocol" port="<%= p("uaa.port") %>" protocol="HTTP/1.1" connectionTimeout="20000"/>
     <Engine name="Catalina" defaultHost="localhost">
 
       <Host name="localhost" appBase="webapps" unpackWARs="true" autoDeploy="false">