Skip to content
This repository has been archived by the owner on Jul 28, 2020. It is now read-only.

Commit

Permalink
further build fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
LindsayHill committed Sep 26, 2018
1 parent 1d28769 commit 2baf2ee
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 14 deletions.
12 changes: 6 additions & 6 deletions attributes/config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,23 @@
api_url: 'http://127.0.0.1:9101',
api_host: '0.0.0.0',
api_port: 9101,
api_mask_secrets: True,
api_mask_secrets: true,
api_allow_origin: '*',

auth_host: '0.0.0.0',
auth_port: 9100,
auth_use_ssl: False,
auth_debug: False,
auth_enable: True,
auth_use_ssl: false,
auth_debug: false,
auth_enable: true,
auth_standalone_file: '/etc/st2/htpasswd',

syslog_enabled: False,
syslog_enabled: false,
syslog_host: '127.0.0.1',
syslog_port: 514,
syslog_facility: 'local7',
syslog_protocol: 'udp',

log_mask_secrets: True,
log_mask_secrets: true,

system_user: node['stackstorm']['user']['user'],
ssh_key_file: "#{node['stackstorm']['user']['home']}/.ssh/id_rsa",
Expand Down
2 changes: 1 addition & 1 deletion attributes/web.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#

# Self-signed certificate
default['stackstorm']['web']['ssl']['self_signed']['enabled'] = True
default['stackstorm']['web']['ssl']['self_signed']['enabled'] = true
default['stackstorm']['web']['ssl']['self_signed']['org'] = 'StackStorm'
default['stackstorm']['web']['ssl']['self_signed']['org_unit'] = 'Information Technology'
default['stackstorm']['web']['ssl']['self_signed']['country'] = 'US'
1 change: 1 addition & 0 deletions recipes/_services.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
st2actionrunner st2api st2stream
st2auth st2garbagecollector st2notifier
st2resultstracker st2rulesengine st2sensorcontainer
st2timersengine st2workflowengine
).freeze

# Enable & Start st2 services
Expand Down
1 change: 1 addition & 0 deletions recipes/bundle.rb
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
node.default['mongodb']['package_version'] = '3.4.17'
node.default['postgresql']['pg_gem']['version'] = '0.21.0'
node.override['htpasswd']['install_method'] = 'ruby'
node.override['rabbitmq']['use_distro_version'] = true

include_recipe 'htpasswd::default'
include_recipe 'sc-mongodb::default'
Expand Down
2 changes: 1 addition & 1 deletion recipes/web.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
org node['stackstorm']['web']['ssl']['self_signed']['org']
org_unit node['stackstorm']['web']['ssl']['self_signed']['org_unit']
country node['stackstorm']['web']['ssl']['self_signed']['country']
only_if { node['stackstorm']['web']['ssl']['self_signed']['enabled'] == True }
only_if { node['stackstorm']['web']['ssl']['self_signed']['enabled'] == true }
end

include_recipe 'chef_nginx::repo'
Expand Down
12 changes: 6 additions & 6 deletions spec/recipes/config_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -160,23 +160,23 @@
'api_url' => 'http://127.0.0.1:9101',
'api_host' => '0.0.0.0',
'api_port' => 9101,
'api_mask_secrets' => True,
'api_mask_secrets' => true,
'api_allow_origin' => '*',

'auth_host' => '0.0.0.0',
'auth_port' => 9100,
'auth_use_ssl' => False,
'auth_debug' => False,
'auth_enable' => True,
'auth_use_ssl' => false,
'auth_debug' => false,
'auth_enable' => true,
'auth_standalone_file' => '/etc/st2/htpasswd',

'syslog_enabled' => False,
'syslog_enabled' => false,
'syslog_host' => '127.0.0.1',
'syslog_port' => 514,
'syslog_facility' => 'local7',
'syslog_protocol' => 'udp',

'log_mask_secrets' => True,
'log_mask_secrets' => true,

'system_user' => 'stanley',
'ssh_key_file' => '/home/stanley/.ssh/id_rsa',
Expand Down
1 change: 1 addition & 0 deletions test/recipes/default/_services.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
st2actionrunner st2api st2stream
st2auth st2garbagecollector st2notifier
st2resultstracker st2rulesengine st2sensorcontainer
st2timersengine st2workflowengine
).freeze

ST2_SERVICES.each do |service_name|
Expand Down

0 comments on commit 2baf2ee

Please sign in to comment.