Don't enable stap-server.service by default

diff --git a/systemtap.spec b/systemtap.spec
index ad7d4bb49b12057f6113fc63f8f2adc4b1861018..2f43e572e6b44eaef99508ed792a989220893bf1 100644 (file)
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -612,9 +612,10 @@ test -e %{_localstatedir}/log/stap-server/log || {
 if test ! -e ~stap-server/.systemtap/ssl/server/stap.cert; then
    runuser -s /bin/sh - stap-server -c %{_libexecdir}/systemtap/stap-gen-cert >/dev/null
 fi
-# Activate the service
+# Prepare the service
 %if %{with_systemd}
-     /bin/systemctl enable stap-server.service >/dev/null 2>&1 || :
+     # Note, Fedora policy doesn't allow network services enabled by default
+     # /bin/systemctl enable stap-server.service >/dev/null 2>&1 || :
      /bin/systemd-tmpfiles --create >/dev/null 2>&1 || :
 %else
     /sbin/chkconfig --add stap-server
@@ -649,7 +650,7 @@ exit 0
 # If so, restart the service if it's running
 if [ "$1" -ge "1" ] ; then
     %if %{with_systemd}
-        /bin/systemctl restart stap-server.service >/dev/null 2>&1 || :
+        /bin/systemctl condrestart stap-server.service >/dev/null 2>&1 || :
     %else
         /sbin/service stap-server condrestart >/dev/null 2>&1 || :
     %endif