Commit Graph

409 Commits

Author SHA1 Message Date
Seth House
185daa3218 Added missing versionadded for the disable_ssl option 2013-09-17 07:26:02 -06:00
Seth House
21748a9dbf Merge pull request #117 from s0undt3ch/hotfix/proper-logging-import
Import `salt.log` at `saltapi` package level. Missed one `salt.log.logging`
2013-09-13 09:14:56 -07:00
Pedro Algarvio
7fc6ba4589 Import salt.log at saltapi package level. Missed one salt.log.logging. Fixes #115. 2013-09-13 10:27:57 +01:00
Seth House
5a30e80843 Merge pull request #116 from s0undt3ch/hotfix/proper-logging-import
Import the logging module directly. Fixes #115.
2013-09-12 14:20:10 -07:00
Pedro Algarvio
d2c9db8e6e Import the logging module directly. Fixes #115. 2013-09-12 19:05:45 +01:00
Seth House
4dd9e97d7f Added appropriate environment configuration for various deploy methods 2013-08-31 00:30:16 -06:00
Seth House
fa2746b714 The quickstart() server is production-ready and is preferred
I misunderstood that the quickstart() server is for production and just
needs to be configured with an environment to enable/disable debugging
options. It is also a WSGI server and is a better choice than the
stand-alone CherryPyWSGIServer for serving a CherryPy app because the
coupling is tighter and debugging output is not lost.
2013-08-31 00:30:15 -06:00
Seth House
f2b33a7b79 Clarified/fixed the SSL & debug related docs 2013-08-31 00:30:15 -06:00
Seth House
3113ad190e Merge pull request #114 from sfdc-kho/develop
Fix start/stop in init script
2013-08-30 23:03:40 -07:00
Kim Ho
1de8f9686e Fix start/stop in init script 2013-08-30 11:03:16 -07:00
Seth House
5566fd39b0 Merge pull request #110 from aboe76/update_suse
updated suse spec file
2013-08-09 15:29:49 -07:00
Niels Abspoel
8da9e9a116 updated suse spec file
Made a symlink to salt-api init file used for rpm
updated symlink to salt-api.service

