summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Kosek <mkosek@redhat.com>2013-03-27 14:58:16 +0100
committerMartin Kosek <mkosek@redhat.com>2013-03-29 08:59:41 +0100
commitd8f75e9e0c63dd53e6f777e59949223509ed5ac3 (patch)
tree2ba5b463431f4830a91e98cba7d18c26191ff6be
parent13b1028ac832c29656c6711834f05f7b34c75cfa (diff)
downloadfreeipa-d8f75e9e0c63dd53e6f777e59949223509ed5ac3.tar.gz
freeipa-d8f75e9e0c63dd53e6f777e59949223509ed5ac3.tar.xz
freeipa-d8f75e9e0c63dd53e6f777e59949223509ed5ac3.zip
Remove syslog.target from ipa.server
This required target is no longer needed as systemd from version 38 has its own journal which is also in the basic set of service unit requirementes. https://fedorahosted.org/freeipa/ticket/3511
-rw-r--r--freeipa.spec.in4
-rw-r--r--init/systemd/ipa.service4
2 files changed, 5 insertions, 3 deletions
diff --git a/freeipa.spec.in b/freeipa.spec.in
index cb1980a33..665a6d720 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -120,7 +120,7 @@ Requires: acl
Requires: python-pyasn1
Requires: memcached
Requires: python-memcached
-Requires: systemd-units >= 36-3
+Requires: systemd-units >= 38
Requires(pre): systemd-units
Requires(post): systemd-units
Requires: selinux-policy >= 3.11.1-86
@@ -786,6 +786,8 @@ fi
- Remove conflict with krb5-server > 1.11 as ipa-kdb is compatible
- ipa-ldap-updater show produce errors only
- update policycoreutils version to 2.1.12-5 to match Requires in Fedora
+- require at least systemd 38 which provides the journal (we no longer
+ need to require syslog.target)
* Thu Mar 21 2013 Martin Kosek <mkosek@redhat.com> - 3.1.99-1
- Require selinux-policy 3.11.1-86 to fix Fedora 17 to 18 upgrade issue
diff --git a/init/systemd/ipa.service b/init/systemd/ipa.service
index ba27d1dfd..8cfcf7c54 100644
--- a/init/systemd/ipa.service
+++ b/init/systemd/ipa.service
@@ -1,7 +1,7 @@
[Unit]
Description=Identity, Policy, Audit
-Requires=syslog.target network.target
-After=syslog.target network.target
+Requires=network.target
+After=network.target
[Service]
Type=oneshot