From 33d960c726f5f7ea7d5b7723646b2bba14494799 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@redhat.com>
Date: Jul 02 2015 15:59:07 +0000
Subject: Rework how we do system bus activation


Tell systemd how to activate us when it's handling bus activation.  Drop
the .path unit, which we didn't get working right.  This should take
care of the rest of ticket #38.

---

diff --git a/certmonger.spec b/certmonger.spec
index ef09c61..40f6334 100644
--- a/certmonger.spec
+++ b/certmonger.spec
@@ -238,6 +238,7 @@ exit 0
 %endif
 %if %{systemd}
 %{_unitdir}/*
+%{_datadir}/dbus-1/system-services/*
 %endif
 
 %changelog
diff --git a/configure.ac b/configure.ac
index 6bdb26b..f2f1b30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -798,4 +798,4 @@ else
 fi
 
 AC_CONFIG_COMMANDS(src_introspect_sh,[chmod +x src/introspect.sh])
-AC_OUTPUT(Makefile src/Makefile dbus/Makefile systemd/Makefile sysvinit/Makefile sysvinit/certmonger tests/Makefile tests/tools/Makefile dbus/certmonger.conf dbus/certmonger.service src/introspect.sh src/certmonger.8 src/getcert.1 src/getcert-request.1 src/getcert-list.1 src/getcert-list-cas.1 src/getcert-start-tracking.1 src/getcert-stop-tracking.1 src/selfsign-getcert.1 src/ipa-getcert.1 src/getcert-resubmit.1 src/certmonger-certmaster-submit.8 src/certmonger-ipa-submit.8 src/certmonger-dogtag-ipa-renew-agent-submit.8 src/certmaster-getcert.1 src/certmonger.conf.5 po/Makefile.in src/certmonger.conf systemd/certmonger.service systemd/certmonger.path systemd/certmonger.conf systemd/org.fedorahosted.certmonger.service src/getcert-refresh.1 src/getcert-refresh-ca.1 src/local-getcert.1 src/certmonger-local-submit.8 src/getcert-status.1 src/certmonger-dogtag-submit.8 src/certmonger-scep-submit.8 src/getcert-add-ca.1 src/getcert-add-scep-ca.1 src/getcert-modify-ca.1 src/getcert-remove-ca.1)
+AC_OUTPUT(Makefile src/Makefile dbus/Makefile systemd/Makefile sysvinit/Makefile sysvinit/certmonger tests/Makefile tests/tools/Makefile dbus/certmonger.conf dbus/certmonger.service src/introspect.sh src/certmonger.8 src/getcert.1 src/getcert-request.1 src/getcert-list.1 src/getcert-list-cas.1 src/getcert-start-tracking.1 src/getcert-stop-tracking.1 src/selfsign-getcert.1 src/ipa-getcert.1 src/getcert-resubmit.1 src/certmonger-certmaster-submit.8 src/certmonger-ipa-submit.8 src/certmonger-dogtag-ipa-renew-agent-submit.8 src/certmaster-getcert.1 src/certmonger.conf.5 po/Makefile.in src/certmonger.conf systemd/certmonger.service systemd/certmonger.conf systemd/org.fedorahosted.certmonger.service src/getcert-refresh.1 src/getcert-refresh-ca.1 src/local-getcert.1 src/certmonger-local-submit.8 src/getcert-status.1 src/certmonger-dogtag-submit.8 src/certmonger-scep-submit.8 src/getcert-add-ca.1 src/getcert-add-scep-ca.1 src/getcert-modify-ca.1 src/getcert-remove-ca.1)
diff --git a/systemd/Makefile.am b/systemd/Makefile.am
index 41fca14..054748b 100644
--- a/systemd/Makefile.am
+++ b/systemd/Makefile.am
@@ -1,9 +1,8 @@
 if SYSTEMD
 unitsdir = @SYSTEMDSYSTEMUNITDIR@
 units_DATA = certmonger.service
-#units_DATA += certmonger.path
-#servicedir = @SYSTEMBUSSERVICESDIR@
-#service_DATA = org.fedorahosted.certmonger.service
+servicedir = @SYSTEMBUSSERVICESDIR@
+service_DATA = org.fedorahosted.certmonger.service
 endif
 if TMPFILES
 tmpfilesdir = $(prefix)/lib/tmpfiles.d
diff --git a/systemd/certmonger.path.in b/systemd/certmonger.path.in
deleted file mode 100644
index e54b262..0000000
--- a/systemd/certmonger.path.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Certificate monitoring and PKI enrollment
-After=syslog.target network.target dbus.service
-
-[Path]
-DirectoryNotEmpty=@CM_STORE_REQUESTS_DIRECTORY@
-
-[Install]
-WantedBy=multi-user.target
diff --git a/systemd/org.fedorahosted.certmonger.service.in b/systemd/org.fedorahosted.certmonger.service.in
index fbbde51..3828e4e 100644
--- a/systemd/org.fedorahosted.certmonger.service.in
+++ b/systemd/org.fedorahosted.certmonger.service.in
@@ -1,3 +1,5 @@
 [D-BUS Service]
 Name=@CM_DBUS_NAME@
-Exec=@mysbindir@/certmonger-session -b @CM_DEFAULT_IDLE_TIMEOUT@
+Exec=/bin/false
+User=root
+SystemdService=certmonger.service