diff options
author | Karl MacMillan <kmacmillan@mentalrootkit.com> | 2007-07-31 12:09:38 -0400 |
---|---|---|
committer | Karl MacMillan <kmacmillan@mentalrootkit.com> | 2007-07-31 12:09:38 -0400 |
commit | 7d95cd612c1b340add692038c835e7cd8d8ad18b (patch) | |
tree | 144813760c6ff19d85285496293270385af74fde | |
parent | 1d8d4222ab05ee7cf84203d4917174f7fbca1200 (diff) | |
download | freeipa-7d95cd612c1b340add692038c835e7cd8d8ad18b.tar.gz freeipa-7d95cd612c1b340add692038c835e7cd8d8ad18b.tar.xz freeipa-7d95cd612c1b340add692038c835e7cd8d8ad18b.zip |
Final reorginzation to reflect packaging.
-rw-r--r-- | Makefile | 18 | ||||
-rw-r--r-- | ipa-admintools/Makefile | 8 | ||||
-rw-r--r-- | ipa-admintools/ipa-adduser (renamed from ipa-admintools/src/ipa-adduser) | 0 | ||||
-rw-r--r-- | ipa-admintools/ipa-finduser (renamed from ipa-admintools/src/ipa-finduser) | 0 | ||||
-rw-r--r-- | ipa-admintools/src/Makefile | 10 | ||||
-rw-r--r-- | ipa-python/Makefile (renamed from ipa-server/ipa-web/client/Makefile) | 0 | ||||
-rw-r--r-- | ipa-python/README (renamed from ipa-server/ipa-web/README) | 0 | ||||
-rw-r--r-- | ipa-python/rpcclient.py (renamed from ipa-server/ipa-web/client/rpcclient.py) | 0 | ||||
-rw-r--r-- | ipa-server/Makefile | 2 | ||||
-rw-r--r-- | ipa-server/ipa-web/Makefile | 9 | ||||
-rw-r--r-- | ipa-server/ipa-web/client/README | 0 | ||||
-rw-r--r-- | ipa-server/ipa-web/gui/README | 0 | ||||
-rw-r--r-- | ipa-server/ipaserver/ipaldap.py (renamed from ipa-server/ipa-web/client/ipaldap.py) | 0 | ||||
-rw-r--r-- | ipa-server/xmlrpc-server/Makefile (renamed from ipa-server/ipa-web/api/Makefile) | 2 | ||||
-rw-r--r-- | ipa-server/xmlrpc-server/README (renamed from ipa-server/ipa-web/api/README) | 0 | ||||
-rw-r--r-- | ipa-server/xmlrpc-server/funcs.py (renamed from ipa-server/ipa-web/api/funcs.py) | 16 | ||||
-rw-r--r-- | ipa-server/xmlrpc-server/ipa.conf (renamed from ipa-server/ipa-web/api/ipa.conf) | 4 | ||||
-rw-r--r-- | ipa-server/xmlrpc-server/ipaxmlrpc.py (renamed from ipa-server/ipa-web/api/ipaxmlrpc.py) | 18 |
18 files changed, 35 insertions, 52 deletions
@@ -1,4 +1,4 @@ -SUBDIRS=ipa-server ipa-admintools +SUBDIRS=ipa-server ipa-admintools ipa-python PRJ_PREFIX=freeipa @@ -9,7 +9,6 @@ SERV_MAJOR=0 SERV_MINOR=1 SERV_RELEASE=0 SERV_VERSION=$(SERV_MAJOR).$(SERV_MINOR).$(SERV_RELEASE) - SERV_TARBALL_PREFIX=$(PRJ_PREFIX)-server-$(SERV_VERSION) SERV_TARBALL=$(SERV_TARBALL_PREFIX).tgz @@ -17,10 +16,16 @@ ADMIN_MAJOR=0 ADMIN_MINOR=1 ADMIN_RELEASE=0 ADMIN_VERSION=$(ADMIN_MAJOR).$(ADMIN_MINOR).$(ADMIN_RELEASE) - ADMIN_TARBALL_PREFIX=$(PRJ_PREFIX)-admintools-$(ADMIN_VERSION) ADMIN_TARBALL=$(ADMIN_TARBALL_PREFIX).tgz +PYTHON_MAJOR=0 +PYTHON_MINOR=1 +PYTHON_RELEASE=0 +PYTHON_VERSION=$(PYTHON_MAJOR).$(PYTHON_MINOR).$(PYTHON_RELEASE) +PYTHON_TARBALL_PREFIX=$(PRJ_PREFIX)-admintools-$(PYTHON_VERSION) +PYTHON_TARBALL=$(PYTHON_TARBALL_PREFIX).tgz + all: @for subdir in $(SUBDIRS); do \ (cd $$subdir && $(MAKE) $@) || exit 1; \ @@ -35,6 +40,7 @@ clean: @for subdir in $(SUBDIRS); do \ (cd $$subdir && $(MAKE) $@) || exit 1; \ done + rm -f *~ version-update: sed s/VERSION/$(SERV_VERSION)/ ipa-server/freeipa-server.spec.in \ @@ -55,6 +61,12 @@ tarballs: cd dist; tar cfz $(ADMIN_TARBALL) $(ADMIN_TARBALL_PREFIX) rm -fr dist/$(ADMIN_TARBALL_PREFIX) + # ipa-python + mv dist/freeipa/ipa-python dist/$(PYTHON_TARBALL_PREFIX) + rm -f dist/$(PYTHON_TARBALL) + cd dist; tar cfz $(PYTHON_TARBALL) $(PYTHON_TARBALL_PREFIX) + rm -fr dist/$(PYTHON_TARBALL_PREFIX) + # cleanup rm -fr dist/freeipa diff --git a/ipa-admintools/Makefile b/ipa-admintools/Makefile index a7b276f2b..e0fd405ab 100644 --- a/ipa-admintools/Makefile +++ b/ipa-admintools/Makefile @@ -1,8 +1,10 @@ +SBINDIR = $(DESTDIR)/usr/sbin + all: ; install: - $(MAKE) -C src $@ + install -m 755 ipa-adduser $(SBINDIR) + install -m 755 ipa-finduser $(SBINDIR) clean: - $(MAKE) -C src $@ - rm -f *~ + rm -f *~ *.pyc diff --git a/ipa-admintools/src/ipa-adduser b/ipa-admintools/ipa-adduser index 94a19dba4..94a19dba4 100644 --- a/ipa-admintools/src/ipa-adduser +++ b/ipa-admintools/ipa-adduser diff --git a/ipa-admintools/src/ipa-finduser b/ipa-admintools/ipa-finduser index 928eff753..928eff753 100644 --- a/ipa-admintools/src/ipa-finduser +++ b/ipa-admintools/ipa-finduser diff --git a/ipa-admintools/src/Makefile b/ipa-admintools/src/Makefile deleted file mode 100644 index e0fd405ab..000000000 --- a/ipa-admintools/src/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -SBINDIR = $(DESTDIR)/usr/sbin - -all: ; - -install: - install -m 755 ipa-adduser $(SBINDIR) - install -m 755 ipa-finduser $(SBINDIR) - -clean: - rm -f *~ *.pyc diff --git a/ipa-server/ipa-web/client/Makefile b/ipa-python/Makefile index bc6554be4..bc6554be4 100644 --- a/ipa-server/ipa-web/client/Makefile +++ b/ipa-python/Makefile diff --git a/ipa-server/ipa-web/README b/ipa-python/README index e69de29bb..e69de29bb 100644 --- a/ipa-server/ipa-web/README +++ b/ipa-python/README diff --git a/ipa-server/ipa-web/client/rpcclient.py b/ipa-python/rpcclient.py index 416026628..416026628 100644 --- a/ipa-server/ipa-web/client/rpcclient.py +++ b/ipa-python/rpcclient.py diff --git a/ipa-server/Makefile b/ipa-server/Makefile index 0976df430..dd3fa71ef 100644 --- a/ipa-server/Makefile +++ b/ipa-server/Makefile @@ -1,4 +1,4 @@ -SUBDIRS=ipa-install +SUBDIRS=ipa-install xmlrpc-server PYTHONDIR=$(DESTDIR)/usr/share/ipa/ipaserver all: diff --git a/ipa-server/ipa-web/Makefile b/ipa-server/ipa-web/Makefile deleted file mode 100644 index 055ee9f44..000000000 --- a/ipa-server/ipa-web/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -all: ; - -install: - $(MAKE) -C api $@ - $(MAKE) -C client $@ - -clean: - $(MAKE) -C api $@ - rm -f *~ diff --git a/ipa-server/ipa-web/client/README b/ipa-server/ipa-web/client/README deleted file mode 100644 index e69de29bb..000000000 --- a/ipa-server/ipa-web/client/README +++ /dev/null diff --git a/ipa-server/ipa-web/gui/README b/ipa-server/ipa-web/gui/README deleted file mode 100644 index e69de29bb..000000000 --- a/ipa-server/ipa-web/gui/README +++ /dev/null diff --git a/ipa-server/ipa-web/client/ipaldap.py b/ipa-server/ipaserver/ipaldap.py index 50f88520c..50f88520c 100644 --- a/ipa-server/ipa-web/client/ipaldap.py +++ b/ipa-server/ipaserver/ipaldap.py diff --git a/ipa-server/ipa-web/api/Makefile b/ipa-server/xmlrpc-server/Makefile index 6af262ee9..10b796ea6 100644 --- a/ipa-server/ipa-web/api/Makefile +++ b/ipa-server/xmlrpc-server/Makefile @@ -1,4 +1,4 @@ -SHAREDIR = $(DESTDIR)/usr/share/ipa +SHAREDIR = $(DESTDIR)/usr/share/ipa/ipaserver HTTPDIR = $(DESTDIR)/etc/httpd/conf.d/ all: ; diff --git a/ipa-server/ipa-web/api/README b/ipa-server/xmlrpc-server/README index e69de29bb..e69de29bb 100644 --- a/ipa-server/ipa-web/api/README +++ b/ipa-server/xmlrpc-server/README diff --git a/ipa-server/ipa-web/api/funcs.py b/ipa-server/xmlrpc-server/funcs.py index b23a40c9b..78180a491 100644 --- a/ipa-server/ipa-web/api/funcs.py +++ b/ipa-server/xmlrpc-server/funcs.py @@ -17,10 +17,12 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +import sys +sys.path.append("/usr/share/ipa") + import ldap -import ipa -import ipa.dsinstance -import ipa.ipaldap +import ipaserver.dsinstance +import ipaserver.ipaldap import pdb import string from types import * @@ -44,11 +46,11 @@ def get_user (username): # FIXME: Is this the filter we want or should it be more specific? filter = "(uid=" username ")" try: - m1 = ipa.ipaldap.IPAdmin(host,port,binddn,bindpw) + m1 = ipaserver.ipaldap.IPAdmin(host,port,binddn,bindpw) ent = m1.getEntry(basedn, scope, filter, None) except ldap.LDAPError, e: raise xmlrpclib.Fault(1, e) - except ipa.ipaldap.NoSuchEntryError: + except ipaserver.ipaldap.NoSuchEntryError: raise xmlrpclib.Fault(2, "No such user") # Convert to LDIF @@ -84,7 +86,7 @@ def get_user (username): def add_user (user): """Add a user in LDAP""" dn="uid=%s,ou=users,ou=default,dc=greyoak,dc=com" % user['uid'] - entry = ipa.ipaldap.Entry(dn) + entry = ipaserver.ipaldap.Entry(dn) # some required objectclasses entry.setValues('objectClass', 'top', 'posixAccount', 'shadowAccount', 'account', 'person', 'inetOrgPerson', 'organizationalPerson', 'krbPrincipalAux', 'krbTicketPolicyAux') @@ -104,7 +106,7 @@ def add_user (user): entry.setValues(u, user[u]) try: - m1 = ipa.ipaldap.IPAdmin(host,port,binddn,bindpw) + m1 = ipaserver.ipaldap.IPAdmin(host,port,binddn,bindpw) res = m1.addEntry(entry) return res except ldap.ALREADY_EXISTS: diff --git a/ipa-server/ipa-web/api/ipa.conf b/ipa-server/xmlrpc-server/ipa.conf index 44c4d25ec..5a1304188 100644 --- a/ipa-server/ipa-web/api/ipa.conf +++ b/ipa-server/xmlrpc-server/ipa.conf @@ -1,8 +1,8 @@ # LoadModule auth_kerb_module modules/mod_auth_kerb.so -Alias /ipa "/usr/share/ipa/XMLRPC" +Alias /ipa "/usr/share/ipa/ipaserver/XMLRPC" -<Directory "/usr/share/ipa"> +<Directory "/usr/share/ipaserver"> # AuthType Kerberos # AuthName "Kerberos Login" # KrbMethodNegotiate on diff --git a/ipa-server/ipa-web/api/ipaxmlrpc.py b/ipa-server/xmlrpc-server/ipaxmlrpc.py index 26cac39ae..1dc15956a 100644 --- a/ipa-server/ipa-web/api/ipaxmlrpc.py +++ b/ipa-server/xmlrpc-server/ipaxmlrpc.py @@ -30,7 +30,7 @@ import pprint from xmlrpclib import Marshaller,loads,dumps,Fault from mod_python import apache -import ipa +import ipaserver import funcs import string import base64 @@ -154,7 +154,7 @@ class ModXMLRPCRequestHandler(object): func = self.funcs.get(method,None) if func is None: raise Fault(1, "Invalid method: %s" % method) - params,opts = ipa.decode_args(*params) + params,opts = ipaserver.decode_args(*params) ret = func(*params,**opts) @@ -272,17 +272,3 @@ def handler(req, profiling=False): finally: pass return apache.OK -diff -r 0afcf345979d ipa-server/ipa-web/client/Makefile ---- a/dev/null Thu Jan 01 00:00:00 1970 0000 - b/ipa-server/ipa-web/client/Makefile Wed Jul 19 20:17:24 2007 -0400 -PYTHONLIBDIR ?= $(shell python -c "from distutils.sysconfig import *; print get_python_lib(1)") -PACKAGEDIR ?= $(DESTDIR)/$(PYTHONLIBDIR)/ipa - -all: ; - -install: - -mkdir -p $(PACKAGEDIR) - install -m 644 *.py $(PACKAGEDIR) - -clean: - rm -f *~ *.pyc |