Commit 3b4d97a 1 parent 9233e1c commit 3b4d97a Copy full SHA for 3b4d97a
File tree 2 files changed +20
-0
lines changed
salt/netapi/rest_cherrypy
2 files changed +20
-0
lines changed Original file line number Diff line number Diff line change
1
+ Add options to inject arbitrary configuration into the CherryPy instance.
2
+
3
+ Two new keys have been added under the "cherry\_ py" master config.
4
+
5
+ - "global" : corresponds to the "global" CherryPy config.
6
+ - "/" : corresponds to the "/" CherryPy config.
Original file line number Diff line number Diff line change 160
160
A URL path to the main entry point for the application. This is useful
161
161
for serving multiple applications from the same URL.
162
162
163
+ global : ``{}``
164
+ A dictionary of additional CherryPy "global" configuration. See the
165
+ CherryPy documentation for more information.
166
+
167
+ .. versionadded:: 3008
168
+
169
+ / : ``{}``
170
+ A dictionary of additional CherryPy "/" configuration. See the CherryPy
171
+ documentation for more information.
172
+
173
+ .. versionadded:: 3008
163
174
.. _rest_cherrypy-auth:
164
175
165
176
Authentication
@@ -2931,6 +2942,9 @@ def get_conf(self):
2931
2942
"tools.staticdir.dir" : self .apiopts ["static" ],
2932
2943
}
2933
2944
2945
+ conf ["global" ].update (self .apiopts .get ("global" , {}))
2946
+ conf ["/" ].update (self .apiopts .get ("/" , {}))
2947
+
2934
2948
# Add to global config
2935
2949
cherrypy .config .update (conf ["global" ])
2936
2950
You can’t perform that action at this time.
0 commit comments