mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 01:18:58 +00:00
Merge pull request #8036 from aboe76/develop
updated suse spec to salt 0.17.1
This commit is contained in:
Joseph Hall
commit
0281728df1
@ -6,15 +6,15 @@
|
||||
# LSB header
|
||||
|
||||
### BEGIN INIT INFO
|
||||
# Provides: salt-master
|
||||
# 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: Salt master control daemon
|
||||
# Description: This is a daemon that controls the Salt minions.
|
||||
# Provides: salt-master
|
||||
# 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: Salt master control daemon
|
||||
# Description: This is a daemon that controls the Salt minions.
|
||||
### END INIT INFO
|
||||
|
||||
|
||||
@ -26,16 +26,6 @@
|
||||
# processname: /usr/bin/salt-master
|
||||
|
||||
|
||||
if [ -f /etc/default/salt ]; then
|
||||
. /etc/default/salt
|
||||
else
|
||||
SALTMASTER=/usr/bin/salt-master
|
||||
PYTHON=/usr/bin/python
|
||||
fi
|
||||
|
||||
# Sanity checks.
|
||||
[ -x $SALTMASTER ] || exit 0
|
||||
|
||||
DEBIAN_VERSION=/etc/debian_version
|
||||
SUSE_RELEASE=/etc/SuSE-release
|
||||
# Source function library.
|
||||
@ -47,27 +37,35 @@ else
|
||||
. /etc/rc.d/init.d/functions
|
||||
fi
|
||||
|
||||
# Default values (can be overridden below)
|
||||
SALTMASTER=/usr/bin/salt-master
|
||||
PYTHON=/usr/bin/python
|
||||
MASTER_ARGS=""
|
||||
|
||||
if [ -f /etc/default/salt ]; then
|
||||
. /etc/default/salt
|
||||
fi
|
||||
|
||||
SERVICE=salt-master
|
||||
PROCESS=salt-master
|
||||
CONFIG_ARGS=" "
|
||||
|
||||
RETVAL=0
|
||||
|
||||
start() {
|
||||
echo -n $"Starting salt-master daemon: "
|
||||
if [ -f $SUSE_RELEASE ]; then
|
||||
startproc -f -p /var/run/$SERVICE.pid $SALTMASTER -d $CONFIG_ARGS
|
||||
startproc -f -p /var/run/$SERVICE.pid $SALTMASTER -d $MASTER_ARGS
|
||||
rc_status -v
|
||||
elif [ -e $DEBIAN_VERSION ]; then
|
||||
if [ -f $LOCKFILE ]; then
|
||||
echo -n "already started, lock file found"
|
||||
RETVAL=1
|
||||
elif $PYTHON $SALTMASTER -d >& /dev/null; then
|
||||
elif $PYTHON $SALTMASTER -d $MASTER_ARGS >& /dev/null; then
|
||||
echo -n "OK"
|
||||
RETVAL=0
|
||||
fi
|
||||
else
|
||||
daemon --check $SERVICE $SALTMASTER -d $CONFIG_ARGS
|
||||
daemon --check $SERVICE $SALTMASTER -d $MASTER_ARGS
|
||||
fi
|
||||
RETVAL=$?
|
||||
echo
|
||||
@ -100,7 +98,6 @@ restart() {
|
||||
start
|
||||
}
|
||||
|
||||
|
||||
# See how we were called.
|
||||
case "$1" in
|
||||
start|stop|restart)
|
||||
@ -129,11 +126,7 @@ case "$1" in
|
||||
;;
|
||||
reload)
|
||||
echo "can't reload configuration, you have to restart it"
|
||||
if [ -f $SUSE_RELEASE ]; then
|
||||
rc_status -v
|
||||
else
|
||||
RETVAL=$?
|
||||
fi
|
||||
RETVAL=$?
|
||||
;;
|
||||
*)
|
||||
echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
|
||||
@ -141,4 +134,3 @@ case "$1" in
|
||||
;;
|
||||
esac
|
||||
exit $RETVAL
|
||||
|
||||
|
||||
@ -6,15 +6,16 @@
|
||||
# LSB header
|
||||
|
||||
### BEGIN INIT INFO
|
||||
# Provides: salt-minion
|
||||
# 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: Salt minion daemon
|
||||
# Description: This is the Salt minion daemon that can be controlled by the Salt master.
|
||||
# Provides: salt-minion
|
||||
# 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: Salt minion daemon
|
||||
# Description: This is the Salt minion daemon that can be controlled by the
|
||||
# Salt master.
|
||||
### END INIT INFO
|
||||
|
||||
|
||||
@ -26,16 +27,6 @@
|
||||
# processname: /usr/bin/salt-minion
|
||||
|
||||
|
||||
if [ -f /etc/default/salt ]; then
|
||||
. /etc/default/salt
|
||||
else
|
||||
SALTMINION=/usr/bin/salt-minion
|
||||
PYTHON=/usr/bin/python
|
||||
fi
|
||||
|
||||
# Sanity checks.
|
||||
[ -x $SALTMINION ] || exit 0
|
||||
|
||||
DEBIAN_VERSION=/etc/debian_version
|
||||
SUSE_RELEASE=/etc/SuSE-release
|
||||
# Source function library.
|
||||
@ -47,22 +38,30 @@ else
|
||||
. /etc/rc.d/init.d/functions
|
||||
fi
|
||||
|
||||
# Default values (can be overridden below)
|
||||
SALTMINION=/usr/bin/salt-minion
|
||||
PYTHON=/usr/bin/python
|
||||
MINION_ARGS=""
|
||||
|
||||
if [ -f /etc/default/salt ]; then
|
||||
. /etc/default/salt
|
||||
fi
|
||||
|
||||
SERVICE=salt-minion
|
||||
PROCESS=salt-minion
|
||||
CONFIG_ARGS=" "
|
||||
|
||||
RETVAL=0
|
||||
|
||||
start() {
|
||||
echo -n $"Starting salt-minion daemon: "
|
||||
if [ -f $SUSE_RELEASE ]; then
|
||||
startproc -f -p /var/run/$SERVICE.pid $SALTMINION -d $CONFIG_ARGS
|
||||
startproc -f -p /var/run/$SERVICE.pid $SALTMINION -d $MINION_ARGS
|
||||
rc_status -v
|
||||
elif [ -e $DEBIAN_VERSION ]; then
|
||||
if [ -f $LOCKFILE ]; then
|
||||
echo -n "already started, lock file found"
|
||||
RETVAL=1
|
||||
elif $PYTHON $SALTMINION -d >& /dev/null; then
|
||||
elif $PYTHON $SALTMINION -d $MINION_ARGS >& /dev/null; then
|
||||
echo -n "OK"
|
||||
RETVAL=0
|
||||
fi
|
||||
@ -71,7 +70,7 @@ start() {
|
||||
RETVAL=$?
|
||||
echo -n "already running"
|
||||
else
|
||||
daemon --check $SERVICE $SALTMINION -d $CONFIG_ARGS
|
||||
daemon --check $SERVICE $SALTMINION -d $MINION_ARGS
|
||||
RETVAL=$?
|
||||
fi
|
||||
fi
|
||||
@ -133,11 +132,7 @@ case "$1" in
|
||||
;;
|
||||
reload)
|
||||
echo "can't reload configuration, you have to restart it"
|
||||
if [ -f $SUSE_RELEASE ]; then
|
||||
rc_status -v
|
||||
else
|
||||
RETVAL=$?
|
||||
fi
|
||||
RETVAL=$?
|
||||
;;
|
||||
*)
|
||||
echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
|
||||
|
||||
@ -6,36 +6,27 @@
|
||||
# LSB header
|
||||
|
||||
### BEGIN INIT INFO
|
||||
# Provides: salt-syndic
|
||||
# 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: Salt syndic master-minion passthrough daemon
|
||||
# Description: This is a the Salt syndic daemon that enables Salt master-minion remote control passthrough.
|
||||
# Provides: salt-syndic
|
||||
# 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: Salt syndic master-minion passthrough daemon
|
||||
# Description: This is a the Salt syndic daemon that enables Salt master-minion
|
||||
# remote control passthrough.
|
||||
### END INIT INFO
|
||||
|
||||
|
||||
# chkconfig header
|
||||
|
||||
# chkconfig: 345 99 99
|
||||
# chkconfig: - 99 99
|
||||
# description: This is a the Salt syndic daemon that enables Salt master-minion remote control passthrough.
|
||||
#
|
||||
# processname: /usr/bin/salt-syndic
|
||||
|
||||
|
||||
if [ -f /etc/default/salt ]; then
|
||||
. /etc/default/salt
|
||||
else
|
||||
SALTSYNDIC=/usr/bin/salt-syndic
|
||||
PYTHON=/usr/bin/python
|
||||
fi
|
||||
|
||||
# Sanity checks.
|
||||
[ -x $SALTSYNDIC ] || exit 0
|
||||
|
||||
DEBIAN_VERSION=/etc/debian_version
|
||||
SUSE_RELEASE=/etc/SuSE-release
|
||||
# Source function library.
|
||||
@ -47,27 +38,35 @@ else
|
||||
. /etc/rc.d/init.d/functions
|
||||
fi
|
||||
|
||||
# Default values (can be overridden below)
|
||||
SALTSYNDIC=/usr/bin/salt-syndic
|
||||
PYTHON=/usr/bin/python
|
||||
SYNDIC_ARGS=""
|
||||
|
||||
if [ -f /etc/default/salt ]; then
|
||||
. /etc/default/salt
|
||||
fi
|
||||
|
||||
SERVICE=salt-syndic
|
||||
PROCESS=salt-syndic
|
||||
CONFIG_ARGS=" "
|
||||
|
||||
RETVAL=0
|
||||
|
||||
start() {
|
||||
echo -n $"Starting salt-syndic daemon: "
|
||||
if [ -f $SUSE_RELEASE ]; then
|
||||
startproc -f -p /var/run/$SERVICE.pid $SALTSYNDIC -d $CONFIG_ARGS
|
||||
startproc -f -p /var/run/$SERVICE.pid $SALTSYNDIC -d $SYNDIC_ARGS
|
||||
rc_status -v
|
||||
elif [ -e $DEBIAN_VERSION ]; then
|
||||
if [ -f $LOCKFILE ]; then
|
||||
echo -n "already started, lock file found"
|
||||
RETVAL=1
|
||||
elif $PYTHON $SALTSYNDIC -d >& /dev/null; then
|
||||
elif $PYTHON $SALTSYNDIC -d $SYNDIC_ARGS >& /dev/null; then
|
||||
echo -n "OK"
|
||||
RETVAL=0
|
||||
fi
|
||||
else
|
||||
daemon --check $SERVICE $SALTSYNDIC -d $CONFIG_ARGS
|
||||
daemon --check $SERVICE $SALTSYNDIC -d $SYNDIC_ARGS
|
||||
fi
|
||||
RETVAL=$?
|
||||
echo
|
||||
@ -123,18 +122,16 @@ case "$1" in
|
||||
RETVAL=$?
|
||||
fi
|
||||
;;
|
||||
reload)
|
||||
condrestart)
|
||||
[ -f $LOCKFILE ] && restart || :
|
||||
;;
|
||||
reload)
|
||||
echo "can't reload configuration, you have to restart it"
|
||||
if [ -f $SUSE_RELEASE ]; then
|
||||
rc_status -v
|
||||
else
|
||||
RETVAL=$?
|
||||
fi
|
||||
RETVAL=$?
|
||||
;;
|
||||
*)
|
||||
echo $"Usage: $0 {start|stop|status|restart|reload}"
|
||||
echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
exit $RETVAL
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
#
|
||||
|
||||
Name: salt
|
||||
Version: 0.17.0
|
||||
Version: 0.17.1
|
||||
Release: 0
|
||||
Summary: A parallel remote execution system
|
||||
License: Apache-2.0
|
||||
@ -31,10 +31,8 @@ Source5: %{name}-syndic.service
|
||||
Source6: %{name}-minion.service
|
||||
Source7: %{name}.logrotate
|
||||
Source8: %{name}.SuSEfirewall2
|
||||
%if 0%{?sles_version}
|
||||
BuildRequires: python
|
||||
Requires: python
|
||||
%endif
|
||||
|
||||
#for building
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: logrotate
|
||||
BuildRequires: python-Jinja2
|
||||
@ -42,18 +40,32 @@ BuildRequires: python-M2Crypto
|
||||
BuildRequires: python-PyYAML
|
||||
BuildRequires: python-msgpack-python
|
||||
BuildRequires: python-pycrypto
|
||||
BuildRequires: python-pyzmq >= 2.1.9
|
||||
BuildRequires: unzip
|
||||
Requires: logrotate
|
||||
Requires: python-Jinja2
|
||||
Requires: python-PyYAML
|
||||
Requires: python-Sphinx
|
||||
Requires(pre): %fillup_prereq
|
||||
Requires(pre): %insserv_prereq
|
||||
BuildRequires: python-pyzmq
|
||||
%if 0%{?sles_version}
|
||||
BuildRequires: python
|
||||
Requires: python
|
||||
%endif
|
||||
%if 0%{?suse_version} >= 1210
|
||||
BuildRequires: systemd
|
||||
%{?systemd_requires}
|
||||
%endif
|
||||
|
||||
#for testing
|
||||
BuildRequires: python-xml
|
||||
BuildRequires: python-unittest2
|
||||
BuildRequires: python-salt-testing
|
||||
BuildRequires: python-mock
|
||||
BuildRequires: python-pip
|
||||
|
||||
Requires: logrotate
|
||||
Requires: python-Jinja2
|
||||
Requires: python-PyYAML
|
||||
Requires: python-xml
|
||||
Requires(pre): %fillup_prereq
|
||||
%if 0%{?suse_version} < 1210
|
||||
Requires(pre): %insserv_prereq
|
||||
%endif
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%if 0%{?suse_version} && 0%{?suse_version} <= 1110
|
||||
%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
|
||||
@ -61,16 +73,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildArch: noarch
|
||||
%endif
|
||||
|
||||
## Disabled for now python-mock issues
|
||||
%if 0%{?suse_version} != 1220 && 0%{?suse_version} != 1230
|
||||
BuildRequires: python-unittest2
|
||||
BuildRequires: python-salt-testing
|
||||
BuildRequires: python-xml
|
||||
BuildRequires: python-mock
|
||||
BuildRequires: python-pip
|
||||
BuildRequires: git
|
||||
%endif
|
||||
|
||||
%description
|
||||
Salt is a distributed remote execution system used to execute commands and
|
||||
query data. It was developed in order to bring the best solutions found in
|
||||
@ -83,8 +85,7 @@ servers, handle them quickly and through a simple and manageable interface.
|
||||
Summary: Management component for salt, a parallel remote execution system
|
||||
Group: System/Monitoring
|
||||
Requires: %{name} = %{version}
|
||||
Requires: zeromq >= 3.2
|
||||
Requires: python-pyzmq >= 2.10
|
||||
Requires: python-pyzmq
|
||||
Requires: python-M2Crypto
|
||||
Requires: python-msgpack-python
|
||||
Requires: python-pycrypto
|
||||
@ -96,8 +97,11 @@ Requires: dmidecode
|
||||
%endif
|
||||
%endif
|
||||
Recommends: python-halite
|
||||
Requires(pre): %fillup_prereq
|
||||
%if 0%{?suse_version} < 1210
|
||||
Requires(pre): %insserv_prereq
|
||||
%endif
|
||||
Requires(pre): %fillup_prereq
|
||||
|
||||
|
||||
%description master
|
||||
The Salt master is the central server to which all minions connect.
|
||||
@ -108,13 +112,14 @@ than serially.
|
||||
Summary: Client component for salt, a parallel remote execution system
|
||||
Group: System/Monitoring
|
||||
Requires: %{name} = %{version}
|
||||
Requires: zeromq >= 3.2
|
||||
Requires: python-pyzmq >= 2.10
|
||||
Requires: python-pyzmq
|
||||
Requires: python-M2Crypto
|
||||
Requires: python-msgpack-python
|
||||
Requires: python-pycrypto
|
||||
Requires(pre): %fillup_prereq
|
||||
%if 0%{?suse_version} < 1210
|
||||
Requires(pre): %insserv_prereq
|
||||
%endif
|
||||
Requires(pre): %fillup_prereq
|
||||
|
||||
%description minion
|
||||
Salt minion is queried and controlled from the master.
|
||||
@ -125,8 +130,10 @@ Summary: Syndic component for salt, a parallel remote execution system
|
||||
Group: System/Monitoring
|
||||
Requires: %{name} = %{version}
|
||||
Requires: %{name}-master = %{version}
|
||||
Requires(pre): %fillup_prereq
|
||||
%if 0%{?suse_version} < 1210
|
||||
Requires(pre): %insserv_prereq
|
||||
%endif
|
||||
Requires(pre): %fillup_prereq
|
||||
|
||||
%description syndic
|
||||
Salt syndic is the master-of-masters for salt
|
||||
@ -137,9 +144,13 @@ the management of multiple masters at a time..
|
||||
Summary: Ssh component for salt, a parallel remote execution system
|
||||
Group: System/Monitoring
|
||||
Requires: %{name} = %{version}
|
||||
Requires: sshpass
|
||||
Requires(pre): %fillup_prereq
|
||||
BuildRequires: python-markupsafe
|
||||
Requires: python-markupsafe
|
||||
Recommends: sshpass
|
||||
%if 0%{?suse_version} < 1210
|
||||
Requires(pre): %insserv_prereq
|
||||
%endif
|
||||
Requires(pre): %fillup_prereq
|
||||
|
||||
%description ssh
|
||||
Salt ssh is a master running without zmq.
|
||||
@ -154,10 +165,12 @@ python setup.py build
|
||||
%install
|
||||
python setup.py install --prefix=%{_prefix} --root=%{buildroot}
|
||||
|
||||
##missing directories
|
||||
## create missing directories
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/salt/master.d
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/salt/minion.d
|
||||
%if 0%{?suse_version} < 1210
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/init.d
|
||||
%endif
|
||||
mkdir -p %{buildroot}%{_localstatedir}/log/salt
|
||||
mkdir -p %{buildroot}/%{_sysconfdir}/logrotate.d/
|
||||
mkdir -p %{buildroot}/%{_sbindir}
|
||||
@ -165,92 +178,102 @@ mkdir -p %{buildroot}/var/log/salt
|
||||
mkdir -p %{buildroot}/srv/salt
|
||||
mkdir -p %{buildroot}/srv/pillar
|
||||
#
|
||||
##init scripts
|
||||
## install init scripts
|
||||
%if 0%{?_unitdir:1}
|
||||
install -Dpm 0644 %{SOURCE4} %{buildroot}%_unitdir/salt-master.service
|
||||
install -Dpm 0644 %{SOURCE5} %{buildroot}%_unitdir/salt-syndic.service
|
||||
install -Dpm 0644 %{SOURCE6} %{buildroot}%_unitdir/salt-minion.service
|
||||
%else
|
||||
install -Dpm 0755 %{SOURCE1} %{buildroot}%{_initddir}/salt-master
|
||||
install -Dpm 0755 %{SOURCE2} %{buildroot}%{_initddir}/salt-syndic
|
||||
install -Dpm 0755 %{SOURCE3} %{buildroot}%{_initddir}/salt-minion
|
||||
ln -sf %{_initddir}/salt-master %{buildroot}%{_sbindir}/rcsalt-master
|
||||
ln -sf %{_initddir}/salt-syndic %{buildroot}%{_sbindir}/rcsalt-syndic
|
||||
ln -sf %{_initddir}/salt-minion %{buildroot}%{_sbindir}/rcsalt-minion
|
||||
|
||||
%if 0%{?_unitdir:1}
|
||||
install -Dpm 0644 %{SOURCE4} %{buildroot}%_unitdir/salt-master.service
|
||||
install -Dpm 0644 %{SOURCE5} %{buildroot}%_unitdir/salt-syndic.service
|
||||
install -Dpm 0644 %{SOURCE6} %{buildroot}%_unitdir/salt-minion.service
|
||||
%endif
|
||||
|
||||
#
|
||||
##config files
|
||||
## install config files
|
||||
install -Dpm 0644 conf/minion %{buildroot}%{_sysconfdir}/salt/minion
|
||||
install -Dpm 0644 conf/master %{buildroot}%{_sysconfdir}/salt/master
|
||||
#
|
||||
##logrotate file
|
||||
## install logrotate file
|
||||
install -Dpm 0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/logrotate.d/salt
|
||||
#
|
||||
##SuSEfirewall2 file
|
||||
## install SuSEfirewall2 rules
|
||||
install -Dpm 0644 %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/salt
|
||||
|
||||
%if 0%{?suse_version} != 1220 && 0%{?suse_version} != 1230
|
||||
%check
|
||||
#export only_local_network=False
|
||||
%{__python} setup.py test --runtests-opts=-u
|
||||
%endif
|
||||
|
||||
%preun -n salt-syndic
|
||||
%stop_on_removal salt-syndic
|
||||
%if 0%{?_unitdir:1}
|
||||
%service_del_preun salt-syndic.service
|
||||
%else
|
||||
%stop_on_removal salt-syndic
|
||||
%endif
|
||||
|
||||
%post -n salt-syndic
|
||||
%fillup_and_insserv
|
||||
%if 0%{?_unitdir:1}
|
||||
%service_add_post salt-syndic.service
|
||||
%fillup_only
|
||||
%else
|
||||
%fillup_and_insserv
|
||||
%endif
|
||||
|
||||
%postun -n salt-syndic
|
||||
%restart_on_update salt-syndic
|
||||
%if 0%{?_unitdir:1}
|
||||
%service_del_postun salt-syndic.service
|
||||
%endif
|
||||
%else
|
||||
%insserv_cleanup
|
||||
%restart_on_update salt-syndic
|
||||
%endif
|
||||
|
||||
%preun -n salt-master
|
||||
%stop_on_removal salt-master
|
||||
%if 0%{?_unitdir:1}
|
||||
%service_del_preun salt-master.service
|
||||
%else
|
||||
%stop_on_removal salt-master
|
||||
%endif
|
||||
|
||||
%post -n salt-master
|
||||
%fillup_and_insserv
|
||||
%if 0%{?_unitdir:1}
|
||||
%service_add_post salt-master.service
|
||||
%fillup_only
|
||||
%else
|
||||
%fillup_and_insserv
|
||||
%endif
|
||||
|
||||
%postun -n salt-master
|
||||
%restart_on_update salt-master
|
||||
%if 0%{?_unitdir:1}
|
||||
%service_del_postun salt-master.service
|
||||
%endif
|
||||
%else
|
||||
%restart_on_update salt-master
|
||||
%insserv_cleanup
|
||||
%endif
|
||||
|
||||
%preun -n salt-minion
|
||||
%stop_on_removal salt-minion
|
||||
%if 0%{?_unitdir:1}
|
||||
%service_del_preun salt-minion.service
|
||||
%else
|
||||
%stop_on_removal salt-minion
|
||||
%endif
|
||||
|
||||
%post -n salt-minion
|
||||
%fillup_and_insserv
|
||||
%if 0%{?_unitdir:1}
|
||||
%service_add_post salt-minion.service
|
||||
%fillup_only
|
||||
%else
|
||||
%fillup_and_insserv
|
||||
%endif
|
||||
|
||||
%postun -n salt-minion
|
||||
%restart_on_update salt-minion
|
||||
%if 0%{?_unitdir:1}
|
||||
%service_del_postun salt-minion.service
|
||||
%endif
|
||||
%else
|
||||
%insserv_cleanup
|
||||
%restart_on_update salt-minion
|
||||
%endif
|
||||
|
||||
%files -n salt-ssh
|
||||
%defattr(-,root,root)
|
||||
@ -261,22 +284,24 @@ install -Dpm 0644 %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/salt-syndic
|
||||
%{_mandir}/man1/salt-syndic.1.gz
|
||||
%{_sbindir}/rcsalt-syndic
|
||||
%{_sysconfdir}/init.d/salt-syndic
|
||||
%if 0%{?_unitdir:1}
|
||||
%_unitdir/salt-syndic.service
|
||||
%else
|
||||
%{_sbindir}/rcsalt-syndic
|
||||
%{_sysconfdir}/init.d/salt-syndic
|
||||
%endif
|
||||
|
||||
%files -n salt-minion
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/salt-minion
|
||||
%{_mandir}/man1/salt-minion.1.gz
|
||||
%{_sbindir}/rcsalt-minion
|
||||
%config(noreplace) %{_sysconfdir}/init.d/salt-minion
|
||||
%attr(0644, root, root) %config(noreplace) %{_sysconfdir}/salt/minion
|
||||
%{_sysconfdir}/salt/minion.d
|
||||
%if 0%{?_unitdir:1}
|
||||
%_unitdir/salt-minion.service
|
||||
%else
|
||||
%{_sbindir}/rcsalt-minion
|
||||
%config(noreplace) %{_sysconfdir}/init.d/salt-minion
|
||||
%endif
|
||||
|
||||
%files -n salt-master
|
||||
@ -291,8 +316,6 @@ install -Dpm 0644 %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2
|
||||
%{_mandir}/man1/salt-cp.1.gz
|
||||
%{_mandir}/man1/salt-key.1.gz
|
||||
%{_mandir}/man1/salt-run.1.gz
|
||||
%{_sbindir}/rcsalt-master
|
||||
%config(noreplace) %{_sysconfdir}/init.d/salt-master
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/salt
|
||||
%attr(0644, root, root) %config(noreplace) %{_sysconfdir}/salt/master
|
||||
%{_sysconfdir}/salt/master.d
|
||||
@ -300,6 +323,9 @@ install -Dpm 0644 %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2
|
||||
%dir /srv/pillar
|
||||
%if 0%{?_unitdir:1}
|
||||
%_unitdir/salt-master.service
|
||||
%else
|
||||
%{_sbindir}/rcsalt-master
|
||||
%config(noreplace) %{_sysconfdir}/init.d/salt-master
|
||||
%endif
|
||||
|
||||
%files
|
||||
|
||||
Loading…
Reference in New Issue
Block a user