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

Misc small fixes

Browse Source 
* Remove the rpmbuild tree with the dist-clean target.
* Move ipa-server-setupssl from /usr/sbin to /usr/share/ipa
* Check in requirement change for generated freeipa-python.spec
* Fix interactive hostname in ipa-server-install.
This commit is contained in:
Karl MacMillan
-
parent 22710a8dce
commit 50d12d6d2e
8 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -155,4 +155,4 @@ dist: version-update archive tarballs archive-cleanup rpms
local-dist: clean version-update local-archive tarballs archive-cleanup rpms local-dist: clean version-update local-archive tarballs archive-cleanup rpms
dist-clean: clean dist-clean: clean
rm -fr dist rm -fr rpmbuild dist

2
ipa-python/freeipa-python.spec
View File

@@ -10,7 +10,7 @@ Source0: %{name}-%{version}.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch BuildArch: noarch
Requires: python PyKerberos python-krbV Requires: python PyKerberos
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

6
ipa-server/Makefile
View File

@@ -1,5 +1,9 @@
SUBDIRS=ipa-install xmlrpc-server ipa-kpasswd ipa-slapi-plugins SUBDIRS=ipa-install xmlrpc-server ipa-kpasswd ipa-slapi-plugins
PYTHONDIR=$(DESTDIR)/usr/share/ipa/ipaserver
SHAREDIR=$(DESTDIR)/usr/share/ipa
PYTHONDIR=$(SHAREDIR)/ipaserver
SBINDIR=$(DESTDIR)/usr/sbin
all: all:
@for subdir in $(SUBDIRS); do \ @for subdir in $(SUBDIRS); do \

1
ipa-server/freeipa-server.spec
View File

@@ -41,7 +41,6 @@ rm -rf %{buildroot}
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_sbindir}/ipa-server-install %{_sbindir}/ipa-server-install
%{_sbindir}/ipa-server-setupssl
%{_sbindir}/ipa_kpasswd %{_sbindir}/ipa_kpasswd
%attr(755,root,root) %{_initrddir}/ipa-kpasswd %attr(755,root,root) %{_initrddir}/ipa-kpasswd

1
ipa-server/freeipa-server.spec.in
View File

@@ -41,7 +41,6 @@ rm -rf %{buildroot}
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_sbindir}/ipa-server-install %{_sbindir}/ipa-server-install
%{_sbindir}/ipa-server-setupssl
%{_sbindir}/ipa_kpasswd %{_sbindir}/ipa_kpasswd
%attr(755,root,root) %{_initrddir}/ipa-kpasswd %attr(755,root,root) %{_initrddir}/ipa-kpasswd

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

@@ -1,3 +1,4 @@
SHAREDIR=$(DESTDIR)/usr/share/ipa
SBINDIR=$(DESTDIR)/usr/sbin SBINDIR=$(DESTDIR)/usr/sbin
all: ; all: ;
@@ -5,7 +6,7 @@ all: ;
install: install:
-mkdir $(SBINDIR) -mkdir $(SBINDIR)
install -m 755 ipa-server-install $(SBINDIR) install -m 755 ipa-server-install $(SBINDIR)
install -m 755 ipa-server-setupssl $(SBINDIR) install -m 755 ipa-server-setupssl $(SHAREDIR)
$(MAKE) -C share $@ $(MAKE) -C share $@
$(MAKE) -C test $@ $(MAKE) -C test $@

2
ipa-server/ipa-install/ipa-server-install
View File

@@ -134,7 +134,7 @@ def main():
if host_name == "": if host_name == "":
print "" print ""
host_name = raw_input("Please provide a Fully Qualified name to use for your system [master.example.com]: ") host_name = raw_input("Please provide a Fully Qualified name to use for your system [master.example.com]: ")
if host_name != "": if host_name == "":
host_name = "master.example.com" host_name = "master.example.com"
if len(host_name.split(".")) < 2 or host_name == "localhost.localdomain": if len(host_name.split(".")) < 2 or host_name == "localhost.localdomain":

2
ipa-server/ipaserver/dsinstance.py
View File

@@ -156,7 +156,7 @@ class DsInstance:
def __enable_ssl(self): def __enable_ssl(self):
logging.debug("configuring ssl for ds instance") logging.debug("configuring ssl for ds instance")
dirname = self.config_dirname() dirname = self.config_dirname()
args = ["/usr/sbin/ipa-server-setupssl", self.dm_password, args = ["/usr/share/ipa/ipa-server-setupssl", self.dm_password,
dirname, self.host_name] dirname, self.host_name]
run(args) run(args)
logging.debug("done configuring ssl for ds instance") logging.debug("done configuring ssl for ds instance")