Skip to content
Merged
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
4 changes: 4 additions & 0 deletions jobs/cc_deployment_updater/spec
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,10 @@ properties:
description: "The file descriptors made available to each app instance"
default: 16384

cc.additional_allowed_process_users:
default: []
description: "Allow-list of users that a Process/Task may use in addition to 'vcap'. The 'vcap' user is always permitted."

cc.locket.host:
default: "locket.service.cf.internal"
description: "Hostname of the Locket server"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ default_app_memory: <%= p("cc.default_app_memory") %>
default_app_disk_in_mb: <%= p("cc.default_app_disk_in_mb") %>
maximum_app_disk_in_mb: <%= p("cc.maximum_app_disk_in_mb") %>
instance_file_descriptor_limit: <%= p("cc.instance_file_descriptor_limit") %>
additional_allowed_process_users: <%= p("cc.additional_allowed_process_users") %>

deployment_updater:
update_frequency_in_seconds: <%= p("deployment_updater.update_frequency_in_seconds") %>
Expand Down
4 changes: 4 additions & 0 deletions jobs/cloud_controller_clock/spec
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,10 @@ properties:
default: 2048
description: "The maximum amount of disk a user can request"

cc.additional_allowed_process_users:
default: []
description: "Allow-list of users that a Process/Task may use in addition to 'vcap'. The 'vcap' user is always permitted."

cc.newrelic.license_key:
default: ~
description: "The api key for NewRelic"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ maximum_app_disk_in_mb: <%= p("cc.maximum_app_disk_in_mb") %>
max_retained_deployments_per_app: <%= p("cc.max_retained_deployments_per_app") %>
max_retained_builds_per_app: <%= p("cc.max_retained_builds_per_app") %>
max_retained_revisions_per_app: <%= p("cc.max_retained_revisions_per_app") %>
additional_allowed_process_users: <%= p("cc.additional_allowed_process_users") %>

default_app_log_rate_limit_in_bytes_per_second: <%= p("cc.default_app_log_rate_limit_in_bytes_per_second") %>

Expand Down
4 changes: 4 additions & 0 deletions jobs/cloud_controller_ng/spec
Original file line number Diff line number Diff line change
Expand Up @@ -844,6 +844,10 @@ properties:
default: "2048M"
description: "Maximum body size for nginx bits uploads"

cc.additional_allowed_process_users:
default: []
description: "Allow-list of users that a Process/Task may use in addition to 'vcap'. The 'vcap' user is always permitted."

cc.default_app_log_rate_limit_in_bytes_per_second:
default: -1
description: "Default application log rate limit"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ cpu_weight_max_memory: <%= p("cc.cpu_weight_max_memory") %>
default_app_memory: <%= p("cc.default_app_memory") %>
default_app_disk_in_mb: <%= p("cc.default_app_disk_in_mb") %>
maximum_app_disk_in_mb: <%= p("cc.maximum_app_disk_in_mb") %>
additional_allowed_process_users: <%= p("cc.additional_allowed_process_users") %>

default_app_log_rate_limit_in_bytes_per_second: <%= p("cc.default_app_log_rate_limit_in_bytes_per_second") %>

Expand Down
4 changes: 4 additions & 0 deletions jobs/cloud_controller_worker/spec
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,10 @@ properties:
default: 2048
description: "The maximum amount of disk a user can request"

cc.additional_allowed_process_users:
default: []
description: "Allow-list of users that a Process/Task may use in addition to 'vcap'. The 'vcap' user is always permitted."

cc.allow_app_ssh_access:
default: true
description: "Allow users to change the value of the app-level allow_ssh attribute"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ jobs:
default_app_memory: <%= p("cc.default_app_memory") %>
default_app_disk_in_mb: <%= p("cc.default_app_disk_in_mb") %>
maximum_app_disk_in_mb: <%= p("cc.maximum_app_disk_in_mb") %>
additional_allowed_process_users: <%= p("cc.additional_allowed_process_users") %>

instance_file_descriptor_limit: <%= p("cc.instance_file_descriptor_limit") %>

Expand Down