summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobbie Harwood <rharwood@redhat.com>2017-04-28 20:14:00 +0000
committerRobbie Harwood <rharwood@redhat.com>2017-04-28 20:14:01 +0000
commit3cae6ae5c37a3c500c074241f794716c1e6fdc90 (patch)
tree597cd12d64a1e3ad6098b3e5f651d2097ac7d9da
parent21848ec3e1a0d4a00ed0f4ff467c3b37ec97d395 (diff)
downloadkrb5-3cae6ae5c37a3c500c074241f794716c1e6fdc90.tar.gz
krb5-3cae6ae5c37a3c500c074241f794716c1e6fdc90.tar.xz
krb5-3cae6ae5c37a3c500c074241f794716c1e6fdc90.zip
Add kprop service env config file
-rw-r--r--kprop.service3
-rw-r--r--kprop.sysconfig1
-rw-r--r--krb5.spec10
3 files changed, 11 insertions, 3 deletions
diff --git a/kprop.service b/kprop.service
index 6a33467..4bbf8eb 100644
--- a/kprop.service
+++ b/kprop.service
@@ -5,7 +5,8 @@ AssertPathExists=/var/kerberos/krb5kdc/kpropd.acl
[Service]
Type=forking
-ExecStart=/usr/sbin/kpropd
+EnvironmentFile=-/etc/sysconfig/kprop
+ExecStart=/usr/sbin/kpropd $KPROPD_ARGS
[Install]
WantedBy=multi-user.target
diff --git a/kprop.sysconfig b/kprop.sysconfig
new file mode 100644
index 0000000..f43e8bb
--- /dev/null
+++ b/kprop.sysconfig
@@ -0,0 +1 @@
+KPROPD_ARGS=
diff --git a/krb5.spec b/krb5.spec
index bbb3e7c..03d0397 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -18,7 +18,7 @@ Summary: The Kerberos network authentication system
Name: krb5
Version: 1.15.1
# for prerelease, should be e.g., 0.3.beta2%{?dist}
-Release: 7%{?dist}
+Release: 8%{?dist}
# - Maybe we should explode from the now-available-to-everybody tarball instead?
# http://web.mit.edu/kerberos/dist/krb5/1.13/krb5-1.13.2-signed.tar
# - The sources below are stored in a lookaside cache. Upload with
@@ -37,6 +37,7 @@ Source10: kdc.conf
Source11: kadm5.acl
Source19: krb5kdc.sysconfig
Source20: kadmin.sysconfig
+Source21: kprop.sysconfig
Source29: ksu.pamd
Source31: kerberos-adm.portreserve
Source32: krb5_prop.portreserve
@@ -443,7 +444,8 @@ mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/run/krb5kdc
mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
for sysconfig in \
%{SOURCE19}\
- %{SOURCE20} ; do
+ %{SOURCE20}\
+ %{SOURCE21} ; do
install -pm 644 ${sysconfig} \
$RPM_BUILD_ROOT/etc/sysconfig/`basename ${sysconfig} .sysconfig`
done
@@ -599,6 +601,7 @@ exit 0
%dir %{_localstatedir}/run/krb5kdc
%config(noreplace) /etc/sysconfig/krb5kdc
%config(noreplace) /etc/sysconfig/kadmin
+%config(noreplace) /etc/sysconfig/kprop
%config(noreplace) /etc/logrotate.d/krb5kdc
%config(noreplace) /etc/logrotate.d/kadmind
@@ -732,6 +735,9 @@ exit 0
%{_libdir}/libkadm5srv_mit.so.*
%changelog
+* Fri Apr 28 2017 Robbie Harwood <rharwood@redhat.com> - 1.15.1-8
+- Add kprop service env config file
+
* Wed Apr 19 2017 Robbie Harwood <rharwood@redhat.com> - 1.15.1-7
- Update backports of certauth and corresponding test