Compare commits
1 commit
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
04b3116e7c |
3 changed files with 32 additions and 7 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1,3 +1,4 @@
|
||||||
/aeolus-configserver-0.4.1.tgz
|
/aeolus-configserver-0.4.1.tgz
|
||||||
/aeolus-configserver-0.4.5.tgz
|
/aeolus-configserver-0.4.5.tgz
|
||||||
/aeolus-configserver-0.5.0.tgz
|
/aeolus-configserver-0.5.0.tgz
|
||||||
|
/aeolus-configserver-0.5.1.tgz
|
||||||
|
|
|
||||||
|
|
@ -14,8 +14,8 @@
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
#
|
#
|
||||||
Name: aeolus-configserver
|
Name: aeolus-configserver
|
||||||
Version: 0.5.0
|
Version: 0.5.1
|
||||||
Release: 0%{?dist}.20120713134829gitf92ebde
|
Release: 1%{?dist}
|
||||||
Summary: The Aeolus Config Server
|
Summary: The Aeolus Config Server
|
||||||
|
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
|
|
@ -74,6 +74,11 @@ Requires(post): chkconfig
|
||||||
Requires(preun): chkconfig
|
Requires(preun): chkconfig
|
||||||
Requires(preun): initscripts
|
Requires(preun): initscripts
|
||||||
|
|
||||||
|
%if 0%{?fedora} >= 17
|
||||||
|
Requires(post): systemd-units
|
||||||
|
Requires(preun): systemd-units
|
||||||
|
%endif
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
|
|
@ -169,6 +174,9 @@ install -m 0644 \
|
||||||
install configure/bin/config_httpd.sh \
|
install configure/bin/config_httpd.sh \
|
||||||
%{buildroot}%{_bindir}/aeolus-configserver-setup
|
%{buildroot}%{_bindir}/aeolus-configserver-setup
|
||||||
|
|
||||||
|
install conf/aeolus-configserver-thinwrapper \
|
||||||
|
%{buildroot}%{_bindir}/aeolus-configserver-thinwrapper
|
||||||
|
|
||||||
# copy the generated man page from the buildroot
|
# copy the generated man page from the buildroot
|
||||||
install -m 0644 aeolus-configserver-setup.8 %{buildroot}%{_mandir}/man8
|
install -m 0644 aeolus-configserver-setup.8 %{buildroot}%{_mandir}/man8
|
||||||
|
|
||||||
|
|
@ -190,18 +198,28 @@ getent passwd aeolus >/dev/null || \
|
||||||
chkconfig %{name} on
|
chkconfig %{name} on
|
||||||
chkconfig httpd on
|
chkconfig httpd on
|
||||||
%else
|
%else
|
||||||
systemctl enable %{name}.service > /dev/null
|
%if 0%{?fedora} <= 17
|
||||||
|
if [ $1 -eq 1]; then
|
||||||
|
systemctl enable %{name}.service > /dev/null 2>&1 || :
|
||||||
|
fi
|
||||||
|
%else
|
||||||
|
%systemd_post %{name}.service
|
||||||
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%preun
|
%preun
|
||||||
# stop and unregister the service before package deletion
|
# halt and unregister the service before package deletion
|
||||||
if [ $1 = 0 ]; then
|
if [ $1 = 0 ]; then
|
||||||
%if 0%{?rhel}
|
%if 0%{?rhel}
|
||||||
service %{name} stop > /dev/null 2>&1
|
service %{name} stop > /dev/null 2>&1
|
||||||
chkconfig --del %{name}
|
chkconfig --del %{name}
|
||||||
%else
|
%else
|
||||||
systemctl stop %{name}.service > /dev/null
|
%if 0%{?fedora} <= 17
|
||||||
systemctl disable %{name}.service > /dev/null
|
/bin/systemctl stop %{name}.service > /dev/null 2>&1 || :
|
||||||
|
/bin/systemctl --no-reload disable %{name}.service > /dev/null 2>&1 || :
|
||||||
|
%else
|
||||||
|
%systemd_preun %{name}.service
|
||||||
|
%endif
|
||||||
%endif
|
%endif
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
@ -237,6 +255,7 @@ fi
|
||||||
%{app_root}/lib/model/service.rb
|
%{app_root}/lib/model/service.rb
|
||||||
|
|
||||||
%{_bindir}/aeolus-configserver-setup
|
%{_bindir}/aeolus-configserver-setup
|
||||||
|
%{_bindir}/aeolus-configserver-thinwrapper
|
||||||
%dir %{_sysconfdir}/%{name}
|
%dir %{_sysconfdir}/%{name}
|
||||||
|
|
||||||
%if 0%{?rhel}
|
%if 0%{?rhel}
|
||||||
|
|
@ -254,8 +273,13 @@ fi
|
||||||
%doc COPYING
|
%doc COPYING
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Sep 13 2012 Greg Blomquist <gblomqui@redhat.com> 0.5.0-0
|
||||||
|
- https://bugzilla.redhat.com/show_bug.cgi?id=856650
|
||||||
|
- https://bugzilla.redhat.com/show_bug.cgi?id=851247
|
||||||
|
- https://bugzilla.redhat.com/show_bug.cgi?id=833660
|
||||||
* Tue Mar 13 2012 Joe VLcek <jvlcek@redhat.com> 0.5.0-0
|
* Tue Mar 13 2012 Joe VLcek <jvlcek@redhat.com> 0.5.0-0
|
||||||
- Convert init scripts to sysV and systemd
|
- Convert init scripts to sysV and systemd
|
||||||
|
- https://bugzilla.redhat.com/show_bug.cgi?id=833660
|
||||||
* Mon Mar 05 2012 Dan Radez <dradez@redhat.com> 0.4.6-1
|
* Mon Mar 05 2012 Dan Radez <dradez@redhat.com> 0.4.6-1
|
||||||
- https://bugzilla.redhat.com/show_bug.cgi?id=798787
|
- https://bugzilla.redhat.com/show_bug.cgi?id=798787
|
||||||
- chkconfig on for http and configserver
|
- chkconfig on for http and configserver
|
||||||
|
|
|
||||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
||||||
f0914e1bd8c646e667f12192e2a0dd35 aeolus-configserver-0.5.0.tgz
|
b734c3f99a5de9c24f422541694a6518 aeolus-configserver-0.5.1.tgz
|
||||||
|
|
|
||||||
Reference in a new issue