Do everything in %post script anyway.

diff --git a/README.Fedora b/README.Fedora
index 8b5b92c..446718b 100644 (file)
--- a/README.Fedora
+++ b/README.Fedora
@@ -1,6 +1,6 @@
 Machine certificate is required in /etc/grid-security.
 
-Start required daemons, httpd may need to be reloaded:
+Start required daemons, httpd may need to be reloaded if already running:
   service memcached start
   service httpd restart
 or:

diff --git a/rOCCI-server.spec b/rOCCI-server.spec
index f24d7fa..ad1d395 100644 (file)
--- a/rOCCI-server.spec
+++ b/rOCCI-server.spec
@@ -211,12 +211,14 @@ getent group rocci >/dev/null || groupadd -r rocci
 getent passwd rocci >/dev/null || useradd -r -g rocci -d %{app_root} -c "rOCCI user" rocci
 
 %post
+%systemd_post %{name}.target
 if [ "$1" -le "1" ] ; then # First install
   semodule -i %{_datadir}/selinux/packages/%{name}/%{semodule_name}.pp 2>/dev/null || :
   restorecon -R %{app_root} %{_localstatedir}/log/rocci-server 2>/dev/null || :
   semanage port -a -t http_port_t -p tcp 11443 2>/dev/null || :
+  # reload and start everything in case httpd is already running
+  systemctl reload httpd.service >/dev/null 2>&1 && systemctl start %{name}.target >/dev/null 2>&1
 fi
-%systemd_post %{name}.target
 
 %preun
 %systemd_preun %{name}.target