diff options
| author | Karl MacMillan <kmacmillan@mentalrootkit.com> | 2007-07-27 18:40:58 -0400 |
|---|---|---|
| committer | Karl MacMillan <kmacmillan@mentalrootkit.com> | 2007-07-27 18:40:58 -0400 |
| commit | 618b98fea7a11895fa1a9f9ae3b352faf24fa10e (patch) | |
| tree | ff6da2687057e1ee1b3bdae6da10d4fa76266a51 | |
| parent | bac241ffc3e6835d691b357af5582a8b7a6aab06 (diff) | |
| download | freeipa-618b98fea7a11895fa1a9f9ae3b352faf24fa10e.tar.gz freeipa-618b98fea7a11895fa1a9f9ae3b352faf24fa10e.tar.xz freeipa-618b98fea7a11895fa1a9f9ae3b352faf24fa10e.zip | |
Finish python library reorg.
| -rw-r--r-- | ipa-server/Makefile | 7 | ||||
| -rw-r--r-- | ipa-server/ipa-install/Makefile | 8 | ||||
| -rw-r--r-- | ipa-server/ipa-install/ipa-server-install | 10 |
3 files changed, 16 insertions, 9 deletions
diff --git a/ipa-server/Makefile b/ipa-server/Makefile index 1417a19d..2a10d892 100644 --- a/ipa-server/Makefile +++ b/ipa-server/Makefile @@ -1,11 +1,16 @@ SUBDIRS=ipa-install +PYTHONDIR=$(DESTDIR)/usr/share/ipa/ipaserver all: @for subdir in $(SUBDIRS); do \ (cd $$subdir && $(MAKE) $@) || exit 1; \ done -install: +install-ipaserver: + -mkdir -p $(PYTHONDIR) + install -m 644 ipaserver/*.py $(PYTHONDIR) + +install: install-ipaserver @for subdir in $(SUBDIRS); do \ (cd $$subdir && $(MAKE) $@) || exit 1; \ done diff --git a/ipa-server/ipa-install/Makefile b/ipa-server/ipa-install/Makefile index 7696489b..f2a2a801 100644 --- a/ipa-server/ipa-install/Makefile +++ b/ipa-server/ipa-install/Makefile @@ -1,10 +1,12 @@ +SBINDIR=$(PREFIX)/usr/sbin + all: ; install: - $(MAKE) -C src $@ + install -m 755 ipa-server-install $(SBINDIR) + install -m 755 ipa-server-setupssl $(SBINDIR) $(MAKE) -C share $@ clean: - $(MAKE) -C src $@ $(MAKE) -C share $@ - rm -f *~
\ No newline at end of file + rm -f *~ *.pyc
\ No newline at end of file diff --git a/ipa-server/ipa-install/ipa-server-install b/ipa-server/ipa-install/ipa-server-install index 74de5568..62a2a607 100644 --- a/ipa-server/ipa-install/ipa-server-install +++ b/ipa-server/ipa-install/ipa-server-install @@ -32,8 +32,8 @@ sys.path.append("/usr/share/ipa") import socket import logging from optparse import OptionParser -import ipa.dsinstance -import ipa.krbinstance +import ipaserver.dsinstance +import ipaserver.krbinstance def parse_options(): parser = OptionParser(version=VERSION) @@ -61,7 +61,7 @@ def logging_setup(options): # file. logging.basicConfig(level=logging.DEBUG, format='%(asctime)s %(levelname)s %(message)s', - filename='ipa-install.log', + filename='ipaserver-install.log', filemode='w') console = logging.StreamHandler() @@ -103,12 +103,12 @@ def main(): # Create a directory server instance - ds = ipa.dsinstance.DsInstance() + ds = ipaserver.dsinstance.DsInstance() ds.create_instance(options.ds_user, options.realm_name, host_name, options.password) # Create a kerberos instance - krb = ipa.krbinstance.KrbInstance() + krb = ipaserver.krbinstance.KrbInstance() krb.create_instance(options.ds_user, options.realm_name, host_name, options.password, options.master_password) |