Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

More password/token quoting

  • Loading branch information...
commit 0ee42dd9e433086ff2c72cd5d10d97e52d4e3bbb 1 parent c504e9c
Bob Nugmanov and Tim Labeeuw authored
View
2  jobs/atmos_gateway/templates/atmos_gateway.yml.erb
@@ -90,5 +90,5 @@ atmos:
port: <%= properties.atmos.port %>
tenant: <%= properties.atmos.tenant %>
tenantadmin: <%= properties.atmos.tenantadmin %>
- tenantpasswd: <%= properties.atmos.tenantpasswd %>
+ tenantpasswd: "<%= properties.atmos.tenantpasswd %>"
<% end %>
View
8 jobs/cloud_controller/templates/cloud_controller.yml.erb
@@ -110,7 +110,7 @@ uaa:
resource_id: <%= cc_props.uaa.resource_id %>
token_secret: "<%= properties.uaa.cc.token_secret %>"
client_secret: "<%= properties.uaa.cc.client_secret %>"
- token_creation_email_filter: <%= cc_props.uaa.token_creation_email_filter %>
+ token_creation_email_filter: "<%= cc_props.uaa.token_creation_email_filter %>"
<% else %>
uaa:
enabled: false
@@ -133,7 +133,7 @@ staging:
max_staging_runtime: <%= cc_props.max_staging_runtime || 300 %>
auth:
user: <%= cc_props.staging_upload_user %>
- password: <%= cc_props.staging_upload_password %>
+ password: "<%= cc_props.staging_upload_password %>"
allow_debug: <%= cc_props.allow_debug || false %>
@@ -181,7 +181,7 @@ builtin_services:
<% if properties.external_service_tokens %>
<% properties.external_service_tokens.marshal_dump.each do |name,token| %>
<%= name %>:
- token: <%= token %>
+ token: "<%= token %>"
<% end %>
<% end %>
@@ -220,7 +220,7 @@ if cc_props.service_extension && cc_props.service_extension.service_lifecycle
%>
service_lifecycle:
max_upload_size: <%= max_upload_size %>
- upload_token: <%= upload_token %>
+ upload_token: "<%= upload_token %>"
<% if upload_timeout %>
upload_timeout: <%=upload_timeout%>
<% end %>
View
8 jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb
@@ -15,11 +15,11 @@ bootstrap_admin_email: <%= p("ccng.bootstrap_admin_email", "sre@vmware.com") %>
bulk_api:
auth_user: <%= p("ccng.bulk_api_user", "bulk_api") %>
- auth_password: <%= p("ccng.bulk_api_password") %>
+ auth_password: "<%= p("ccng.bulk_api_password") %>"
service_lifecycle:
max_upload_size: 1
- upload_token: <%= p("serialization_data_server.upload_token") %>
+ upload_token: "<%= p("serialization_data_server.upload_token") %>"
upload_timeout: <%= p("serialization_data_server.upload_timeout") %>
<% sds_port = p("serialization_data_server.port") %>
serialization_data_server: <%= properties.service_lifecycle.serialization_data_server.map {|ip| "http://#{ip}:#{sds_port}" } %>
@@ -67,7 +67,7 @@ db:
redis:
host: <%= address %>
port: <%= port %>
- password: <%= password %>
+ password: "<%= password %>"
<% end %>
<% scheme = p("uaa.no_ssl") ? "http" : "https" %>
@@ -88,7 +88,7 @@ staging:
max_staging_runtime: <%= p("ccng.max_staging_runtime", 300) %>
auth:
user: <%= p("ccng.staging_upload_user") %>
- password: <%= p("ccng.staging_upload_password") %>
+ password: "<%= p("ccng.staging_upload_password") %>"
runtimes_file: /var/vcap/jobs/cloud_controller_ng/config/runtimes.yml
stacks_file: /var/vcap/jobs/cloud_controller_ng/config/stacks.yml
View
4 jobs/gorouter/templates/gorouter.yml.erb
@@ -5,7 +5,7 @@
status:
port: <%= port %>
user: <%= user %>
- pass: <%= password %>
+ pass: "<%= password %>"
<% end %>
<% if_p("nats.address",
@@ -15,7 +15,7 @@ status:
nats:
host: <%= address %>:<%= port %>
user: <%= user %>
- pass: <%= password %>
+ pass: "<%= password %>"
<% end %>
logging:
View
4 jobs/login/templates/login_ctl.erb
@@ -62,8 +62,8 @@ case $1 in
<% end %>
# Generate a random usernames and passwords
- username=$RANDOM-$RANDOM-$RANDOM-$RANDOM
- password=$RANDOM-$RANDOM-$RANDOM-$RANDOM
+ username="$RANDOM-$RANDOM-$RANDOM-$RANDOM"
+ password="$RANDOM-$RANDOM-$RANDOM-$RANDOM"
sed -i "s/_random_username_replaced_by_a_script_/${username}/g" $JOB_DIR/config/varz.yml
sed -i "s/_random_password_replaced_by_a_script_/${password}/g" $JOB_DIR/config/varz.yml
View
2  jobs/marketplace_gateway/templates/marketplace_gateway.yml.erb
@@ -46,7 +46,7 @@ service_auth_tokens:
props.service_auth_tokens.fields.each { |offering|
token = props.service_auth_tokens.send(offering.to_sym)
%>
- <%= offering %>: <%= token %>
+ <%= offering %>: "<%= token %>"
<% } %>
token: unused
<% else %>
View
8 jobs/micro/override/cloud_controller/cloud_controller.yml.erb
@@ -103,7 +103,7 @@ uaa:
resource_id: <%= cc_props.uaa.resource_id %>
token_secret: "<%= properties.uaa.cc.token_secret %>"
client_secret: <%= properties.uaa.cc.client_secret %>
- token_creation_email_filter: <%= cc_props.uaa.token_creation_email_filter %>
+ token_creation_email_filter: "<%= cc_props.uaa.token_creation_email_filter %>"
<% else %>
uaa:
enabled: false
@@ -126,7 +126,7 @@ staging:
max_staging_runtime: <%= cc_props.max_staging_runtime || 300 %>
auth:
user: <%= cc_props.staging_upload_user %>
- password: <%= cc_props.staging_upload_password %>
+ password: "<%= cc_props.staging_upload_password %>"
allow_debug: <%= cc_props.allow_debug || false %>
@@ -174,7 +174,7 @@ builtin_services:
<% if properties.external_service_tokens %>
<% properties.external_service_tokens.marshal_dump.each do |name,token| %>
<%= name %>:
- token: <%= token %>
+ token: "<%= token %>"
<% end %>
<% end %>
@@ -213,7 +213,7 @@ if cc_props.service_extension && cc_props.service_extension.service_lifecycle
%>
service_lifecycle:
max_upload_size: <%= max_upload_size %>
- upload_token: <%= upload_token %>
+ upload_token: "<%= upload_token %>"
<% if upload_timeout %>
upload_timeout: <%=upload_timeout%>
<% end %>
View
2  jobs/serialization_data_server/templates/serialization_data_server.yml.erb
@@ -18,7 +18,7 @@ ip_route: <%= sds.ip_route %>
cloud_controller_uri: <%= properties.cc.srv_api_uri %>
external_uri: <%= lifecycle.download_url %>
<% if sds and sds.upload_token %>
-upload_token: <%=sds.upload_token %>
+upload_token: "<%=sds.upload_token %>"
<% end %>
<% if sds and sds.upload_file_expire_time %>
expire_time: <%= sds.upload_file_expire_time %>
View
2  jobs/service_broker/templates/service_broker.yml.erb
@@ -36,7 +36,7 @@ service_auth_tokens:
properties.service_auth_tokens.fields.each { |offering|
token = properties.service_auth_tokens.send(offering.to_sym)
%>
- <%= offering %>: <%= token %>
+ <%= offering %>: "<%= token %>"
<% } %>
<% end %>
2  src/services
@@ -1 +1 @@
-Subproject commit 90942249619fcec14cb6dc2e6325c30585ca6e46
+Subproject commit 1e1082ef66138345dd7238f3f38f3f21f97adc93
Please sign in to comment.
Something went wrong with that request. Please try again.