summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Gallagher <sgallagh@redhat.com>2012-01-30 09:56:52 -0500
committerStephen Gallagher <sgallagh@redhat.com>2012-01-30 19:56:25 -0500
commit2a552e43581c74f51205c7141ec9f6e9542509f8 (patch)
treec412f07b0bb4c6fef72f7e7d4ae7744ef290e753
parentc9b2b7f3f02bf40b698c70640f151d0113736195 (diff)
downloadsssd-2a552e43581c74f51205c7141ec9f6e9542509f8.tar.gz
sssd-2a552e43581c74f51205c7141ec9f6e9542509f8.tar.bz2
sssd-2a552e43581c74f51205c7141ec9f6e9542509f8.zip
SSSDConfigAPI: Move sssd.api.* to /usr/share/sssd
https://fedorahosted.org/sssd/ticket/1158
-rw-r--r--Makefile.am6
-rw-r--r--contrib/sssd.spec.in9
-rw-r--r--src/config/SSSDConfig.py8
3 files changed, 11 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am
index a8ae01d7..cefce80c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,8 @@ if BUILD_KRB5_LOCATOR_PLUGIN
krb5plugindir = @krb5pluginpath@
endif
sssdconfdir = $(sysconfdir)/sssd
-sssdapiplugindir = $(sssdconfdir)/sssd.api.d
+sssddatadir = $(datadir)/sssd
+sssdapiplugindir = $(sssddatadir)/sssd.api.d
dbusintrospectdir = $(datarootdir)/sssd/introspect
localedir = @localedir@
nsslibdir = @nsslibdir@
@@ -1199,7 +1200,7 @@ endif
endif
-dist_sssdconf_DATA = \
+dist_sssddata_DATA = \
src/config/etc/sssd.api.conf
dist_sssdapiplugin_DATA = \
src/config/etc/sssd.api.d/sssd-ipa.conf \
@@ -1221,6 +1222,7 @@ installsssddirs::
$(DESTDIR)$(pipepath)/private \
$(DESTDIR)$(sssdlibdir) \
$(DESTDIR)$(sssdconfdir) \
+ $(DESTDIR)$(sssddatadir) \
$(DESTDIR)$(dbpath) \
$(DESTDIR)$(pidpath) \
$(DESTDIR)$(logpath) \
diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
index e5d12bfc..f3ea45f0 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -235,11 +235,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
# Prepare language files
/usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT sssd
-# Copy SSSDConfig API files
+# Prepare empty config file (needed for RHEL 5)
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sssd
touch $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/
# Copy default logrotate file
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d
@@ -299,9 +297,8 @@ rm -rf $RPM_BUILD_ROOT
%ghost %attr(0600,root,root) %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/*
+%{_datadir}/sssd/sssd.api.conf
+%{_datadir}/sssd/sssd.api.d
%{_mandir}/man5/sssd.conf.5*
%{_mandir}/man5/sssd-ipa.5*
%{_mandir}/man5/sssd-krb5.5*
diff --git a/src/config/SSSDConfig.py b/src/config/SSSDConfig.py
index 413eab08..38c0e02e 100644
--- a/src/config/SSSDConfig.py
+++ b/src/config/SSSDConfig.py
@@ -286,9 +286,9 @@ class SSSDConfigSchema(SSSDChangeConf):
SSSDChangeConf.__init__(self)
#TODO: get these from a global setting
if not schemafile:
- schemafile = '/etc/sssd/sssd.api.conf'
+ schemafile = '/usr/share/sssd/sssd.api.conf'
if not schemaplugindir:
- schemaplugindir = '/etc/sssd/sssd.api.d'
+ schemaplugindir = '/usr/share/sssd/sssd.api.d'
try:
#Read the primary config file
@@ -1190,10 +1190,10 @@ class SSSDConfig(SSSDChangeConf):
schemafile:
The path to the api schema config file. Usually
- /etc/sssd/sssd.api.conf
+ /usr/share/sssd/sssd.api.conf
schemaplugindir:
The path the directory containing the provider schema config files.
- Usually /etc/sssd/sssd.api.d
+ Usually /usr/share/sssd/sssd.api.d
=== Returns ===
The newly-created SSSDConfig object.