Improved salt-api rpm to be in line with lsb for suse inclusion.
2013-08-09 22:56:36 +02:00
Seth House
58ed55e3e3 Merge pull request #109 from craig5/develop
adding salt_ip_verify_tool
2013-08-07 11:33:15 -07:00
Craig Sebenik
65ceb7cd01 Revert "adding makefile, adding "restricted_ips" to cherrypy/app.py"
This reverts commit 76682a6983.
2013-08-07 11:21:43 -07:00
Seth House
f59fb68490 Merge pull request #108 from s0undt3ch/hotfix/setup
`install_requires` is a setuptools "thing". Fixes #105
2013-08-07 09:58:31 -07:00
Pedro Algarvio
32def96675 install_requires is a setuptools "thing". Fixes #105 2013-08-07 13:18:32 +01:00
Craig Sebenik
ebe03bb550 Merge branch 'develop' of https://github.com/saltstack/salt-api into develop 2013-08-06 21:35:06 -07:00
Seth House
25304c9b1e Added generating __opts__ when rest_wsgi not started via salt-api
Thanks to cxz on IRC for the report.
2013-08-06 21:53:18 -06:00
Craig Sebenik
70a6844699 fixing broken salt_ip_verify_tool method 2013-08-06 16:46:41 -07:00
Samuel M Smith
bcabb50902 ignore wingide project files 2013-08-06 17:24:35 -06:00
Craig Sebenik
43e0a7e38b removing print used for debugging 2013-08-06 13:31:07 -07:00
Samuel M Smith
545daaed9f Added new client and fun naming scheme so can have sync or async modes
instead of confusing client runner wheel etc.
To specify wheel or runner client prefix fun name with wheel or runner respectively
2013-08-06 14:14:40 -06:00
Craig Sebenik
2001669011 adding ip restrictions
Adding code to restrict access based on a simple list of IP addresses.
Added new "tool" (salt_ip_verify_tool) and reading the list of allowed
IPs from the salt master config.
2013-08-06 12:57:15 -07:00
Craig Sebenik
8aedd948e3 Merge branch 'develop' of https://github.com/saltstack/salt-api into develop 2013-08-05 13:12:58 -07:00
Craig Sebenik
825931774c adding restricted ip stuff to cherrypy 2013-08-05 12:47:47 -07:00
Craig Sebenik
76682a6983 adding makefile, adding "restricted_ips" to cherrypy/app.py 2013-08-05 12:35:55 -07:00
Seth House
82681d496a Manually verify token for stream since doesn't use APIClient 2013-08-02 17:29:06 -06:00
Seth House
610272b45a Cast the stream output data chunks to JSON 2013-08-02 15:12:35 -06:00
Seth House
bd58683e95 Added docs on the Events URL 2013-08-02 12:18:08 -06:00
Seth House
8eef9d4c1b Added optional URL param to Event stream for manual auth check
This change is to workaround the problem of the Server Sent Events (SSE)
spec only recently gaining support for CORS and (at the time of writing)
no browser support.
2013-08-02 11:39:47 -06:00
Seth House
5dc0177211 Small session lookup tweak during auth check 2013-08-02 11:38:50 -06:00
Seth House
1d34b4cab4 Added configuration flag to disable SSL 2013-08-01 14:56:04 -06:00
Seth House
4a60e13d85 Reordered tools in order of execution
This change doesn't do anything but can help when trying to visualize
the request/response pipeline.
2013-08-01 14:56:04 -06:00
Seth House
c00ecd62ff Moved potential circular import into function 2013-08-01 14:56:04 -06:00
Seth House
91cfb7d193 Added SSE HTTP stream of Salt events
Closes #95
2013-08-01 14:56:04 -06:00
Seth House
14821f6677 Improve method of grabbing Salt's config for the wsgi app interface 2013-07-29 21:02:32 -06:00
Seth House
712af4c83c Merge pull request #101 from kaptk2/develop
Update salt-api.spec
2013-07-25 11:37:19 -07:00
Andrew Niemantsvedriet
78da127dd1 Update salt-api.spec
Updated the change log to reflect proper current version.
2013-07-25 12:25:01 -06:00
Seth House
763ea6346f Removed redundant exposed 2013-07-25 11:25:06 -06:00
Seth House
8e33a01a45 Instead of ignoring URLs in the auth tool, disable tool in each handler
Better not to couple a tool to a handler. Not sure why I didn't think to
do this the first time around.
2013-07-25 11:25:05 -06:00
Seth House
1d56bc7a8b Merge pull request #100 from kaptk2/develop
Updated RPM spec to newer version
2013-07-23 14:45:58 -07:00
Andrew Niemantsverdriet
61768fc397 Updated RPM spec to newer version 2013-07-23 15:35:56 -06:00
Seth House
479357882f Added 0.8.2 to the debian changelog 2013-07-18 14:05:29 -06:00
Seth House
2eb6d07d60 Merge pull request #99 from aboe76/suse_package
Updated suse specs for 0.8.2
2013-07-18 00:33:37 -07:00
Niels Abspoel
0c610526bc Updated suse specs for 0.8.2 2013-07-18 07:29:33 +02:00
Seth House
d33ada5c97 Bumped version to 0.8.2 2013-07-17 10:13:45 -06:00
Seth House
dbd353cae6 Added version number to new settings documentation 2013-07-17 10:12:45 -06:00
Seth House
de866e83db Added docs about the `host` setting 2013-07-17 10:12:45 -06:00
Seth House
05e78d7906 Added 0.8.2 release notes 2013-07-17 10:12:45 -06:00
Seth House
15c63e869b Added fix for app_path settings that start with a slash
The CherryPy dispatcher we're using routes URLs by mapping attributes on
an object to the URL path. In other words, the attribute on the object
should not start with a slash.
2013-07-16 11:10:43 -06:00