Skip to content

Commit

Permalink
Merge pull request #107 from StackStorm/api_url_setting
Browse files Browse the repository at this point in the history
Api url setting
  • Loading branch information
Patrick Hoolboom committed Oct 21, 2015
2 parents e2b10a0 + 093818e commit 57882cd
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 1 deletion.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

## 0.10.8 (Oct 21, 2015)
* Adding api_url parameter to server profile

## 0.10.7 (Oct 21, 2015)
* Adding backend kwargs attribute to st2::helper::auth_manager
* Disable static UID for auto-generated users
Expand Down
10 changes: 10 additions & 0 deletions manifests/profile/server.pp
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
# [*st2api_listen_port*] - Listen port for st2api process
# [*st2auth_listen_ip*] - Listen IP for st2auth process
# [*st2auth_listen_port*] - Listen port for st2auth process
# [*api_url*] - External API url
# [*manage_st2api_service*] - Toggle whether this module creates an init script for st2api.
# If you disable this, it is your responsibility to create a service
# named `st2api` for `st2ctl` to continue to work.
Expand Down Expand Up @@ -55,6 +56,7 @@
$st2api_listen_port = '9101',
$st2auth_listen_ip = '0.0.0.0',
$st2auth_listen_port = '9100',
$api_url = $::st2::api_url,
$manage_st2api_service = true,
$manage_st2auth_service = true,
$manage_st2web_service = true,
Expand Down Expand Up @@ -236,6 +238,14 @@
value => $_enable_auth,
tag => 'st2::config',
}
ini_setting { 'auth_api_url':
ensure => present,
path => '/etc/st2/st2.conf',
section => 'auth',
setting => 'api_url',
value => $api_url,
tag => 'st2::config',
}
ini_setting { 'auth_listen_port':
ensure => present,
path => '/etc/st2/st2.conf',
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "stackstorm-st2",
"version": "0.10.7",
"version": "0.10.8",
"author": "stackstorm",
"summary": "Puppet module to manage/configure StackStorm",
"license": "Apache 2.0",
Expand Down

0 comments on commit 57882cd

Please sign in to comment.