summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Gallagher <sgallagh@redhat.com>2011-08-03 09:42:28 -0400
committerStephen Gallagher <sgallagh@redhat.com>2011-08-08 10:23:43 -0400
commit8a07521b413a3b5879f824e1872c5770c92ee5c0 (patch)
tree2a0d148efabdffd0e8c40405665ff50cf623982f
parent7d81ad0206e14c298a6e0fe194a2442fe0cb5d6a (diff)
downloadsssd-8a07521b413a3b5879f824e1872c5770c92ee5c0.tar.gz
sssd-8a07521b413a3b5879f824e1872c5770c92ee5c0.tar.bz2
sssd-8a07521b413a3b5879f824e1872c5770c92ee5c0.zip
Rename sssd.conf to sssd-example.conf
This file should not be installed by default. It leads to user confusion. We will instead install it as documentation. Fix incorrect example of entry_cache_nowait_percentage
-rw-r--r--Makefile.am2
-rw-r--r--contrib/sssd.spec.in7
-rw-r--r--src/examples/sssd-example.conf (renamed from src/examples/sssd.conf)2
3 files changed, 5 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am
index 1df6d985..c0267d29 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -441,7 +441,7 @@ endif
dist_noinst_DATA += \
- src/examples/sssd.conf \
+ src/examples/sssd-example.conf \
src/examples/sssdproxytest \
src/examples/sudo \
src/examples/logrotate \
diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
index 1b271fbb..8bf15697 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -185,9 +185,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
# Prepare language files
/usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT sssd
-# Copy default sssd.conf file
+# Copy SSSDConfig API files
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sssd
-install -m600 src/examples/sssd.conf $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.conf
install -m444 src/config/etc/sssd.api.conf $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.api.conf
install -m444 src/config/etc/sssd.api.d/* $RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.api.d/
@@ -241,6 +240,7 @@ rm -rf $RPM_BUILD_ROOT
%files -f sssd.lang
%defattr(-,root,root,-)
%doc COPYING
+%doc src/examples/sssd-example.conf
%{_initrddir}/%{name}
%{_sbindir}/sssd
%{_libexecdir}/%{servicename}/
@@ -253,12 +253,11 @@ rm -rf $RPM_BUILD_ROOT
%attr(700,root,root) %dir %{pipepath}/private
%attr(750,root,root) %dir %{_var}/log/%{name}
%attr(711,root,root) %dir %{_sysconfdir}/sssd
-%config(noreplace) %{_sysconfdir}/sssd/sssd.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/sssd
%config(noreplace) %{_sysconfdir}/rwtab.d/sssd
%config %{_sysconfdir}/sssd/sssd.api.conf
%attr(755,root,root) %dir %{_sysconfdir}/sssd/sssd.api.d
-%config %{_sysconfdir}/sssd/sssd.api.d/
+%config %{_sysconfdir}/sssd/sssd.api.d/*
%{_mandir}/man5/sssd.conf.5*
%{_mandir}/man5/sssd-ipa.5*
%{_mandir}/man5/sssd-krb5.5*
diff --git a/src/examples/sssd.conf b/src/examples/sssd-example.conf
index cc14bc55..e0b25637 100644
--- a/src/examples/sssd.conf
+++ b/src/examples/sssd-example.conf
@@ -28,7 +28,7 @@ reconnection_retries = 3
# (NSS requests will still be returned from cache until the full
# entry_cache_timeout). Setting this value to 0 turns this feature
# off (default).
-; entry_cache_nowait_percentage = 300
+; entry_cache_nowait_percentage = 50
[pam]
reconnection_retries = 3