diff --git a/.gitignore b/.gitignore index 943786a..d850ac3 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ /SaltTesting-2014.4.24.tar.gz /salt-2014.1.5.tar.gz /salt-2014.1.7.tar.gz +/salt-2014.1.10.tar.gz diff --git a/salt-master.service b/salt-master.service index 65944f3..ddfdb24 100644 --- a/salt-master.service +++ b/salt-master.service @@ -3,7 +3,7 @@ Description=The Salt Master Server After=syslog.target network.target [Service] -Type=Notify +Type=notify ExecStart=/usr/bin/salt-master [Install] diff --git a/salt-minion b/salt-minion index a91ab7b..214f895 100644 --- a/salt-minion +++ b/salt-minion @@ -81,6 +81,7 @@ stop() { if [ -f $SUSE_RELEASE ]; then killproc -TERM $SALTMINION rc_status -v + RETVAL=$? elif [ -f $DEBIAN_VERSION ]; then # Added this since Debian's start-stop-daemon doesn't support spawned processes if ps -ef | grep "$PYTHON $SALTMINION" | grep -v grep | awk '{print $2}' | xargs kill &> /dev/null; then @@ -92,8 +93,18 @@ stop() { fi else killproc $PROCESS + RETVAL=$? + # tidy up any rogue processes: + PROCS=`ps -ef | grep "$SALTMINION" | grep -v grep | awk '{print $2}'` + if [ -n "$PROCS" ]; then + kill $PROCS &> /dev/null + sleep 1 + PROCS=`ps -ef | grep "$SALTMINION" | grep -v grep | awk '{print $2}'` + if [ -n "$PROCS" ]; then + kill -9 $PROCS &> /dev/null + fi + fi fi - RETVAL=$? echo } diff --git a/salt.spec b/salt.spec index 7f3823a..5adedb5 100644 --- a/salt.spec +++ b/salt.spec @@ -15,7 +15,7 @@ %define _salttesting_ver 2014.4.24 Name: salt -Version: 2014.1.7 +Version: 2014.1.10 Release: 1%{?dist} Summary: A parallel remote execution system @@ -31,6 +31,7 @@ Source5: %{name}-master.service Source6: %{name}-syndic.service Source7: %{name}-minion.service Source8: README.fedora +Source9: logrotate.salt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -109,6 +110,7 @@ Requires(postun): systemd-units %endif BuildRequires: systemd-units +Requires: systemd-python %endif @@ -132,6 +134,7 @@ The Salt master is the central server to which all minions connect. Summary: Client component for salt, a parallel remote execution system Group: System Environment/Daemons Requires: salt = %{version}-%{release} +Requires: systemd-python %description -n salt-minion Salt minion is queried and controlled from the master. @@ -161,6 +164,8 @@ install -p -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{_unitdir}/ %endif install -p %{SOURCE8} . +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ +install -p %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/salt mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/salt/ install -p -m 0640 conf/minion $RPM_BUILD_ROOT%{_sysconfdir}/salt/minion @@ -180,6 +185,7 @@ rm -rf $RPM_BUILD_ROOT %doc $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version}/LICENSE %{python_sitelib}/%{name}/* %{python_sitelib}/%{name}-%{version}-py?.?.egg-info +%{_sysconfdir}/logrotate.d/salt %doc %{_mandir}/man7/salt.7.* %doc $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version}/README.fedora @@ -322,6 +328,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Aug 4 2014 Erik Johnson - 2014.1.10-1 +- Update to bugfix release 2014.1.10 + * Thu Jul 10 2014 Erik Johnson - 2014.1.7-1 - Update to bugfix release 2014.1.7 diff --git a/sources b/sources index 3e3bd90..f00e508 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -9ab50536f46389983888771d4e735d56 salt-2014.1.7.tar.gz +ff6dff1ce949ab176745a30bde17e81d salt-2014.1.10.tar.gz 4e91e01fc1819c783097dd484947442d SaltTesting-2014.4.24.tar.gz