Browse Source

Update hue.ini and simpler naming/messages

Harshg999 4 years ago
parent
commit
01e1dd31ca

+ 8 - 0
desktop/conf.dist/hue.ini

@@ -814,6 +814,14 @@
    ## collection_interval=30000
    ## collection_interval=30000
 
 
 
 
+  # Configuration options for Slack
+  # ------------------------------------------------------------------------
+  [[slack]]
+
+   # Turns on Slack application API endpoints
+   ## is_enabled=True
+
+
   # Configuration options for the request Tracing
   # Configuration options for the request Tracing
   # ------------------------------------------------------------------------
   # ------------------------------------------------------------------------
   [[tracing]]
   [[tracing]]

+ 2 - 2
desktop/conf/pseudo-distributed.ini.tmpl

@@ -820,8 +820,8 @@
   # ------------------------------------------------------------------------
   # ------------------------------------------------------------------------
   [[slack]]
   [[slack]]
 
 
-   # Enable slack bot server URLs "/slack/"
-   ## enable_slack_integration=True
+   # Turns on Slack application API endpoints
+   ## is_enabled=True
 
 
 
 
   # Configuration options for the request Tracing
   # Configuration options for the request Tracing

+ 3 - 3
desktop/core/src/desktop/conf.py

@@ -707,9 +707,9 @@ SLACK = ConfigSection(
   key='slack',
   key='slack',
   help=_("""Configuration options for slack """),
   help=_("""Configuration options for slack """),
   members=dict(
   members=dict(
-    ENABLE_SLACK_INTEGRATION=Config(
-      key='enable_slack_integration',
-      help=_('Enable slack bot server URLs "/slack/"'),
+    IS_ENABLED=Config(
+      key='is_enabled',
+      help=_('Turns on Slack application API endpoints'),
       default=True,
       default=True,
       type=coerce_bool),
       type=coerce_bool),
   )
   )

+ 1 - 1
desktop/core/src/desktop/urls.py

@@ -276,7 +276,7 @@ if is_oidc_configured():
   ]
   ]
 
 
 # Slack botserver URLs
 # Slack botserver URLs
-if SLACK.ENABLE_SLACK_INTEGRATION.get():
+if SLACK.IS_ENABLED.get():
   urlpatterns += [
   urlpatterns += [
     url(r'^slack/', include('desktop.lib.botserver.urls')),
     url(r'^slack/', include('desktop.lib.botserver.urls')),
   ]
   ]