commit 9fa5e3e2c53c05292d4417ad30b6fa856d8745ea
Author: Tomasz Rutkowski <[email protected]>
Date: Fri Dec 21 13:21:33 2012 +0100
- actually commit changes...
salt-master.service | 3 +-
salt-minion.service | 3 +-
salt.spec | 138 +++++++++++++++++++++++++++++++++++++++-------------
3 files changed, 109 insertions(+), 35 deletions(-)
---
diff --git a/salt.spec b/salt.spec
index f0c38c5..892e284 100644
--- a/salt.spec
+++ b/salt.spec
@@ -1,13 +1,13 @@
-%define appname salt
Summary: Powerful remote config and execution manager.
-Name: python-%{appname}
-Version: 0.9.9
+Name: salt
+Version: 0.11.1
Release: 1
License: Apache 2.0
-Group: Libraries/Python
-Source0:
https://github.com/downloads/saltstack/%{appname}/%{appname}-%{version}.tar.gz
-# Source0-md5: fa223f1abe5b80a5226bc987ff7735c5
-Patch0: %{name}-grains.patch
+Group: Applications/System
+Source0:
http://pypi.python.org/packages/source/s/%{name}/%{name}-%{version}.tar.gz
+# Source0-md5: 0e96a361a5bfb9a208a6a30b2537a7c2
+Source1: %{name}-minion.service
+Source2: %{name}-master.service
URL: http://saltstack.org/
BuildRequires: gettext
BuildRequires: python-devel
@@ -17,9 +17,11 @@ Requires: python-Crypto
Requires: python-M2Crypto
Requires: python-PyYAML
Requires: python-msgpack
-Requires: python-pyzmq
+Requires: python-zmq
+Suggests: lsb-release
Suggests: python-jinja2
%pyrequires_eq python-modules
+Obsoletes: python-%{name}
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -27,9 +29,32 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
Powerful remote execution manager that can be used to administer
servers in a fast and efficient way.
+%package minion
+Summary: Salt Minion
+Summary(pl.UTF-8): Salt Minion
+Group: Applications/System
+Requires: %{name} = %{version}-%{release}
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+
+%description minion
+Salt Minion
+
+%package master
+Summary: Salt Master
+Summary(pl.UTF-8): Salt Master
+Group: Applications/System
+Requires: %{name} = %{version}-%{release}
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+
+%description master
+Salt Master
+
%prep
-%setup -q -n %{appname}-%{version}
-%patch0 -p1
+%setup
%build
export CFLAGS="%{rpmcflags}"
@@ -37,6 +62,11 @@ export CFLAGS="%{rpmcflags}"
%install
rm -rf $RPM_BUILD_ROOT
+
+mkdir -p $RPM_BUILD_ROOT/{etc,%{systemdunitdir}}
+cp -r conf $RPM_BUILD_ROOT/etc/salt
+cp %SOURCE1 $RPM_BUILD_ROOT/%{systemdunitdir}/%{name}-minion.service
+cp %SOURCE2 $RPM_BUILD_ROOT/%{systemdunitdir}/%{name}-master.service
%{__python} setup.py install \
--optimize=2 \
--root=$RPM_BUILD_ROOT
@@ -48,10 +78,27 @@ rm -rf $RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
+%post minion
+%systemd_post %{name}-minion.service
+
+%preun minion
+%systemd_preun %{name}-minion.service
+
+%postun minion
+%systemd_reload
+
+%post master
+%systemd_post %{name}-master.service
+
+%preun master
+%systemd_preun %{name}-master.service
+
+%postun master
+%systemd_reload
+
%files
%defattr(644,root,root,755)
-%dir /etc/%{appname}
-/etc/%{appname}/*.template
+%dir /etc/%{name}
%attr(755,root,root) %{_bindir}/salt
%attr(755,root,root) %{_bindir}/salt-call
%attr(755,root,root) %{_bindir}/salt-cp
@@ -60,28 +107,53 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/salt-minion
%attr(755,root,root) %{_bindir}/salt-run
%attr(755,root,root) %{_bindir}/salt-syndic
-%dir %{py_sitescriptdir}/%{appname}
-%{py_sitescriptdir}/%{appname}/*.py[co]
-%dir %{py_sitescriptdir}/%{appname}/ext
-%{py_sitescriptdir}/%{appname}/ext/*.py[co]
-%dir %{py_sitescriptdir}/%{appname}/cli
-%{py_sitescriptdir}/%{appname}/cli/*.py[co]
-%dir %{py_sitescriptdir}/%{appname}/grains
-%{py_sitescriptdir}/%{appname}/grains/*.py[co]
-%dir %{py_sitescriptdir}/%{appname}/modules
-%{py_sitescriptdir}/%{appname}/modules/*.py[co]
-%dir %{py_sitescriptdir}/%{appname}/utils
-%{py_sitescriptdir}/%{appname}/utils/*.py[co]
-%dir %{py_sitescriptdir}/%{appname}/states
-%{py_sitescriptdir}/%{appname}/states/*.py[co]
-%dir %{py_sitescriptdir}/%{appname}/runners
-%{py_sitescriptdir}/%{appname}/runners/*.py[co]
-%dir %{py_sitescriptdir}/%{appname}/returners
-%{py_sitescriptdir}/%{appname}/returners/*.py[co]
-%dir %{py_sitescriptdir}/%{appname}/renderers
-%{py_sitescriptdir}/%{appname}/renderers/*.py[co]
+%dir %{py_sitescriptdir}/%{name}
+%{py_sitescriptdir}/%{name}/*.py[co]
+%dir %{py_sitescriptdir}/%{name}/auth
+%{py_sitescriptdir}/%{name}/auth/*.py[co]
+%dir %{py_sitescriptdir}/%{name}/cli
+%{py_sitescriptdir}/%{name}/cli/*.py[co]
+%dir %{py_sitescriptdir}/%{name}/ext
+%{py_sitescriptdir}/%{name}/ext/*.py[co]
+%dir %{py_sitescriptdir}/%{name}/grains
+%{py_sitescriptdir}/%{name}/grains/*.py[co]
+%dir %{py_sitescriptdir}/%{name}/modules
+%{py_sitescriptdir}/%{name}/modules/*.py[co]
+%dir %{py_sitescriptdir}/%{name}/modules/rh_ip
+%{py_sitescriptdir}/%{name}/modules/rh_ip/*.jinja
+%dir %{py_sitescriptdir}/%{name}/output
+%{py_sitescriptdir}/%{name}/output/*.py[co]
+%dir %{py_sitescriptdir}/%{name}/pillar
+%{py_sitescriptdir}/%{name}/pillar/*.py[co]
+%dir %{py_sitescriptdir}/%{name}/runners
+%{py_sitescriptdir}/%{name}/runners/*.py[co]
+%dir %{py_sitescriptdir}/%{name}/returners
+%{py_sitescriptdir}/%{name}/returners/*.py[co]
+%dir %{py_sitescriptdir}/%{name}/renderers
+%{py_sitescriptdir}/%{name}/renderers/*.py[co]
+%dir %{py_sitescriptdir}/%{name}/search
+%{py_sitescriptdir}/%{name}/search/*.py[co]
+%dir %{py_sitescriptdir}/%{name}/states
+%{py_sitescriptdir}/%{name}/states/*.py[co]
+%dir %{py_sitescriptdir}/%{name}/tops
+%{py_sitescriptdir}/%{name}/tops/*.py[co]
+%dir %{py_sitescriptdir}/%{name}/utils
+%{py_sitescriptdir}/%{name}/utils/*.py[co]
+%dir %{py_sitescriptdir}/%{name}/wheel
+%{py_sitescriptdir}/%{name}/wheel/*.py[co]
%if "%{py_ver}" > "2.4"
-%{py_sitescriptdir}/%{appname}-*.egg-info
+%{py_sitescriptdir}/%{name}-*.egg-info
%endif
%{_mandir}/man1/*
%{_mandir}/man7/*
+
+%files minion
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) /etc/%{name}/minion
+%{systemdunitdir}/%{name}-minion.service
+
+%files master
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) /etc/%{name}/master
+%{systemdunitdir}/%{name}-master.service
+
diff --git a/salt-master.service b/salt-master.service
index 148eeaf..1a03b76 100644
--- a/salt-master.service
+++ b/salt-master.service
@@ -4,7 +4,8 @@ After=syslog.target network.target
[Service]
ExecStart=/usr/bin/salt-master -d
-Type=simple
+RemainAfterExit=yes
+Type=oneshot
[Install]
WantedBy=multi-user.target
diff --git a/salt-minion.service b/salt-minion.service
index 3abe473..5cabcd8 100644
--- a/salt-minion.service
+++ b/salt-minion.service
@@ -4,7 +4,8 @@ After=syslog.target network.target
[Service]
ExecStart=/usr/bin/salt-minion -d
-Type=simple
+RemainAfterExit=yes
+Type=oneshot
[Install]
WantedBy=multi-user.target
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/salt.git/commitdiff/9fa5e3e2c53c05292d4417ad30b6fa856d8745ea
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
