Seth House
b039a45d93
Added explicit heading so the heading shows up in TOC entries
2013-03-04 15:17:52 -07:00
Seth House
d410e1611f
Formatting / clarification cleanups
2013-03-04 15:17:52 -07:00
Seth House
77c2987735
Merge pull request #53 from s0undt3ch/issues/52
...
Provide `salt-api`'s configuration defaults. Refs #52 .
2013-03-04 10:24:01 -08:00
Pedro Algarvio
eb77df1e74
Provide salt-api
's configuration defaults. Refs #52 .
...
We now override the necessary keys to adapt the salt-master default configuration to salt-api and feed that to `salt.config.master_config`.
There no need to do our own `include` code since that's also done in `salt.config.master_config`.
2013-03-04 17:26:35 +00:00
Seth House
d649bd263f
Added logging output if the rest_cherrypy module is partially configured
...
Added minimum version check for CherryPy.
Fixes #38
Fixes #48
2013-02-27 14:29:45 -07:00
Seth House
7834f58c26
Merge pull request #51 from s0undt3ch/hotfix/make-logfile-logging-work
...
Hotfix/make logfile logging work
2013-02-27 10:47:34 -08:00
Pedro Algarvio
3734f1440e
Update cli
to use the new MergeConfigMixIn
.
...
The purpose of the above MixIn is to override the options on the configuration file with the options passed from the console.
2013-02-27 12:29:13 +00:00
Pedro Algarvio
6f34684d21
Add some logging to let the users know what's happening. Minor PEP-8.
2013-02-27 12:22:07 +00:00
Seth House
f17e818ddd
Merge pull request #45 from kaptk2/develop
...
Changed naming to conform to standard
2013-02-20 13:05:46 -08:00
Andrew Niemantsverdriet
de1e9fc7a7
Changed naming to conform to standard
2013-02-20 11:57:38 -07:00
Seth House
257d449756
Merge pull request #44 from kaptk2/develop
...
Added salt-api.spec file
2013-02-19 22:37:38 -08:00
Andrew Niemantsverdriet
2fc86183b4
Moved the salt-api.spec file to the proper location.
2013-02-19 11:37:41 -07:00
Andrew Niemantsverdriet
68e3853361
Added RPM spec file
2013-02-19 10:49:40 -07:00
Seth House
9ec2a85277
Merge pull request #43 from kaptk2/develop
...
Added the service.d file
2013-02-13 10:20:38 -08:00
Andrew Niemantsverdriet
b3b5f100a3
Added the service.d file
2013-02-13 11:11:20 -07:00
Seth House
10ab1554f3
Merge pull request #42 from holmboe/init-script
...
Add an init script
2013-02-13 08:35:45 -08:00
Henrik Holmboe
61adf94187
Fix the LSB header
...
I got complaints from insserv that the LSB header was not compliant. It was
missing required keywords, which must be there even if they are empty.
2013-02-13 16:36:15 +01:00
Henrik Holmboe
97335f61f1
Add an init script
...
This is a straight adaption of the salt-master init script (plus my recent
patch to it in holmboe/salt@464ca9dd1f ).
2013-02-13 15:43:10 +01:00
Seth House
d96944fee0
Unabbreviated "external auth"
2013-02-12 15:08:43 -07:00
Seth House
cd552c9cb6
Minor rST reformatting & cross-referencing
2013-02-12 15:05:00 -07:00
Seth House
c14eece991
Added the quickstart doc to the TOC and main page
2013-02-12 14:59:00 -07:00
Seth House
4498e4aa22
Merge pull request #41 from kaptk2/develop
...
Inital version of a quickstart guide for salt-api
2013-02-12 13:43:30 -08:00
Andrew Niemantsverdriet
b10434f5ee
Inital version of a quickstart guide for salt-api
2013-02-12 14:36:53 -07:00
Seth House
0989b380cf
Added missing line-breaks
2013-02-12 12:56:10 -07:00
Seth House
7c016a263c
Minor clarifications to the rest_cherrypy config options
2013-02-12 12:52:19 -07:00
Seth House
ad895446a3
Made the "Getting Started" docs more explicit for salt-api & netapi mods
2013-02-12 12:34:40 -07:00
Seth House
1d8ccbabb3
Added support for daemonizing
...
Fixes #39
2013-02-08 15:06:48 -07:00
Seth House
391951dff9
Added docs on requiring the eauth system
...
Fixes #23
2013-02-07 14:20:48 -07:00
Seth House
24d6c03615
Check that staticdir has been set before checking Accept headers
...
As @dthom91 pointed out, this handler is called per-request so the fewer
operations we can do here the better.
2013-02-04 12:43:58 -07:00
Seth House
a8730969b3
Merge pull request #37 from dthom91/develop
...
Corrected problem where uninitialized config key 'static' caused key err...
2013-02-04 11:28:51 -08:00
David Thompson
502bcdda55
Corrected problem where uninitialized config key 'static' caused key error to be thrown even when accept header wasn't set to 'text/html'.
2013-02-04 11:26:39 -08:00
Seth House
920e2213ee
Merge pull request #36 from s0undt3ch/develop
...
Add optional support for setuptools.
2013-01-26 14:22:46 -08:00
Pedro Algarvio
fd49e2b4f1
Add optional support for setuptools.
2013-01-26 22:20:41 +00:00
Seth House
c441a0d3e6
Merge pull request #35 from s0undt3ch/develop
...
Minor doc typo.
2013-01-26 13:53:26 -08:00
Pedro Algarvio
98ee9b948d
Minor doc typo.
2013-01-26 21:48:52 +00:00
Seth House
1a73fdbc20
Merge pull request #33 from seanchannel/develop
...
ubuntu/debian package
2013-01-23 13:50:45 -08:00
Sean Channel
4e056aa9b6
delete superfluous pathname
2013-01-23 13:38:55 -08:00
Sean Channel
057bbc107a
initial package
2013-01-22 16:37:14 -08:00
Seth House
a5fb128675
Add custom global config options to the CherryPy global config
2013-01-22 12:09:11 -07:00
Seth House
82672ec37a
Merge branch 'master' into develop
2013-01-21 20:00:35 -07:00
Seth House
cfd957436e
Removed pre-alpha note from README
2013-01-21 20:00:06 -07:00
Seth House
a14373f04b
Rebuilt manpages for 0.7.5
2013-01-21 14:59:53 -07:00
Seth House
f2e80389db
Bumped version to 0.7.5
2013-01-21 14:59:53 -07:00
Seth House
8e68c6dc10
Added release notes for 0.7.5
2013-01-21 14:59:53 -07:00
Seth House
93748814ff
Removed the remaining HTML templates
2013-01-21 14:59:53 -07:00
Seth House
8bd8ea6060
Fixed overzealous Accept header match on *.*
2013-01-21 14:53:11 -07:00
Seth House
b834957bdb
Fixed sait-ui -> salt-ui
2013-01-21 14:14:36 -07:00
Seth House
5b8b555a8d
Updated docs for 302 -> 202 change
2013-01-18 11:22:21 -07:00
Seth House
ab396c358a
Changed response on /minions from 302 to 202
...
Arguably this is a more appropriate response code. In addition, the
original intent with the 302 was to supply the job ID in order to be
able to reference it later, however 3XX responses are not available via
the XHR object in browsers nor do they communicate intent.
2013-01-18 10:32:18 -07:00
Seth House
a7a8b9787d
Don't enable staticdir if static isn't set in the config
2013-01-15 15:18:58 -07:00