On 10/13/2009 08:08 AM, Stephen Gallagher wrote: > On 10/13/2009 06:22 AM, Stephen Gallagher wrote: >> Do not push. This patch is incomplete. >> >> On Oct 12, 2009, at 5:27 PM, Simo Sorce <sso...@redhat.com> wrote: >> >>> On Mon, 2009-10-12 at 17:21 -0400, Stephen Gallagher wrote: >>> "" >>> >>> ACK >>> >>> -- >>> Simo Sorce * Red Hat, Inc * New York >>> >>> _______________________________________________ >>> sssd-devel mailing list >>> sssd-devel@lists.fedorahosted.org >>> https://fedorahosted.org/mailman/listinfo/sssd-devel >> _______________________________________________ >> sssd-devel mailing list >> sssd-devel@lists.fedorahosted.org >> https://fedorahosted.org/mailman/listinfo/sssd-devel > > I realized this morning I missed two things. > > Patch 0001: I forgot to include a schema plugin for the proxy provider. > Patch 0002: I forgot to package the schema configuration files (and > plugin configuration) in the RPM. > > > > _______________________________________________ > sssd-devel mailing list > sssd-devel@lists.fedorahosted.org > https://fedorahosted.org/mailman/listinfo/sssd-devel
One more try on Patch 0002: it wasn't building the RPM on RHEL5, because the .egg-info file was not created in the older version of distutils. -- Stephen Gallagher RHCE 804006346421761 Looking to carve out IT costs? www.redhat.com/carveoutcosts/
From 9a4c017fdcc427cb6de377bd37543457615a7f02 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher <sgall...@redhat.com> Date: Tue, 13 Oct 2009 07:25:34 -0400 Subject: [PATCH 1/2] Add plugin configuration schema for proxy provider --- server/config/etc/sssd.api.d/sssd-proxy.conf | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) create mode 100644 server/config/etc/sssd.api.d/sssd-proxy.conf diff --git a/server/config/etc/sssd.api.d/sssd-proxy.conf b/server/config/etc/sssd.api.d/sssd-proxy.conf new file mode 100644 index 0000000..cc34eea --- /dev/null +++ b/server/config/etc/sssd.api.d/sssd-proxy.conf @@ -0,0 +1,7 @@ +[provider/proxy] + +[provider/proxy/id] +proxy_lib_name = str, None + +[provider/proxy/auth] +proxy_pam_target = str, None -- 1.6.2.5
From f78d423d40d90c71e6996e1205ab0c700fa8a565 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgall...@redhat.com>
Date: Mon, 12 Oct 2009 17:20:22 -0400
Subject: [PATCH 2/2] Package SSSDConfig API
---
contrib/sssd.spec.in | 9 +++++++++
server/Makefile.am | 21 +++++++++++++++++++++
server/config/setup.py | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 64 insertions(+), 0 deletions(-)
create mode 100644 server/config/setup.py
diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
index 9cd657a..670f1c9 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -1,4 +1,5 @@
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print get_python_lib()")}
Name: @PACKAGE_NAME@
Version: @PACKAGE_VERSION@
@@ -89,6 +90,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
# Copy default sssd.conf file
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sssd
install -m600 server/examples/sssd.conf
$RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.conf
+install -m400 server/config/etc/sssd.api.conf
$RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.api.conf
+install -m400 server/config/etc/sssd.api.d/*
$RPM_BUILD_ROOT%{_sysconfdir}/sssd/sssd.api.d/
# Remove .la files created by libtool
rm -f \
@@ -131,6 +134,9 @@ rm -rf $RPM_BUILD_ROOT
%attr(750,root,root) %dir %{_var}/log/%{name}
%attr(700,root,root) %dir %{_sysconfdir}/sssd
%config(noreplace) %{_sysconfdir}/sssd/sssd.conf
+%config %{_sysconfdir}/sssd/sssd.api.conf
+%attr(700,root,root) %dir %{_sysconfdir}/sssd/sssd.api.d
+%config %{_sysconfdir}/sssd/sssd.api.d/
%{_mandir}/man5/sssd.conf.5*
%{_mandir}/man5/sssd-krb5.5*
%{_mandir}/man5/sssd-ldap.5*
@@ -145,6 +151,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/locale/*/LC_MESSAGES/sss_client.mo
%{_datadir}/locale/*/LC_MESSAGES/sss_daemon.mo
%{python_sitearch}/pysss.so
+%{python_sitelib}/*.py*
+%{?fedora:%{python_sitelib}/*.egg-info}
+
%files client
/%{_lib}/libnss_sss.so.2
diff --git a/server/Makefile.am b/server/Makefile.am
index 6c08274..dd650db 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -11,6 +11,7 @@ if BUILD_KRB5_LOCATOR_PLUGIN
krb5plugindir = @krb5pluginpath@
endif
sssdconfdir = $(sysconfdir)/sssd
+sssdapiplugindir = $(sssdconfdir)/sssd.api.d
dbusintrospectdir = $(datarootdir)/sssd/introspect
dbuspolicydir = $(sysconfdir)/dbus-1/system.d
localedir = @localedir@
@@ -100,6 +101,10 @@ pyexec_LTLIBRARIES = \
pysss.la
endif
+dist_noinst_SCRIPTS = \
+ config/setup.py \
+ config/SSSDConfig.py
+
###############################
# Global compilation settings #
###############################
@@ -540,6 +545,14 @@ SUFFIXES = .1.xml .1 .3.xml .3 .5.xml .5 .8.xml .8
dist_init_SCRIPTS = \
sysv/sssd
+dist_sssdconf_DATA = \
+ config/etc/sssd.api.conf
+dist_sssdapiplugin_DATA = \
+ config/etc/sssd.api.d/sssd-krb5.conf \
+ config/etc/sssd.api.d/sssd-ldap.conf \
+ config/etc/sssd.api.d/sssd-local.conf \
+ config/etc/sssd.api.d/sssd-proxy.conf
+
installsssddirs::
mkdir -p \
$(DESTDIR)$(includedir) \
@@ -561,6 +574,14 @@ installsssddirs::
$(DESTDIR)$(logpath)
install-exec-hook: installsssddirs
+ if [ "$(DESTDIR)" = "" ]; then \
+ cd $(srcdir)/config; $(PYTHON) setup.py install; \
+ else \
+ cd $(srcdir)/config; $(PYTHON) setup.py install
--root=$(DESTDIR); \
+ fi
+
+clean-local:
+ cd $(srcdir)/config; $(PYTHON) setup.py clean --all
CLEANFILES = *.X */*.X */*/*.X
diff --git a/server/config/setup.py b/server/config/setup.py
new file mode 100644
index 0000000..7f108a3
--- /dev/null
+++ b/server/config/setup.py
@@ -0,0 +1,34 @@
+# Authors:
+# Stephen Gallagher <sgall...@redhat.com>
+#
+# Copyright (C) 2009 Red Hat
+# see file 'COPYING' for use and warranty information
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; version 2 only
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+"""
+Python-level packaging using distutils.
+"""
+
+from distutils.core import setup
+
+setup(
+ name='SSSDConfig',
+ version='1',
+ license='GPLv3+',
+ url='http://fedorahosted.org/sssd',
+ py_modules=[
+ 'SSSDConfig',
+ ],
+)
--
1.6.2.5
signature.asc
Description: OpenPGP digital signature
_______________________________________________ sssd-devel mailing list sssd-devel@lists.fedorahosted.org https://fedorahosted.org/mailman/listinfo/sssd-devel
