commit salt-api for openSUSE:Factory
Hello community, here is the log from the commit of package salt-api for openSUSE:Factory checked in at 2013-10-30 15:51:53 Comparing /work/SRC/openSUSE:Factory/salt-api (Old) and /work/SRC/openSUSE:Factory/.salt-api.new (New) Package is salt-api Changes: --- /work/SRC/openSUSE:Factory/salt-api/salt-api.changes2013-10-18 19:25:37.0 +0200 +++ /work/SRC/openSUSE:Factory/.salt-api.new/salt-api.changes 2013-10-30 15:51:55.0 +0100 @@ -1,0 +2,10 @@ +Tue Oct 29 22:38:07 UTC 2013 - abo...@gmail.com + +- Salt-api updated to 0.8.3 + - this will likely be the last salt-api solo release, +project is merging into main Salt project. + - fixed proper logging + - better ssl options + - improved python rest_wsgi and cherrypy support + +--- Old: salt-api-0.8.2.tar.gz New: salt-api-0.8.3.tar.gz Other differences: -- ++ salt-api.spec ++ --- /var/tmp/diff_new_pack.b0bybG/_old 2013-10-30 15:51:55.0 +0100 +++ /var/tmp/diff_new_pack.b0bybG/_new 2013-10-30 15:51:55.0 +0100 @@ -16,7 +16,7 @@ # Name: salt-api -Version:0.8.2 +Version:0.8.3 Release:0 License:Apache-2.0 Summary:The api for Salt a parallel remote execution system ++ salt-api-0.8.2.tar.gz - salt-api-0.8.3.tar.gz ++ 2637 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit salt-api for openSUSE:Factory
Hello community,
here is the log from the commit of package salt-api for openSUSE:Factory
checked in at 2013-10-18 19:23:41
Comparing /work/SRC/openSUSE:Factory/salt-api (Old)
and /work/SRC/openSUSE:Factory/.salt-api.new (New)
Package is salt-api
Changes:
--- /work/SRC/openSUSE:Factory/salt-api/salt-api.changes2013-08-13
13:10:29.0 +0200
+++ /work/SRC/openSUSE:Factory/.salt-api.new/salt-api.changes 2013-10-18
19:25:37.0 +0200
@@ -1,0 +2,7 @@
+Fri Oct 18 11:44:15 UTC 2013 - p.drou...@gmail.com
+
+- Don't support sysvinit and systemd for the same system; add conditionnal
+ macros to use systemd only on systems which support it and sysvinit
+ on other systems
+
+---
Other differences:
--
++ salt-api.spec ++
--- /var/tmp/diff_new_pack.w4WUkK/_old 2013-10-18 19:25:37.0 +0200
+++ /var/tmp/diff_new_pack.w4WUkK/_new 2013-10-18 19:25:37.0 +0200
@@ -17,7 +17,7 @@
Name: salt-api
Version:0.8.2
-Release:1%{?dist}
+Release:0
License:Apache-2.0
Summary:The api for Salt a parallel remote execution system
Url:http://saltstack.org/
@@ -44,9 +44,10 @@
%if 0%{?suse_version} = 1210
BuildRequires: systemd
%{?systemd_requires}
-%endif
-Requires(pre): %fillup_prereq
+%else
Requires(pre): %insserv_prereq
+Requires(pre): %fillup_prereq
+%endif
%description
salt-api is a modular interface on top of Salt that can provide a variety of
entry points into a running Salt system.
@@ -59,55 +60,58 @@
%install
python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%fdupes %{buildroot}%{_prefix}
#
##missing directories
+%if 0%{?suse_version} 1210
mkdir -p %{buildroot}%{_sysconfdir}/init.d
-mkdir -p %{buildroot}%{_localstatedir}/log/salt
mkdir -p %{buildroot}/%{_sbindir}
+%endif
+mkdir -p %{buildroot}%{_localstatedir}/log/salt
#
##init scripts
-%if 0%{?sles_version} == 11
+%if 0%{?suse_version} 1210
install -Dpm 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/salt-api
-%else
-install -Dpm 0755 %{SOURCE1} %{buildroot}%{_initddir}/salt-api
-%endif
ln -sf /etc/init.d/salt-api %{buildroot}%{_sbindir}/rcsalt-api
-
-%if 0%{?_unitdir:1}
+%else
install -Dpm 644 %{SOURCE2} %{buildroot}%_unitdir/salt-api.service
%endif
%preun
-%stop_on_removal
%if 0%{?_unitdir:1}
%service_del_preun salt-api.service
+%else
+%stop_on_removal
%endif
%post
-%fillup_and_insserv
%if 0%{?_unitdir:1}
%service_add_post salt-api.service
+%else
+%fillup_and_insserv
%endif
%postun
-%restart_on_update
%if 0%{?_unitdir:1}
%service_del_postun salt-api.service
-%endif
+%else
%insserv_cleanup
+%restart_on_update
+%endif
%files
%defattr(-,root,root)
-%{_sysconfdir}/init.d/salt-api
-%{_sbindir}/rcsalt-api
+%doc LICENSE
%if 0%{?_unitdir:1}
%_unitdir
+%else
+%{_sysconfdir}/init.d/salt-api
+%{_sbindir}/rcsalt-api
%endif
-%doc %{_mandir}/man1/salt-api.1.*
-%doc %{_mandir}/man7/salt-api.7.*
+%{_mandir}/man1/salt-api.1.*
+%{_mandir}/man7/salt-api.7.*
%{_bindir}/salt-api
-%doc LICENSE
%{python_sitelib}/*
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit salt-api for openSUSE:Factory
Hello community, here is the log from the commit of package salt-api for openSUSE:Factory checked in at 2013-08-13 13:10:28 Comparing /work/SRC/openSUSE:Factory/salt-api (Old) and /work/SRC/openSUSE:Factory/.salt-api.new (New) Package is salt-api Changes: --- /work/SRC/openSUSE:Factory/salt-api/salt-api.changes2013-07-19 17:29:21.0 +0200 +++ /work/SRC/openSUSE:Factory/.salt-api.new/salt-api.changes 2013-08-13 13:10:29.0 +0200 @@ -1,0 +2,6 @@ +Fri Aug 9 20:24:28 UTC 2013 - abo...@gmail.com + +- Updated salt-api init file: + Same file as the salt-api package for Rhel/Fedora + +--- Other differences: -- ++ salt-api ++ --- /var/tmp/diff_new_pack.knyITi/_old 2013-08-13 13:10:29.0 +0200 +++ /var/tmp/diff_new_pack.knyITi/_new 2013-08-13 13:10:29.0 +0200 @@ -1,234 +1,138 @@ #!/bin/sh # -# Template SUSE system startup script for salt-api -# Copyright (C) 1995--2005 Kurt Garloff, SUSE / Novell Inc. -# -# This library is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or (at -# your option) any later version. -# -# This library is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# -# /etc/init.d/salt-api -# and its symbolic link -# /(usr/)sbin/rcsalt-api -# -# -# LSB compatible service control script; see http://www.linuxbase.org/spec/ -# -# Note: This template uses functions rc_XXX defined in /etc/rc.status on -# UnitedLinux/SUSE/Novell based Linux distributions. If you want to base your -# script on this template and ensure that it works on non UL based LSB -# compliant Linux distributions, you either have to provide the rc.status -# functions from UL or change the script to work without them. -# See skeleton.compat for a template that works with other distros as well. -# +# Salt API +### + +# LSB header + ### BEGIN INIT INFO # Provides: salt-api -# Required-Start:$syslog $network $remote_fs -# Should-Start: $time ypbind smtp -# Required-Stop: $syslog $remote_fs -# Should-Stop: ypbind smtp +# Required-Start:$local_fs $remote_fs $network $named $time +# Should-Start: $time ypbind smtp +# Required-Stop:$local_fs $remote_fs $network $named $time +# Should-Stop: ypbind smtp # Default-Start: 3 5 # Default-Stop: 0 1 2 6 -# Short-Description: The Salt-api daemon provides a rest-interface for salt-master -# Description: This is a daemon that provides a rest-interface for the salt-master +# Short-Description: Salt API control daemon +# Description: This is a daemon that controls the Salt API. ### END INIT INFO -# -# Any extensions to the keywords given above should be preceeded by -# X-VendorTag- (X-UnitedLinux- X-SuSE- for us) according to LSB. -# -# Notes on Required-Start/Should-Start: -# * There are two different issues that are solved by Required-Start -#and Should-Start -# (a) Hard dependencies: This is used by the runlevel editor to determine -# which services absolutely need to be started to make the start of -# this service make sense. Example: nfsserver should have -# Required-Start: $portmap -# Also, required services are started before the dependent ones. -# The runlevel editor will warn about such missing hard dependencies -# and suggest enabling. During system startup, you may expect an error, -# if the dependency is not fulfilled. -# (b) Specifying the init script ordering, not real (hard) dependencies. -# This is needed by insserv to determine which service should be -# started first (and at a later stage what services can be started -# in parallel). The tag Should-Start: is used for this. -# It tells, that if a service is available, it should be started -# before. If not, never mind. -# * When specifying hard dependencies or ordering requirements, you can -# use names of services (contents of their Provides: section) -# or pseudo names starting with a $. The following ones are available -# according
commit salt-api for openSUSE:Factory
Hello community,
here is the log from the commit of package salt-api for openSUSE:Factory
checked in at 2013-07-19 17:29:20
Comparing /work/SRC/openSUSE:Factory/salt-api (Old)
and /work/SRC/openSUSE:Factory/.salt-api.new (New)
Package is salt-api
Changes:
--- /work/SRC/openSUSE:Factory/salt-api/salt-api.changes2013-05-16
11:39:07.0 +0200
+++ /work/SRC/openSUSE:Factory/.salt-api.new/salt-api.changes 2013-07-19
17:29:21.0 +0200
@@ -1,0 +2,11 @@
+Thu Jul 18 04:46:39 UTC 2013 - abo...@gmail.com
+
+- Update package to 0.8.2
+- Backward incompatible needs salt 0.15.9 or greater
+- Changes to rest_cherrypy:
+ - Fixed issue #87 which caused the Salt master's PID file to be
overwritten.
+ - Fixed an inconsistency with the return format for the /minions
convenience URL.
+ - Added a dedicated URL for serving an HTML app
+ - Added dedicated URL for serving static media
+
+---
Old:
salt-api-0.8.1.tar.gz
New:
salt-api-0.8.2.tar.gz
Other differences:
--
++ salt-api.spec ++
--- /var/tmp/diff_new_pack.zu8NXM/_old 2013-07-19 17:29:22.0 +0200
+++ /var/tmp/diff_new_pack.zu8NXM/_new 2013-07-19 17:29:22.0 +0200
@@ -16,7 +16,7 @@
#
Name: salt-api
-Version:0.8.1
+Version:0.8.2
Release:1%{?dist}
License:Apache-2.0
Summary:The api for Salt a parallel remote execution system
@@ -35,7 +35,7 @@
BuildRequires: fdupes
BuildRequires: python-devel
-BuildRequires: salt
+BuildRequires: salt = 0.15.9
BuildRequires: salt-master
Requires: salt
++ salt-api-0.8.1.tar.gz - salt-api-0.8.2.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/salt-api-0.8.1/PKG-INFO new/salt-api-0.8.2/PKG-INFO
--- old/salt-api-0.8.1/PKG-INFO 2013-04-22 20:46:24.0 +0200
+++ new/salt-api-0.8.2/PKG-INFO 2013-07-17 18:36:01.0 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: salt-api
-Version: 0.8.1
+Version: 0.8.2
Summary: Generic interface for providing external access APIs to Salt
Home-page: http://saltstack.org
Author: Thomas S Hatch
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/salt-api-0.8.1/doc/topics/releases/0.8.2.rst
new/salt-api-0.8.2/doc/topics/releases/0.8.2.rst
--- old/salt-api-0.8.1/doc/topics/releases/0.8.2.rst1970-01-01
01:00:00.0 +0100
+++ new/salt-api-0.8.2/doc/topics/releases/0.8.2.rst2013-07-17
18:12:45.0 +0200
@@ -0,0 +1,25 @@
+==
+salt-api 0.8.2
+==
+
+:program:`salt-api` 0.8.2 is largely a bugfix release that fixes a
+compatibility issue with changes in Salt 0.15.9.
+
+.. note::
+
+Requires Salt 0.15.9 or greater
+
+The following changes have been made to the :py:mod:`rest_cherrypy
+saltapi.netapi.rest_cherrypy.app` netapi module that provides a RESTful
+interface for a running Salt system:
+
+* Fixed issue #87 which caused the Salt master's PID file to be overwritten.
+* Fixed an inconsistency with the return format for the ``/minions``
+ convenience URL.
+
+ .. warning::
+
+This is a backward incompatible change.
+
+* Added a dedicated URL for serving an HTML app
+* Added dedicated URL for serving static media
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/salt-api-0.8.1/saltapi/cli.py
new/salt-api-0.8.2/saltapi/cli.py
--- old/salt-api-0.8.1/saltapi/cli.py 2013-02-27 19:49:08.0 +0100
+++ new/salt-api-0.8.2/saltapi/cli.py 2013-07-16 01:24:33.0 +0200
@@ -1,7 +1,12 @@
'''
CLI entry-point for salt-api
'''
+# Import python libs
+import sys
+import logging
+
# Import salt libs
+import salt.utils.verify
from salt.utils.parsers import (
ConfigDirMixIn,
DaemonMixIn,
@@ -16,6 +21,8 @@
import saltapi.config
import saltapi.version
+log = logging.getLogger(__name__)
+
class SaltAPI(OptionParser, ConfigDirMixIn, LogLevelMixIn, PidfileMixin,
DaemonMixIn, MergeConfigMixIn):
@@ -26,16 +33,35 @@
VERSION = saltapi.version.__version__
+# ConfigDirMixIn config filename attribute
+_config_filename_ = 'master'
+# LogLevelMixIn attributes
+_default_logging_logfile_ = '/var/log/salt/api'
+
def setup_config(self):
-return saltapi.config.api_config(self.get_config_file_path('master'))
+return saltapi.config.api_config(self.get_config_file_path())
def run(self):
'''
Run the api
'''
self.parse_args()
-self.process_config_dir()
+try:
+if self.config['verify_env']:
+
