Merge pull request #74 from fuze/master

Made the auth backend customizable with attributes

Author: armab

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## In Development
 
+## 0.7.0
+
+ * Changed st2.conf template to handle different st2auth settings
 
 ## 0.6.0
 

attributes/config.rb

@@ -15,7 +15,9 @@
   auth_use_ssl: false,
   auth_debug: false,
   auth_enable: true,
-  auth_standalone_file: '/etc/st2/htpasswd',
+  auth_mode: 'standalone',
+  auth_backend: 'flat_file',
+  auth_backend_kwargs: { file_path: '/etc/st2/htpasswd' },
 
   syslog_enabled: false,
   syslog_host: '127.0.0.1',

metadata.rb

@@ -4,7 +4,7 @@
 license 'Apache-2.0'
 description 'Installs/Configures stackstorm'
 long_description 'Installs/Configures stackstorm'
-version '0.6.0'
+version '0.7.0'
 
 supports 'ubuntu', '= 14.04'
 supports 'redhat', '~> 7.5'

templates/default/st2.conf.erb

@@ -50,10 +50,10 @@ debug = <%= @auth_debug %>
 enable = <%= @auth_enable %>
 logging = /etc/st2/logging.auth.conf
 
-mode = standalone
+mode = <%= @auth_mode %>
 # Note: Settings bellow are only used in "standalone" mode
-backend = flat_file
-backend_kwargs = {"file_path": "<%= @auth_standalone_file %>"}
+backend = <%= @auth_backend %>
+backend_kwargs = <%= Chef::JSONCompat.to_json(@auth_backend_kwargs) %>
 
 # Base URL to the API endpoint excluding the version (e.g. http://myhost.net:9101/)
 api_url = <%= @api_url %>