IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Finish python library reorg.

Browse Source
This commit is contained in:
Karl MacMillan 0001-01-01 00:00:00 +00:00
parent bac241ffc3
commit 618b98fea7
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ipa-server/Makefile
View File

@ -1,11 +1,16 @@
SUBDIRS=ipa-install SUBDIRS=ipa-install
PYTHONDIR=$(DESTDIR)/usr/share/ipa/ipaserver
all: all:
@for subdir in $(SUBDIRS); do \ @for subdir in $(SUBDIRS); do \
(cd $$subdir && $(MAKE) $@) || exit 1; \ (cd $$subdir && $(MAKE) $@) || exit 1; \
done done
install: install-ipaserver:
-mkdir -p $(PYTHONDIR)
install -m 644 ipaserver/*.py $(PYTHONDIR)
install: install-ipaserver
@for subdir in $(SUBDIRS); do \ @for subdir in $(SUBDIRS); do \
(cd $$subdir && $(MAKE) $@) || exit 1; \ (cd $$subdir && $(MAKE) $@) || exit 1; \
done done

8
ipa-server/ipa-install/Makefile
View File

@ -1,10 +1,12 @@
SBINDIR=$(PREFIX)/usr/sbin
all: ; all: ;
install: install:
$(MAKE) -C src $@ install -m 755 ipa-server-install $(SBINDIR)
install -m 755 ipa-server-setupssl $(SBINDIR)
$(MAKE) -C share $@ $(MAKE) -C share $@
clean: clean:
$(MAKE) -C src $@
$(MAKE) -C share $@ $(MAKE) -C share $@
rm -f *~ rm -f *~ *.pyc

10
ipa-server/ipa-install/ipa-server-install
View File

@ -32,8 +32,8 @@ sys.path.append("/usr/share/ipa")
import socket import socket
import logging import logging
from optparse import OptionParser from optparse import OptionParser
import ipa.dsinstance import ipaserver.dsinstance
import ipa.krbinstance import ipaserver.krbinstance
def parse_options(): def parse_options():
parser = OptionParser(version=VERSION) parser = OptionParser(version=VERSION)
@ -61,7 +61,7 @@ def logging_setup(options):
# file. # file.
logging.basicConfig(level=logging.DEBUG, logging.basicConfig(level=logging.DEBUG,
format='%(asctime)s %(levelname)s %(message)s', format='%(asctime)s %(levelname)s %(message)s',
filename='ipa-install.log', filename='ipaserver-install.log',
filemode='w') filemode='w')
console = logging.StreamHandler() console = logging.StreamHandler()
@ -103,12 +103,12 @@ def main():
# Create a directory server instance # Create a directory server instance
ds = ipa.dsinstance.DsInstance() ds = ipaserver.dsinstance.DsInstance()
ds.create_instance(options.ds_user, options.realm_name, host_name, ds.create_instance(options.ds_user, options.realm_name, host_name,
options.password) options.password)
# Create a kerberos instance # Create a kerberos instance
krb = ipa.krbinstance.KrbInstance() krb = ipaserver.krbinstance.KrbInstance()
krb.create_instance(options.ds_user, options.realm_name, host_name, krb.create_instance(options.ds_user, options.realm_name, host_name,
options.password, options.master_password) options.password, options.master_password)